… | |
… | |
28 | #ifdef DMALLOC |
28 | #ifdef DMALLOC |
29 | #include <dmalloc.h> |
29 | #include <dmalloc.h> |
30 | #endif |
30 | #endif |
31 | |
31 | |
32 | |
32 | |
33 | static int psiconv_parse_layout_section(const psiconv_buffer buf, |
33 | static int psiconv_parse_layout_section(const psiconv_config config, |
|
|
34 | const psiconv_buffer buf, |
34 | int lev,psiconv_u32 off, |
35 | int lev,psiconv_u32 off, |
35 | int *length, |
36 | int *length, |
36 | psiconv_text_and_layout result, |
37 | psiconv_text_and_layout result, |
37 | psiconv_word_styles_section styles, |
38 | psiconv_word_styles_section styles, |
38 | int with_styles); |
39 | int with_styles); |
39 | static psiconv_file_type_t psiconv_determine_embedded_object_type |
40 | static psiconv_file_type_t psiconv_determine_embedded_object_type |
40 | (const psiconv_buffer buf,int lev, |
41 | (const psiconv_config config, |
|
|
42 | const psiconv_buffer buf,int lev, |
41 | int *status); |
43 | int *status); |
42 | |
44 | |
43 | int psiconv_parse_header_section(const psiconv_buffer buf,int lev, |
45 | int psiconv_parse_header_section(const psiconv_config config, |
|
|
46 | const psiconv_buffer buf,int lev, |
44 | psiconv_u32 off, int *length, |
47 | psiconv_u32 off, int *length, |
45 | psiconv_header_section *result) |
48 | psiconv_header_section *result) |
46 | { |
49 | { |
47 | int res=0; |
50 | int res=0; |
48 | int len=0; |
51 | int len=0; |
49 | psiconv_u32 temp; |
52 | psiconv_u32 temp; |
50 | |
53 | |
51 | psiconv_progress(lev+1,off+len,"Going to read the header section"); |
54 | psiconv_progress(config,lev+1,off+len,"Going to read the header section"); |
52 | if (!((*result) = malloc(sizeof(**result)))) |
55 | if (!((*result) = malloc(sizeof(**result)))) |
53 | goto ERROR1; |
56 | goto ERROR1; |
54 | |
57 | |
55 | psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3"); |
58 | psiconv_progress(config,lev+2,off+len,"Going to read UID1 to UID3"); |
56 | (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len,&res); |
59 | (*result)->uid1 = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
57 | if (res) |
60 | if (res) |
58 | goto ERROR2; |
61 | goto ERROR2; |
59 | psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1); |
62 | psiconv_debug(config,lev+2,off+len,"UID1: %08x",(*result)->uid1); |
60 | if ((*result)->uid1 == PSICONV_ID_CLIPART) { |
63 | if ((*result)->uid1 == PSICONV_ID_CLIPART) { |
61 | /* That's all folks... */ |
64 | /* That's all folks... */ |
62 | (*result)->file = psiconv_clipart_file; |
65 | (*result)->file = psiconv_clipart_file; |
63 | (*result)->uid2 = 0; |
66 | (*result)->uid2 = 0; |
64 | (*result)->uid3 = 0; |
67 | (*result)->uid3 = 0; |
65 | (*result)->checksum = 0; |
68 | (*result)->checksum = 0; |
66 | len += 4; |
69 | len += 4; |
67 | psiconv_debug(lev+2,off+len,"File is a Clipart file"); |
70 | psiconv_debug(config,lev+2,off+len,"File is a Clipart file"); |
68 | goto DONE; |
71 | goto DONE; |
69 | } |
72 | } |
70 | if ((*result)->uid1 != PSICONV_ID_PSION5) { |
73 | if ((*result)->uid1 != PSICONV_ID_PSION5) { |
71 | psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably " |
74 | psiconv_warn(config,lev+2,off+len, |
|
|
75 | "UID1 has unknown value. This is probably " |
72 | "not a (parsable) Psion 5 file"); |
76 | "not a (parsable) Psion 5 file"); |
73 | res = -PSICONV_E_PARSE; |
77 | res = -PSICONV_E_PARSE; |
74 | goto ERROR2; |
78 | goto ERROR2; |
75 | } |
79 | } |
76 | len += 4; |
80 | len += 4; |
77 | (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len,&res); |
81 | (*result)->uid2 = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
78 | if (res) |
82 | if (res) |
79 | goto ERROR2; |
83 | goto ERROR2; |
80 | psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2); |
84 | psiconv_debug(config,lev+2,off+len,"UID2: %08x",(*result)->uid2); |
81 | len += 4; |
85 | len += 4; |
82 | (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len,&res); |
86 | (*result)->uid3 = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
83 | if (res) |
87 | if (res) |
84 | goto ERROR2; |
88 | goto ERROR2; |
85 | psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3); |
89 | psiconv_debug(config,lev+2,off+len,"UID3: %08x",(*result)->uid3); |
86 | len += 4; |
90 | len += 4; |
87 | |
91 | |
88 | (*result)->file = psiconv_unknown_file; |
92 | (*result)->file = psiconv_unknown_file; |
89 | if ((*result)->uid1 == PSICONV_ID_PSION5) { |
93 | if ((*result)->uid1 == PSICONV_ID_PSION5) { |
90 | if ((*result)->uid2 == PSICONV_ID_DATA_FILE) { |
94 | if ((*result)->uid2 == PSICONV_ID_DATA_FILE) { |
91 | if ((*result)->uid3 == PSICONV_ID_WORD) { |
95 | if ((*result)->uid3 == PSICONV_ID_WORD) { |
92 | (*result)->file = psiconv_word_file; |
96 | (*result)->file = psiconv_word_file; |
93 | psiconv_debug(lev+2,off+len,"File is a Word file"); |
97 | psiconv_debug(config,lev+2,off+len,"File is a Word file"); |
94 | } else if ((*result)->uid3 == PSICONV_ID_TEXTED) { |
98 | } else if ((*result)->uid3 == PSICONV_ID_TEXTED) { |
95 | (*result)->file = psiconv_texted_file; |
99 | (*result)->file = psiconv_texted_file; |
96 | psiconv_debug(lev+2,off+len,"File is a TextEd file"); |
100 | psiconv_debug(config,lev+2,off+len,"File is a TextEd file"); |
97 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
101 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
98 | (*result)->file = psiconv_sketch_file; |
102 | (*result)->file = psiconv_sketch_file; |
99 | psiconv_debug(lev+2,off+len,"File is a Sketch file"); |
103 | psiconv_debug(config,lev+2,off+len,"File is a Sketch file"); |
100 | } else if ((*result)->uid3 == PSICONV_ID_SHEET) { |
104 | } else if ((*result)->uid3 == PSICONV_ID_SHEET) { |
101 | (*result)->file = psiconv_sheet_file; |
105 | (*result)->file = psiconv_sheet_file; |
102 | psiconv_debug(lev+2,off+len,"File is a Sheet file"); |
106 | psiconv_debug(config,lev+2,off+len,"File is a Sheet file"); |
103 | } |
107 | } |
104 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
108 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
105 | (*result)->file = psiconv_mbm_file; |
109 | (*result)->file = psiconv_mbm_file; |
106 | if ((*result)->uid3 != 0x00) |
110 | if ((*result)->uid3 != 0x00) |
107 | psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); |
111 | psiconv_warn(config,lev+2,off+len,"UID3 set in MBM file?!?"); |
108 | psiconv_debug(lev+2,off+len,"File is a MBM file"); |
112 | psiconv_debug(config,lev+2,off+len,"File is a MBM file"); |
109 | } |
113 | } |
110 | } |
114 | } |
111 | if ((*result)->file == psiconv_unknown_file) { |
115 | if ((*result)->file == psiconv_unknown_file) { |
112 | psiconv_warn(lev+2,off+len,"Unknown file type"); |
116 | psiconv_warn(config,lev+2,off+len,"Unknown file type"); |
113 | (*result)->file = psiconv_unknown_file; |
117 | (*result)->file = psiconv_unknown_file; |
114 | } |
118 | } |
115 | |
119 | |
116 | psiconv_progress(lev+2,off+len,"Checking UID4"); |
120 | psiconv_progress(config,lev+2,off+len,"Checking UID4"); |
117 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
121 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
118 | if (res) |
122 | if (res) |
119 | goto ERROR2; |
123 | goto ERROR2; |
120 | if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, |
124 | if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, |
121 | (*result)->uid3)) |
125 | (*result)->uid3)) |
122 | psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp); |
126 | psiconv_debug(config,lev+2,off+len,"Checksum %08x is correct",temp); |
123 | else { |
127 | else { |
124 | psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!"); |
128 | psiconv_warn(config,lev+2,off+len,"Checksum failed, file corrupted!"); |
125 | psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x", |
129 | psiconv_debug(config,lev+2,off+len,"Expected checksum %08x, found %08x", |
126 | psiconv_checkuid((*result)->uid1,(*result)->uid2, |
130 | psiconv_checkuid((*result)->uid1,(*result)->uid2, |
127 | (*result)->uid3),temp); |
131 | (*result)->uid3),temp); |
128 | res = -PSICONV_E_PARSE; |
132 | res = -PSICONV_E_PARSE; |
129 | goto ERROR2; |
133 | goto ERROR2; |
130 | } |
134 | } |
… | |
… | |
132 | |
136 | |
133 | DONE: |
137 | DONE: |
134 | if (length) |
138 | if (length) |
135 | *length = len; |
139 | *length = len; |
136 | |
140 | |
137 | psiconv_progress(lev+1,off+len-1, |
141 | psiconv_progress(config,lev+1,off+len-1, |
138 | "End of Header Section (total length: %08x)",len); |
142 | "End of Header Section (total length: %08x)",len); |
139 | |
143 | |
140 | return res; |
144 | return res; |
141 | |
145 | |
142 | ERROR2: |
146 | ERROR2: |
143 | free(*result); |
147 | free(*result); |
144 | ERROR1: |
148 | ERROR1: |
145 | psiconv_warn(lev+1,off,"Reading of Header Section failed"); |
149 | psiconv_warn(config,lev+1,off,"Reading of Header Section failed"); |
146 | if (length) |
150 | if (length) |
147 | *length = 0; |
151 | *length = 0; |
148 | if (res == 0) |
152 | if (res == 0) |
149 | return -PSICONV_E_NOMEM; |
153 | return -PSICONV_E_NOMEM; |
150 | else |
154 | else |
151 | return res; |
155 | return res; |
152 | } |
156 | } |
153 | |
157 | |
154 | int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev, |
158 | int psiconv_parse_section_table_section(const psiconv_config config, |
|
|
159 | const psiconv_buffer buf, int lev, |
155 | psiconv_u32 off, int *length, |
160 | psiconv_u32 off, int *length, |
156 | psiconv_section_table_section *result) |
161 | psiconv_section_table_section *result) |
157 | { |
162 | { |
158 | int res=0; |
163 | int res=0; |
159 | int len=0; |
164 | int len=0; |
160 | psiconv_section_table_entry entry; |
165 | psiconv_section_table_entry entry; |
161 | |
166 | |
162 | int i; |
167 | int i; |
163 | psiconv_u8 nr; |
168 | psiconv_u8 nr; |
164 | |
169 | |
165 | psiconv_progress(lev+1,off+len,"Going to read the section table section"); |
170 | psiconv_progress(config,lev+1,off+len,"Going to read the section table section"); |
166 | if (!(*result = psiconv_list_new(sizeof(*entry)))) |
171 | if (!(*result = psiconv_list_new(sizeof(*entry)))) |
167 | goto ERROR1; |
172 | goto ERROR1; |
168 | |
173 | |
169 | psiconv_progress(lev+2,off+len,"Going to read the section table length"); |
174 | psiconv_progress(config,lev+2,off+len,"Going to read the section table length"); |
170 | nr = psiconv_read_u8(buf,lev+2,off+len,&res); |
175 | nr = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
171 | if (res) |
176 | if (res) |
172 | goto ERROR2; |
177 | goto ERROR2; |
173 | psiconv_debug(lev+2,off+len,"Length: %08x",nr); |
178 | psiconv_debug(config,lev+2,off+len,"Length: %08x",nr); |
174 | if (nr & 0x01) { |
179 | if (nr & 0x01) { |
175 | psiconv_warn(lev+2,off+len, |
180 | psiconv_warn(config,lev+2,off+len, |
176 | "Section table length odd - ignoring last entry"); |
181 | "Section table length odd - ignoring last entry"); |
177 | } |
182 | } |
178 | len ++; |
183 | len ++; |
179 | |
184 | |
180 | psiconv_progress(lev+2,off+len,"Going to read the section table entries"); |
185 | psiconv_progress(config,lev+2,off+len,"Going to read the section table entries"); |
181 | entry = malloc(sizeof(*entry)); |
186 | entry = malloc(sizeof(*entry)); |
182 | for (i = 0; i < nr / 2; i++) { |
187 | for (i = 0; i < nr / 2; i++) { |
183 | entry->id = psiconv_read_u32(buf,lev+2,off + len,&res); |
188 | entry->id = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
184 | if (res) |
189 | if (res) |
185 | goto ERROR3; |
190 | goto ERROR3; |
186 | psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id); |
191 | psiconv_debug(config,lev+2,off + len,"Entry %d: ID = %08x",i,entry->id); |
187 | len += 0x04; |
192 | len += 0x04; |
188 | entry->offset = psiconv_read_u32(buf,lev+2,off + len,&res); |
193 | entry->offset = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
189 | if (res) |
194 | if (res) |
190 | goto ERROR3; |
195 | goto ERROR3; |
191 | psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset); |
196 | psiconv_debug(config,lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset); |
192 | len += 0x04; |
197 | len += 0x04; |
193 | if ((res=psiconv_list_add(*result,entry))) |
198 | if ((res=psiconv_list_add(*result,entry))) |
194 | goto ERROR3; |
199 | goto ERROR3; |
195 | } |
200 | } |
196 | |
201 | |
197 | free(entry); |
202 | free(entry); |
198 | |
203 | |
199 | if (length) |
204 | if (length) |
200 | *length = len; |
205 | *length = len; |
201 | |
206 | |
202 | psiconv_progress(lev+1,off+len-1,"End of section table section " |
207 | psiconv_progress(config,lev+1,off+len-1,"End of section table section " |
203 | "(total length: %08x)", len); |
208 | "(total length: %08x)", len); |
204 | |
209 | |
205 | return 0; |
210 | return 0; |
206 | ERROR3: |
211 | ERROR3: |
207 | free(entry); |
212 | free(entry); |
208 | ERROR2: |
213 | ERROR2: |
209 | psiconv_list_free(*result); |
214 | psiconv_list_free(*result); |
210 | ERROR1: |
215 | ERROR1: |
211 | psiconv_warn(lev+1,off,"Reading of Section Table Section failed"); |
216 | psiconv_warn(config,lev+1,off,"Reading of Section Table Section failed"); |
212 | if (length) |
217 | if (length) |
213 | *length = 0; |
218 | *length = 0; |
214 | if (res == 0) |
219 | if (res == 0) |
215 | return -PSICONV_E_NOMEM; |
220 | return -PSICONV_E_NOMEM; |
216 | else |
221 | else |
217 | return res; |
222 | return res; |
218 | } |
223 | } |
219 | |
224 | |
220 | int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev, |
225 | int psiconv_parse_application_id_section(const psiconv_config config, |
|
|
226 | const psiconv_buffer buf, int lev, |
221 | psiconv_u32 off, int *length, |
227 | psiconv_u32 off, int *length, |
222 | psiconv_application_id_section *result) |
228 | psiconv_application_id_section *result) |
223 | { |
229 | { |
224 | int res=0; |
230 | int res=0; |
225 | int len=0; |
231 | int len=0; |
226 | int leng; |
232 | int leng; |
227 | |
233 | |
228 | psiconv_progress(lev+1,off,"Going to read the application id section"); |
234 | psiconv_progress(config,lev+1,off,"Going to read the application id section"); |
229 | if (!(*result = malloc(sizeof(**result)))) |
235 | if (!(*result = malloc(sizeof(**result)))) |
230 | goto ERROR1; |
236 | goto ERROR1; |
231 | |
237 | |
232 | psiconv_progress(lev+2,off+len,"Going to read the type identifier"); |
238 | psiconv_progress(config,lev+2,off+len,"Going to read the type identifier"); |
233 | (*result)->id = psiconv_read_u32(buf,lev+2,off+len,&res); |
239 | (*result)->id = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
234 | if (res) |
240 | if (res) |
235 | goto ERROR2; |
241 | goto ERROR2; |
236 | psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id); |
242 | psiconv_debug(config,lev+2,off+len,"Identifier: %08x",(*result)->id); |
237 | len += 4; |
243 | len += 4; |
238 | |
244 | |
239 | psiconv_progress(lev+2,off+len,"Going to read the application id string"); |
245 | psiconv_progress(config,lev+2,off+len,"Going to read the application id string"); |
240 | (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res); |
246 | (*result)->name = psiconv_read_string(config,buf,lev+2,off+len,&leng,&res); |
241 | if (res) |
247 | if (res) |
242 | goto ERROR2; |
248 | goto ERROR2; |
243 | len += leng; |
249 | len += leng; |
244 | |
250 | |
245 | if (length) |
251 | if (length) |
246 | *length = len; |
252 | *length = len; |
247 | |
253 | |
248 | psiconv_progress(lev+1,off+len-1,"End of application id section " |
254 | psiconv_progress(config,lev+1,off+len-1,"End of application id section " |
249 | "(total length: %08x", len); |
255 | "(total length: %08x", len); |
250 | |
256 | |
251 | return res; |
257 | return res; |
252 | ERROR2: |
258 | ERROR2: |
253 | free(*result); |
259 | free(*result); |
254 | ERROR1: |
260 | ERROR1: |
255 | psiconv_warn(lev+1,off,"Reading of Application ID Section failed"); |
261 | psiconv_warn(config,lev+1,off,"Reading of Application ID Section failed"); |
256 | if (length) |
262 | if (length) |
257 | *length = 0; |
263 | *length = 0; |
258 | if (res == 0) |
264 | if (res == 0) |
259 | return -PSICONV_E_NOMEM; |
265 | return -PSICONV_E_NOMEM; |
260 | else |
266 | else |
261 | return res; |
267 | return res; |
262 | } |
268 | } |
263 | |
269 | |
264 | int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off, |
270 | int psiconv_parse_text_section(const psiconv_config config, |
|
|
271 | const psiconv_buffer buf,int lev,psiconv_u32 off, |
265 | int *length,psiconv_text_and_layout *result) |
272 | int *length,psiconv_text_and_layout *result) |
266 | { |
273 | { |
267 | |
274 | |
268 | int res = 0; |
275 | int res = 0; |
269 | int len=0; |
276 | int len=0; |
… | |
… | |
273 | |
280 | |
274 | int nr; |
281 | int nr; |
275 | int i,j,start,leng,temp; |
282 | int i,j,start,leng,temp; |
276 | char *str_copy; |
283 | char *str_copy; |
277 | |
284 | |
278 | psiconv_progress(lev+1,off,"Going to parse the text section"); |
285 | psiconv_progress(config,lev+1,off,"Going to parse the text section"); |
279 | psiconv_progress(lev+2,off,"Reading the text length"); |
286 | psiconv_progress(config,lev+2,off,"Reading the text length"); |
280 | |
287 | |
281 | if(!(*result = psiconv_list_new(sizeof(*para)))) |
288 | if(!(*result = psiconv_list_new(sizeof(*para)))) |
282 | goto ERROR1; |
289 | goto ERROR1; |
283 | if (!(para = malloc(sizeof(*para)))) |
290 | if (!(para = malloc(sizeof(*para)))) |
284 | goto ERROR2; |
291 | goto ERROR2; |
285 | |
292 | |
286 | text_len = psiconv_read_X(buf,lev+2,off,&leng,&res); |
293 | text_len = psiconv_read_X(config,buf,lev+2,off,&leng,&res); |
287 | if (res) |
294 | if (res) |
288 | goto ERROR3; |
295 | goto ERROR3; |
289 | psiconv_debug(lev+2,off,"Length: %08x",text_len); |
296 | psiconv_debug(config,lev+2,off,"Length: %08x",text_len); |
290 | len += leng; |
297 | len += leng; |
291 | |
298 | |
292 | psiconv_progress(lev+2,off+len,"Going to read all paragraph text"); |
299 | psiconv_progress(config,lev+2,off+len,"Going to read all paragraph text"); |
293 | nr = 0; |
300 | nr = 0; |
294 | start = 0; |
301 | start = 0; |
295 | for (i = 0; i < text_len; i++) { |
302 | for (i = 0; i < text_len; i++) { |
296 | temp = psiconv_read_u8(buf,lev+2,off+len+i,&res); |
303 | temp = psiconv_read_u8(config,buf,lev+2,off+len+i,&res); |
297 | if (res) |
304 | if (res) |
298 | goto ERROR3; |
305 | goto ERROR3; |
299 | if (temp == 0x06) { |
306 | if (temp == 0x06) { |
300 | if (!(para->text = malloc(i - start + 1))) |
307 | if (!(para->text = malloc(i - start + 1))) |
301 | goto ERROR3; |
308 | goto ERROR3; |
302 | for (j = 0; j < i - start; j++) { |
309 | for (j = 0; j < i - start; j++) { |
303 | temp = psiconv_read_u8(buf,lev+1,off + len + start + j,&res); |
310 | temp = psiconv_read_u8(config,buf,lev+1,off + len + start + j,&res); |
304 | if (res) |
311 | if (res) |
305 | goto ERROR4; |
312 | goto ERROR4; |
306 | para->text[j] = temp; |
313 | para->text[j] = temp; |
307 | } |
314 | } |
308 | para->text[j] = 0; |
315 | para->text[j] = 0; |
… | |
… | |
310 | if ((res = psiconv_list_add(*result,para))) |
317 | if ((res = psiconv_list_add(*result,para))) |
311 | goto ERROR4; |
318 | goto ERROR4; |
312 | |
319 | |
313 | if (!(str_copy = psiconv_make_printable(para->text))) |
320 | if (!(str_copy = psiconv_make_printable(para->text))) |
314 | goto ERROR3; |
321 | goto ERROR3; |
315 | psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr, |
322 | psiconv_debug(config,lev+2,off+i+len,"Line %d: %d characters",nr, |
316 | strlen(str_copy) +1); |
323 | strlen(str_copy) +1); |
317 | psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy); |
324 | psiconv_debug(config,lev+2,off+i+len,"Line %d: `%s'",nr,str_copy); |
318 | free(str_copy); |
325 | free(str_copy); |
319 | |
326 | |
320 | start = i + 1; |
327 | start = i + 1; |
321 | nr ++; |
328 | nr ++; |
322 | } |
329 | } |
323 | } |
330 | } |
324 | |
331 | |
325 | if (start != text_len) { |
332 | if (start != text_len) { |
326 | psiconv_warn(lev+2,off+start+len, |
333 | psiconv_warn(config,lev+2,off+start+len, |
327 | "Last line does not end on EOL (%d characters left)", len - start); |
334 | "Last line does not end on EOL (%d characters left)", len - start); |
328 | if (!(para->text = malloc(text_len - start + 1))) |
335 | if (!(para->text = malloc(text_len - start + 1))) |
329 | goto ERROR3; |
336 | goto ERROR3; |
330 | for (j = 0; j < text_len - start; j++) { |
337 | for (j = 0; j < text_len - start; j++) { |
331 | temp = psiconv_read_u8(buf,lev+2,off + start + j + len, &res); |
338 | temp = psiconv_read_u8(config,buf,lev+2,off + start + j + len, &res); |
332 | if (res) |
339 | if (res) |
333 | goto ERROR4; |
340 | goto ERROR4; |
334 | para->text[j] = temp; |
341 | para->text[j] = temp; |
335 | } |
342 | } |
336 | para->text[text_len - start] = 0; |
343 | para->text[text_len - start] = 0; |
337 | if ((res = psiconv_list_add(*result,para))) |
344 | if ((res = psiconv_list_add(*result,para))) |
338 | goto ERROR4; |
345 | goto ERROR4; |
339 | if (!(str_copy = psiconv_make_printable(para->text))) |
346 | if (!(str_copy = psiconv_make_printable(para->text))) |
340 | goto ERROR3; |
347 | goto ERROR3; |
341 | psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr, |
348 | psiconv_debug(config,lev+2,off+start+len,"Last line: %d characters",nr, |
342 | strlen(str_copy)+1); |
349 | strlen(str_copy)+1); |
343 | psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy); |
350 | psiconv_debug(config,lev+2,off+start+len,"Last line: `%s'",str_copy); |
344 | free(str_copy); |
351 | free(str_copy); |
345 | } |
352 | } |
346 | |
353 | |
347 | free(para); |
354 | free(para); |
348 | |
355 | |
349 | /* Initialize the remaining parts of each paragraph */ |
356 | /* Initialize the remaining parts of each paragraph */ |
350 | for (i = 0; i < psiconv_list_length(*result); i ++) { |
357 | for (i = 0; i < psiconv_list_length(*result); i ++) { |
351 | if (!(para = psiconv_list_get(*result,i))) { |
358 | if (!(para = psiconv_list_get(*result,i))) { |
352 | psiconv_warn(lev+2,off+len,"Massive memory corruption"); |
359 | psiconv_warn(config,lev+2,off+len,"Massive memory corruption"); |
353 | goto ERROR2_0; |
360 | goto ERROR2_0; |
354 | } |
361 | } |
355 | if (!(para->in_lines = psiconv_list_new(sizeof( |
362 | if (!(para->in_lines = psiconv_list_new(sizeof( |
356 | struct psiconv_in_line_layout_s)))) |
363 | struct psiconv_in_line_layout_s)))) |
357 | goto ERROR2_0; |
364 | goto ERROR2_0; |
… | |
… | |
369 | len += text_len; |
376 | len += text_len; |
370 | |
377 | |
371 | if (length) |
378 | if (length) |
372 | *length = len; |
379 | *length = len; |
373 | |
380 | |
374 | psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x", |
381 | psiconv_progress(config,lev+1,off+len-1,"End of text section (total length: %08x", |
375 | len); |
382 | len); |
376 | |
383 | |
377 | return res; |
384 | return res; |
378 | |
385 | |
379 | ERROR2_3: |
386 | ERROR2_3: |
… | |
… | |
383 | ERROR2_1: |
390 | ERROR2_1: |
384 | psiconv_list_free(para->in_lines); |
391 | psiconv_list_free(para->in_lines); |
385 | ERROR2_0: |
392 | ERROR2_0: |
386 | for (j = 0; j < i; j++) { |
393 | for (j = 0; j < i; j++) { |
387 | if (!(para = psiconv_list_get(*result,j))) { |
394 | if (!(para = psiconv_list_get(*result,j))) { |
388 | psiconv_warn(lev+1,off,"Massive memory corruption..."); |
395 | psiconv_warn(config,lev+1,off,"Massive memory corruption..."); |
389 | break; |
396 | break; |
390 | } |
397 | } |
391 | psiconv_list_free(para->in_lines); |
398 | psiconv_list_free(para->in_lines); |
392 | psiconv_list_free(para->replacements); |
399 | psiconv_list_free(para->replacements); |
393 | psiconv_free_character_layout(para->base_character); |
400 | psiconv_free_character_layout(para->base_character); |
… | |
… | |
400 | ERROR3: |
407 | ERROR3: |
401 | free(para); |
408 | free(para); |
402 | ERROR2: |
409 | ERROR2: |
403 | for (i = 0; i < psiconv_list_length(*result);i++) { |
410 | for (i = 0; i < psiconv_list_length(*result);i++) { |
404 | if (!(para = psiconv_list_get(*result,i))) { |
411 | if (!(para = psiconv_list_get(*result,i))) { |
405 | psiconv_warn(lev+1,off,"Massive memory corruption..."); |
412 | psiconv_warn(config,lev+1,off,"Massive memory corruption..."); |
406 | break; |
413 | break; |
407 | } |
414 | } |
408 | free(para->text); |
415 | free(para->text); |
409 | } |
416 | } |
410 | psiconv_list_free(*result); |
417 | psiconv_list_free(*result); |
411 | ERROR1: |
418 | ERROR1: |
412 | psiconv_warn(lev+1,off,"Reading of Text Section failed"); |
419 | psiconv_warn(config,lev+1,off,"Reading of Text Section failed"); |
413 | if (length) |
420 | if (length) |
414 | *length = 0; |
421 | *length = 0; |
415 | if (!res) |
422 | if (!res) |
416 | return -PSICONV_E_NOMEM; |
423 | return -PSICONV_E_NOMEM; |
417 | else |
424 | else |
418 | return res; |
425 | return res; |
419 | } |
426 | } |
420 | |
427 | |
421 | /* First do a parse_text_section, or you will get into trouble here */ |
428 | /* First do a parse_text_section, or you will get into trouble here */ |
422 | int psiconv_parse_layout_section(const psiconv_buffer buf, |
429 | int psiconv_parse_layout_section(const psiconv_config config, |
|
|
430 | const psiconv_buffer buf, |
423 | int lev,psiconv_u32 off, |
431 | int lev,psiconv_u32 off, |
424 | int *length, |
432 | int *length, |
425 | psiconv_text_and_layout result, |
433 | psiconv_text_and_layout result, |
426 | psiconv_word_styles_section styles, |
434 | psiconv_word_styles_section styles, |
427 | int with_styles) |
435 | int with_styles) |
… | |
… | |
452 | struct psiconv_in_line_layout_s in_line; |
460 | struct psiconv_in_line_layout_s in_line; |
453 | |
461 | |
454 | int *inline_count; |
462 | int *inline_count; |
455 | |
463 | |
456 | |
464 | |
457 | psiconv_progress(lev+1,off,"Going to read the layout section"); |
465 | psiconv_progress(config,lev+1,off,"Going to read the layout section"); |
458 | |
466 | |
459 | psiconv_progress(lev+2,off,"Going to read the section type"); |
467 | psiconv_progress(config,lev+2,off,"Going to read the section type"); |
460 | temp = psiconv_read_u16(buf,lev+2,off+len,&res); |
468 | temp = psiconv_read_u16(config,buf,lev+2,off+len,&res); |
461 | if (res) |
469 | if (res) |
462 | goto ERROR1; |
470 | goto ERROR1; |
463 | psiconv_debug(lev+2,off+len,"Type: %02x",temp); |
471 | psiconv_debug(config,lev+2,off+len,"Type: %02x",temp); |
464 | parse_styles = with_styles; |
472 | parse_styles = with_styles; |
465 | if ((temp == 0x0001) && !with_styles) { |
473 | if ((temp == 0x0001) && !with_styles) { |
466 | psiconv_warn(lev+2,off+len,"Styleless layout section expected, " |
474 | psiconv_warn(config,lev+2,off+len,"Styleless layout section expected, " |
467 | "but styled section found!"); |
475 | "but styled section found!"); |
468 | parse_styles = 1; |
476 | parse_styles = 1; |
469 | } else if ((temp == 0x0000) && (with_styles)) { |
477 | } else if ((temp == 0x0000) && (with_styles)) { |
470 | psiconv_warn(lev+2,off+len,"Styled layout section expected, " |
478 | psiconv_warn(config,lev+2,off+len,"Styled layout section expected, " |
471 | "but styleless section found!"); |
479 | "but styleless section found!"); |
472 | parse_styles = 0; |
480 | parse_styles = 0; |
473 | } else if ((temp != 0x0000) && (temp != 0x0001)) { |
481 | } else if ((temp != 0x0000) && (temp != 0x0001)) { |
474 | psiconv_warn(lev+2,off+len, |
482 | psiconv_warn(config,lev+2,off+len, |
475 | "Layout section type indicator has unknown value!"); |
483 | "Layout section type indicator has unknown value!"); |
476 | } |
484 | } |
477 | len += 0x02; |
485 | len += 0x02; |
478 | |
486 | |
479 | psiconv_progress(lev+2,off+len,"Going to read paragraph type list"); |
487 | psiconv_progress(config,lev+2,off+len,"Going to read paragraph type list"); |
480 | if (!(anon_styles = psiconv_list_new(sizeof(anon)))) |
488 | if (!(anon_styles = psiconv_list_new(sizeof(anon)))) |
481 | goto ERROR1; |
489 | goto ERROR1; |
482 | psiconv_progress(lev+3,off+len,"Going to read paragraph type list length"); |
490 | psiconv_progress(config,lev+3,off+len,"Going to read paragraph type list length"); |
483 | nr = psiconv_read_u8(buf,lev+3,off+len,&res); |
491 | nr = psiconv_read_u8(config,buf,lev+3,off+len,&res); |
484 | if (res) |
492 | if (res) |
485 | goto ERROR2; |
493 | goto ERROR2; |
486 | psiconv_debug(lev+3,off+len,"Length: %02x",nr); |
494 | psiconv_debug(config,lev+3,off+len,"Length: %02x",nr); |
487 | len ++; |
495 | len ++; |
488 | |
496 | |
489 | psiconv_progress(lev+3,off+len, |
497 | psiconv_progress(config,lev+3,off+len, |
490 | "Going to read the paragraph type list elements"); |
498 | "Going to read the paragraph type list elements"); |
491 | for (i = 0; i < nr; i ++) { |
499 | for (i = 0; i < nr; i ++) { |
492 | psiconv_progress(lev+3,off+len,"Element %d",i); |
500 | psiconv_progress(config,lev+3,off+len,"Element %d",i); |
493 | anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res); |
501 | anon.nr = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
494 | if (res) |
502 | if (res) |
495 | goto ERROR3; |
503 | goto ERROR3; |
496 | psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr); |
504 | psiconv_debug(config,lev+4,off+len,"Number: %08x",anon.nr); |
497 | len += 0x04; |
505 | len += 0x04; |
498 | |
506 | |
499 | psiconv_progress(lev+4,off,"Going to determine the base style"); |
507 | psiconv_progress(config,lev+4,off,"Going to determine the base style"); |
500 | if (parse_styles) { |
508 | if (parse_styles) { |
501 | temp = psiconv_read_u32(buf,lev+4, off+len,&res); |
509 | temp = psiconv_read_u32(config,buf,lev+4, off+len,&res); |
502 | if (res) |
510 | if (res) |
503 | goto ERROR3; |
511 | goto ERROR3; |
504 | anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res); |
512 | anon.base_style = psiconv_read_u8(config,buf,lev+3, off+len+4+temp,&res); |
505 | if (res) |
513 | if (res) |
506 | goto ERROR3; |
514 | goto ERROR3; |
507 | psiconv_debug(lev+4,off+len+temp, |
515 | psiconv_debug(config,lev+4,off+len+temp, |
508 | "Style indicator: %02x",anon.base_style); |
516 | "Style indicator: %02x",anon.base_style); |
509 | } else |
517 | } else |
510 | anon.base_style = 0; |
518 | anon.base_style = 0; |
511 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
519 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
512 | psiconv_warn(lev+4,off,"Unknown Style referenced"); |
520 | psiconv_warn(config,lev+4,off,"Unknown Style referenced"); |
513 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
521 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
514 | psiconv_warn(lev+4,off,"Base style unknown"); |
522 | psiconv_warn(config,lev+4,off,"Base style unknown"); |
515 | goto ERROR3; |
523 | goto ERROR3; |
516 | } |
524 | } |
517 | } |
525 | } |
518 | if (!(anon.paragraph = psiconv_clone_paragraph_layout |
526 | if (!(anon.paragraph = psiconv_clone_paragraph_layout |
519 | (temp_style->paragraph))) |
527 | (temp_style->paragraph))) |
520 | goto ERROR3; |
528 | goto ERROR3; |
521 | if (!(anon.character = psiconv_clone_character_layout |
529 | if (!(anon.character = psiconv_clone_character_layout |
522 | (temp_style->character))) |
530 | (temp_style->character))) |
523 | goto ERROR3_1; |
531 | goto ERROR3_1; |
524 | |
532 | |
525 | psiconv_progress(lev+4,off+len,"Going to read the paragraph layout"); |
533 | psiconv_progress(config,lev+4,off+len,"Going to read the paragraph layout"); |
526 | if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, |
534 | if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng, |
527 | anon.paragraph))) |
535 | anon.paragraph))) |
528 | goto ERROR3_2; |
536 | goto ERROR3_2; |
529 | len += leng; |
537 | len += leng; |
530 | if (parse_styles) |
538 | if (parse_styles) |
531 | len ++; |
539 | len ++; |
532 | |
540 | |
533 | psiconv_progress(lev+4,off+len,"Going to read the character layout"); |
541 | psiconv_progress(config,lev+4,off+len,"Going to read the character layout"); |
534 | if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, |
542 | if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng, |
535 | anon.character))) |
543 | anon.character))) |
536 | goto ERROR3_2; |
544 | goto ERROR3_2; |
537 | len += leng; |
545 | len += leng; |
538 | if ((res = psiconv_list_add(anon_styles,&anon))) |
546 | if ((res = psiconv_list_add(anon_styles,&anon))) |
539 | goto ERROR3_2; |
547 | goto ERROR3_2; |
540 | } |
548 | } |
541 | |
549 | |
542 | psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list"); |
550 | psiconv_progress(config,lev+2,off+len,"Going to parse the paragraph element list"); |
543 | psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs"); |
551 | psiconv_progress(config,lev+3,off+len,"Going to read the number of paragraphs"); |
544 | nr = psiconv_read_u32(buf,lev+3,off+len,&res); |
552 | nr = psiconv_read_u32(config,buf,lev+3,off+len,&res); |
545 | if (res) |
553 | if (res) |
546 | goto ERROR3; |
554 | goto ERROR3; |
547 | if (nr != psiconv_list_length(result)) { |
555 | if (nr != psiconv_list_length(result)) { |
548 | psiconv_warn(lev+3,off+len, |
556 | psiconv_warn(config,lev+3,off+len, |
549 | "Number of text paragraphs and paragraph elements does not match"); |
557 | "Number of text paragraphs and paragraph elements does not match"); |
550 | psiconv_debug(lev+3,off+len, |
558 | psiconv_debug(config,lev+3,off+len, |
551 | "%d text paragraphs, %d paragraph elements", |
559 | "%d text paragraphs, %d paragraph elements", |
552 | psiconv_list_length(result),nr); |
560 | psiconv_list_length(result),nr); |
553 | } |
561 | } |
554 | psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr); |
562 | psiconv_debug(config,lev+3,off+len,"Number of paragraphs: %d",nr); |
555 | len += 4; |
563 | len += 4; |
556 | if (!(inline_count = malloc(nr * sizeof(*inline_count)))) |
564 | if (!(inline_count = malloc(nr * sizeof(*inline_count)))) |
557 | goto ERROR3; |
565 | goto ERROR3; |
558 | |
566 | |
559 | psiconv_progress(lev+3,off+len,"Going to read the paragraph elements"); |
567 | psiconv_progress(config,lev+3,off+len,"Going to read the paragraph elements"); |
560 | for (i = 0; i < nr; i ++) { |
568 | for (i = 0; i < nr; i ++) { |
561 | psiconv_progress(lev+3,off+len,"Element %d",i); |
569 | psiconv_progress(config,lev+3,off+len,"Element %d",i); |
562 | if (i >= psiconv_list_length(result)) { |
570 | if (i >= psiconv_list_length(result)) { |
563 | psiconv_debug(lev+4,off+len,"Going to allocate a new element"); |
571 | psiconv_debug(config,lev+4,off+len,"Going to allocate a new element"); |
564 | if (!(para = malloc(sizeof(*para)))) |
572 | if (!(para = malloc(sizeof(*para)))) |
565 | goto ERROR4; |
573 | goto ERROR4; |
566 | if (!(para->in_lines = psiconv_list_new(sizeof( |
574 | if (!(para->in_lines = psiconv_list_new(sizeof( |
567 | struct psiconv_in_line_layout_s)))) |
575 | struct psiconv_in_line_layout_s)))) |
568 | goto ERROR4_1; |
576 | goto ERROR4_1; |
… | |
… | |
576 | free(para); |
584 | free(para); |
577 | } |
585 | } |
578 | if (!(para = psiconv_list_get(result,i))) |
586 | if (!(para = psiconv_list_get(result,i))) |
579 | goto ERROR4; |
587 | goto ERROR4; |
580 | |
588 | |
581 | psiconv_progress(lev+4,off+len,"Going to read the paragraph length"); |
589 | psiconv_progress(config,lev+4,off+len,"Going to read the paragraph length"); |
582 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
590 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
583 | if (res) |
591 | if (res) |
584 | goto ERROR4; |
592 | goto ERROR4; |
585 | if (temp != strlen(para->text)+1) { |
593 | if (temp != strlen(para->text)+1) { |
586 | psiconv_warn(lev+4,off+len, |
594 | psiconv_warn(config,lev+4,off+len, |
587 | "Disagreement of the length of paragraph in layout section"); |
595 | "Disagreement of the length of paragraph in layout section"); |
588 | psiconv_debug(lev+4,off+len, |
596 | psiconv_debug(config,lev+4,off+len, |
589 | "Paragraph length: layout section says %d, counted %d", |
597 | "Paragraph length: layout section says %d, counted %d", |
590 | temp,strlen(para->text)+1); |
598 | temp,strlen(para->text)+1); |
591 | } else |
599 | } else |
592 | psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp); |
600 | psiconv_debug(config,lev+4,off+len,"Paragraph length: %d",temp); |
593 | len += 4; |
601 | len += 4; |
594 | |
602 | |
595 | psiconv_progress(lev+4,off+len,"Going to read the paragraph type"); |
603 | psiconv_progress(config,lev+4,off+len,"Going to read the paragraph type"); |
596 | temp = psiconv_read_u8(buf,lev+4,off+len,&res); |
604 | temp = psiconv_read_u8(config,buf,lev+4,off+len,&res); |
597 | if (res) |
605 | if (res) |
598 | goto ERROR4; |
606 | goto ERROR4; |
599 | if (temp != 0x00) { |
607 | if (temp != 0x00) { |
600 | psiconv_debug(lev+4,off+len,"Type: %02x",temp); |
608 | psiconv_debug(config,lev+4,off+len,"Type: %02x",temp); |
601 | for (j = 0; j < psiconv_list_length(anon_styles); j++) { |
609 | for (j = 0; j < psiconv_list_length(anon_styles); j++) { |
602 | if (!(anon_ptr = psiconv_list_get(anon_styles,j))) { |
610 | if (!(anon_ptr = psiconv_list_get(anon_styles,j))) { |
603 | psiconv_warn(lev+4,off+len,"Massive memory curruption"); |
611 | psiconv_warn(config,lev+4,off+len,"Massive memory curruption"); |
604 | goto ERROR4; |
612 | goto ERROR4; |
605 | } |
613 | } |
606 | if (temp == anon_ptr->nr) |
614 | if (temp == anon_ptr->nr) |
607 | break; |
615 | break; |
608 | } |
616 | } |
609 | if (j == psiconv_list_length(anon_styles)) { |
617 | if (j == psiconv_list_length(anon_styles)) { |
610 | psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown"); |
618 | psiconv_warn(config,lev+4,off+len,"Layout section paragraph type unknown"); |
611 | psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead"); |
619 | psiconv_debug(config,lev+4,off+len,"Unknown type - using base styles instead"); |
612 | para->base_style = 0; |
620 | para->base_style = 0; |
613 | if (!(temp_style = psiconv_get_style(styles,0))) { |
621 | if (!(temp_style = psiconv_get_style(styles,0))) { |
614 | psiconv_warn(lev+4,off,"Base style unknown"); |
622 | psiconv_warn(config,lev+4,off,"Base style unknown"); |
615 | goto ERROR4; |
623 | goto ERROR4; |
616 | } |
624 | } |
617 | if (!(temp_para = psiconv_clone_paragraph_layout |
625 | if (!(temp_para = psiconv_clone_paragraph_layout |
618 | (temp_style->paragraph))) |
626 | (temp_style->paragraph))) |
619 | goto ERROR4; |
627 | goto ERROR4; |
… | |
… | |
638 | para->base_character = temp_char; |
646 | para->base_character = temp_char; |
639 | } |
647 | } |
640 | inline_count[i] = 0; |
648 | inline_count[i] = 0; |
641 | len += 0x01; |
649 | len += 0x01; |
642 | } else { |
650 | } else { |
643 | psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)" |
651 | psiconv_debug(config,lev+4,off+len,"Type: %02x (not based on a paragraph type)" |
644 | ,temp); |
652 | ,temp); |
645 | len += 0x01; |
653 | len += 0x01; |
646 | if (parse_styles) { |
654 | if (parse_styles) { |
647 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
655 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
648 | if (res) |
656 | if (res) |
649 | goto ERROR4; |
657 | goto ERROR4; |
650 | psiconv_progress(lev+4,off+len+temp+4, |
658 | psiconv_progress(config,lev+4,off+len+temp+4, |
651 | "Going to read the paragraph element base style"); |
659 | "Going to read the paragraph element base style"); |
652 | temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res); |
660 | temp = psiconv_read_u8(config,buf,lev+4, off+len+temp+4,&res); |
653 | if (res) |
661 | if (res) |
654 | goto ERROR4; |
662 | goto ERROR4; |
655 | psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp); |
663 | psiconv_debug(config,lev+4,off+len+temp+4, "Style: %02x",temp); |
656 | } else |
664 | } else |
657 | temp = 0x00; |
665 | temp = 0x00; |
658 | |
666 | |
659 | if (!(temp_style = psiconv_get_style (styles,temp))) { |
667 | if (!(temp_style = psiconv_get_style (styles,temp))) { |
660 | psiconv_warn(lev+4,off,"Unknown Style referenced"); |
668 | psiconv_warn(config,lev+4,off,"Unknown Style referenced"); |
661 | if (!(temp_style = psiconv_get_style(styles,0))) { |
669 | if (!(temp_style = psiconv_get_style(styles,0))) { |
662 | psiconv_warn(lev+4,off,"Base style unknown"); |
670 | psiconv_warn(config,lev+4,off,"Base style unknown"); |
663 | goto ERROR4; |
671 | goto ERROR4; |
664 | } |
672 | } |
665 | } |
673 | } |
666 | |
674 | |
667 | if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph))) |
675 | if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph))) |
… | |
… | |
673 | goto ERROR4; |
681 | goto ERROR4; |
674 | psiconv_free_character_layout(para->base_character); |
682 | psiconv_free_character_layout(para->base_character); |
675 | para->base_character = temp_char; |
683 | para->base_character = temp_char; |
676 | |
684 | |
677 | para->base_style = temp; |
685 | para->base_style = temp; |
678 | psiconv_progress(lev+4,off+len,"Going to read paragraph layout"); |
686 | psiconv_progress(config,lev+4,off+len,"Going to read paragraph layout"); |
679 | if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, |
687 | if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng, |
680 | para->base_paragraph))) |
688 | para->base_paragraph))) |
681 | goto ERROR4; |
689 | goto ERROR4; |
682 | len += leng; |
690 | len += leng; |
683 | if (parse_styles) |
691 | if (parse_styles) |
684 | len += 1; |
692 | len += 1; |
685 | psiconv_progress(lev+4,off+len,"Going to read number of in-line " |
693 | psiconv_progress(config,lev+4,off+len,"Going to read number of in-line " |
686 | "layout elements"); |
694 | "layout elements"); |
687 | inline_count[i] = psiconv_read_u32(buf,lev+4,off+len,&res); |
695 | inline_count[i] = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
688 | if (res) |
696 | if (res) |
689 | goto ERROR4; |
697 | goto ERROR4; |
690 | psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]); |
698 | psiconv_debug(config,lev+4,off+len,"Nr: %08x",inline_count[i]); |
691 | len += 4; |
699 | len += 4; |
692 | } |
700 | } |
693 | } |
701 | } |
694 | |
702 | |
695 | psiconv_progress(lev+2,off+len,"Going to read the text layout inline list"); |
703 | psiconv_progress(config,lev+2,off+len,"Going to read the text layout inline list"); |
696 | |
704 | |
697 | psiconv_progress(lev+3,off+len,"Going to read the number of elements"); |
705 | psiconv_progress(config,lev+3,off+len,"Going to read the number of elements"); |
698 | nr = psiconv_read_u32(buf,lev+3,off+len,&res); |
706 | nr = psiconv_read_u32(config,buf,lev+3,off+len,&res); |
699 | if (res) |
707 | if (res) |
700 | goto ERROR4; |
708 | goto ERROR4; |
701 | psiconv_debug(lev+3,off+len,"Elements: %08x",nr); |
709 | psiconv_debug(config,lev+3,off+len,"Elements: %08x",nr); |
702 | len += 0x04; |
710 | len += 0x04; |
703 | |
711 | |
704 | psiconv_progress(lev+3,off+len, |
712 | psiconv_progress(config,lev+3,off+len, |
705 | "Going to read the text layout inline elements"); |
713 | "Going to read the text layout inline elements"); |
706 | total = 0; |
714 | total = 0; |
707 | for (i = 0; i < psiconv_list_length(result); i++) { |
715 | for (i = 0; i < psiconv_list_length(result); i++) { |
708 | if (!(para = psiconv_list_get(result,i))) { |
716 | if (!(para = psiconv_list_get(result,i))) { |
709 | psiconv_warn(lev+3,off+len,"Massive memory corruption"); |
717 | psiconv_warn(config,lev+3,off+len,"Massive memory corruption"); |
710 | goto ERROR4; |
718 | goto ERROR4; |
711 | } |
719 | } |
712 | line_length = -1; |
720 | line_length = -1; |
713 | for (j = 0; j < inline_count[i]; j++) { |
721 | for (j = 0; j < inline_count[i]; j++) { |
714 | psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d", |
722 | psiconv_progress(config,lev+3,off+len,"Element %d: Paragraph %d, element %d", |
715 | total,i,j); |
723 | total,i,j); |
716 | if (total >= nr) { |
724 | if (total >= nr) { |
717 | psiconv_warn(lev+3,off+len, |
725 | psiconv_warn(config,lev+3,off+len, |
718 | "Layout section inlines: not enough element"); |
726 | "Layout section inlines: not enough element"); |
719 | psiconv_debug(lev+3,off+len,"Can't read element!"); |
727 | psiconv_debug(config,lev+3,off+len,"Can't read element!"); |
720 | } else { |
728 | } else { |
721 | total ++; |
729 | total ++; |
722 | in_line.object = NULL; |
730 | in_line.object = NULL; |
723 | in_line.layout = NULL; |
731 | in_line.layout = NULL; |
724 | if (!(in_line.layout = psiconv_clone_character_layout |
732 | if (!(in_line.layout = psiconv_clone_character_layout |
725 | (para->base_character))) |
733 | (para->base_character))) |
726 | goto ERROR4; |
734 | goto ERROR4; |
727 | psiconv_progress(lev+4,off+len,"Going to read the element type"); |
735 | psiconv_progress(config,lev+4,off+len,"Going to read the element type"); |
728 | temp = psiconv_read_u8(buf,lev+4,len+off,&res); |
736 | temp = psiconv_read_u8(config,buf,lev+4,len+off,&res); |
729 | if (res) |
737 | if (res) |
730 | goto ERROR5; |
738 | goto ERROR5; |
731 | len += 1; |
739 | len += 1; |
732 | psiconv_debug(lev+4,off+len,"Type: %02x",temp); |
740 | psiconv_debug(config,lev+4,off+len,"Type: %02x",temp); |
733 | psiconv_progress(lev+4,off+len, |
741 | psiconv_progress(config,lev+4,off+len, |
734 | "Going to read the number of characters it applies to"); |
742 | "Going to read the number of characters it applies to"); |
735 | in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res); |
743 | in_line.length = psiconv_read_u32(config,buf,lev+4,len+off,&res); |
736 | if (res) |
744 | if (res) |
737 | goto ERROR5; |
745 | goto ERROR5; |
738 | psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); |
746 | psiconv_debug(config,lev+4,off+len,"Length: %02x",in_line.length); |
739 | len += 4; |
747 | len += 4; |
740 | psiconv_progress(lev+4,off+len,"Going to read the character layout"); |
748 | psiconv_progress(config,lev+4,off+len,"Going to read the character layout"); |
741 | if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, |
749 | if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng, |
742 | in_line.layout))) |
750 | in_line.layout))) |
743 | goto ERROR5; |
751 | goto ERROR5; |
744 | len += leng; |
752 | len += leng; |
745 | |
753 | |
746 | if (temp == 0x01) { |
754 | if (temp == 0x01) { |
747 | psiconv_debug(lev+4,off+len,"Found an embedded object"); |
755 | psiconv_debug(config,lev+4,off+len,"Found an embedded object"); |
748 | psiconv_progress(lev+4,off+len,"Going to read the object marker " |
756 | psiconv_progress(config,lev+4,off+len,"Going to read the object marker " |
749 | "(0x%08x expected)",PSICONV_ID_OBJECT); |
757 | "(0x%08x expected)",PSICONV_ID_OBJECT); |
750 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
758 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
751 | if (res) |
759 | if (res) |
752 | goto ERROR5; |
760 | goto ERROR5; |
753 | if (temp != PSICONV_ID_OBJECT) { |
761 | if (temp != PSICONV_ID_OBJECT) { |
754 | psiconv_warn(lev+4,off+len,"Unknown id marks embedded object"); |
762 | psiconv_warn(config,lev+4,off+len,"Unknown id marks embedded object"); |
755 | psiconv_debug(lev+4,off+len,"Marker: read %08x, expected %08x", |
763 | psiconv_debug(config,lev+4,off+len,"Marker: read %08x, expected %08x", |
756 | temp,PSICONV_ID_OBJECT); |
764 | temp,PSICONV_ID_OBJECT); |
757 | } |
765 | } |
758 | len += 4; |
766 | len += 4; |
759 | psiconv_progress(lev+4,off+len, |
767 | psiconv_progress(config,lev+4,off+len, |
760 | "Going to read the Embedded Object Section offset"); |
768 | "Going to read the Embedded Object Section offset"); |
761 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
769 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
762 | if (res) |
770 | if (res) |
763 | goto ERROR5; |
771 | goto ERROR5; |
764 | psiconv_debug(lev+4,off+len, "Offset: %08x",temp); |
772 | psiconv_debug(config,lev+4,off+len, "Offset: %08x",temp); |
765 | len += 4; |
773 | len += 4; |
766 | psiconv_progress(lev+4,off+len, |
774 | psiconv_progress(config,lev+4,off+len, |
767 | "Going to parse the Embedded Object"); |
775 | "Going to parse the Embedded Object Section"); |
768 | if ((res = psiconv_parse_embedded_object(buf,lev+4,temp, |
776 | if ((res = psiconv_parse_embedded_object_section(config,buf,lev+4,temp, |
769 | NULL,&(in_line.object)))) |
777 | NULL,&(in_line.object)))) |
770 | goto ERROR5; |
778 | goto ERROR5; |
771 | psiconv_progress(lev+4,off+len, |
779 | psiconv_progress(config,lev+4,off+len, |
772 | "Going to read the object width"); |
780 | "Going to read the object width"); |
773 | in_line.object_width = psiconv_read_length(buf,lev+4,off+len, |
781 | in_line.object_width = psiconv_read_length(config,buf,lev+4,off+len, |
774 | &leng,&res); |
782 | &leng,&res); |
775 | if (res) |
783 | if (res) |
776 | goto ERROR5; |
784 | goto ERROR5; |
777 | psiconv_debug(lev+4,off+len,"Object width: %f cm", |
785 | psiconv_debug(config,lev+4,off+len,"Object width: %f cm", |
778 | in_line.object_width); |
786 | in_line.object_width); |
779 | len += leng; |
787 | len += leng; |
780 | psiconv_progress(lev+4,off+len, |
788 | psiconv_progress(config,lev+4,off+len, |
781 | "Going to read the object height"); |
789 | "Going to read the object height"); |
782 | in_line.object_height = psiconv_read_length(buf,lev+4,off+len,&leng, |
790 | in_line.object_height = psiconv_read_length(config,buf,lev+4,off+len,&leng, |
783 | &res); |
791 | &res); |
784 | if (res) |
792 | if (res) |
785 | goto ERROR5; |
793 | goto ERROR5; |
786 | psiconv_debug(lev+4,off+len,"Object height: %f cm", |
794 | psiconv_debug(config,lev+4,off+len,"Object height: %f cm", |
787 | in_line.object_height); |
795 | in_line.object_height); |
788 | len += leng; |
796 | len += leng; |
789 | } else if (temp != 0x00) { |
797 | } else if (temp != 0x00) { |
790 | psiconv_warn(lev+4,off+len,"Layout section unknown inline type"); |
798 | psiconv_warn(config,lev+4,off+len,"Layout section unknown inline type"); |
791 | } |
799 | } |
792 | if (line_length + in_line.length > strlen(para->text)) { |
800 | if (line_length + in_line.length > strlen(para->text)) { |
793 | psiconv_warn(lev+4,off+len, |
801 | psiconv_warn(config,lev+4,off+len, |
794 | "Layout section inlines: line length mismatch"); |
802 | "Layout section inlines: line length mismatch"); |
795 | res = -1; |
803 | res = -1; |
796 | in_line.length = strlen(para->text) - line_length; |
804 | in_line.length = strlen(para->text) - line_length; |
797 | } |
805 | } |
798 | line_length += in_line.length; |
806 | line_length += in_line.length; |
… | |
… | |
801 | } |
809 | } |
802 | } |
810 | } |
803 | } |
811 | } |
804 | |
812 | |
805 | if (total != nr) { |
813 | if (total != nr) { |
806 | psiconv_warn(lev+4,off+len, |
814 | psiconv_warn(config,lev+4,off+len, |
807 | "Layout section too many inlines, skipping remaining"); |
815 | "Layout section too many inlines, skipping remaining"); |
808 | } |
816 | } |
809 | |
817 | |
810 | free(inline_count); |
818 | free(inline_count); |
811 | |
819 | |
812 | for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { |
820 | for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { |
813 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
821 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
814 | psiconv_warn(lev+4,off+len,"Massive memory corruption"); |
822 | psiconv_warn(config,lev+4,off+len,"Massive memory corruption"); |
815 | goto ERROR2; |
823 | goto ERROR2; |
816 | } |
824 | } |
817 | psiconv_free_character_layout(anon_ptr->character); |
825 | psiconv_free_character_layout(anon_ptr->character); |
818 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
826 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
819 | } |
827 | } |
820 | psiconv_list_free(anon_styles); |
828 | psiconv_list_free(anon_styles); |
821 | |
829 | |
822 | if (length) |
830 | if (length) |
823 | *length = len; |
831 | *length = len; |
824 | |
832 | |
825 | psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x)", |
833 | psiconv_progress(config,lev+1,off+len-1,"End of layout section (total length: %08x)", |
826 | len); |
834 | len); |
827 | |
835 | |
828 | return 0; |
836 | return 0; |
829 | |
837 | |
830 | ERROR4_4: |
838 | ERROR4_4: |
… | |
… | |
845 | |
853 | |
846 | ERROR5: |
854 | ERROR5: |
847 | if (in_line.layout) |
855 | if (in_line.layout) |
848 | psiconv_free_character_layout(in_line.layout); |
856 | psiconv_free_character_layout(in_line.layout); |
849 | if (in_line.object) |
857 | if (in_line.object) |
850 | psiconv_free_object(in_line.object); |
858 | psiconv_free_embedded_object_section(in_line.object); |
851 | ERROR4: |
859 | ERROR4: |
852 | free(inline_count); |
860 | free(inline_count); |
853 | ERROR3: |
861 | ERROR3: |
854 | for (i = 0; i < psiconv_list_length(anon_styles); i++) { |
862 | for (i = 0; i < psiconv_list_length(anon_styles); i++) { |
855 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
863 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
856 | psiconv_warn(lev+1,off,"Massive memory corruption"); |
864 | psiconv_warn(config,lev+1,off,"Massive memory corruption"); |
857 | break; |
865 | break; |
858 | } |
866 | } |
859 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
867 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
860 | psiconv_free_character_layout(anon_ptr->character); |
868 | psiconv_free_character_layout(anon_ptr->character); |
861 | } |
869 | } |
862 | |
870 | |
863 | ERROR2: |
871 | ERROR2: |
864 | psiconv_list_free(anon_styles); |
872 | psiconv_list_free(anon_styles); |
865 | ERROR1: |
873 | ERROR1: |
866 | psiconv_warn(lev+1,off,"Reading of Layout Section failed"); |
874 | psiconv_warn(config,lev+1,off,"Reading of Layout Section failed"); |
867 | if (length) |
875 | if (length) |
868 | *length = 0; |
876 | *length = 0; |
869 | if (!res) |
877 | if (!res) |
870 | return -PSICONV_E_NOMEM; |
878 | return -PSICONV_E_NOMEM; |
871 | else |
879 | else |
872 | return res; |
880 | return res; |
873 | } |
881 | } |
874 | |
882 | |
875 | int psiconv_parse_styled_layout_section(const psiconv_buffer buf, |
883 | int psiconv_parse_styled_layout_section(const psiconv_config config, |
|
|
884 | const psiconv_buffer buf, |
876 | int lev,psiconv_u32 off, |
885 | int lev,psiconv_u32 off, |
877 | int *length, |
886 | int *length, |
878 | psiconv_text_and_layout result, |
887 | psiconv_text_and_layout result, |
879 | psiconv_word_styles_section styles) |
888 | psiconv_word_styles_section styles) |
880 | { |
889 | { |
881 | return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); |
890 | return psiconv_parse_layout_section(config,buf,lev,off,length,result,styles,1); |
882 | } |
891 | } |
883 | |
892 | |
884 | int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, |
893 | int psiconv_parse_styleless_layout_section(const psiconv_config config, |
|
|
894 | const psiconv_buffer buf, |
885 | int lev,psiconv_u32 off, |
895 | int lev,psiconv_u32 off, |
886 | int *length, |
896 | int *length, |
887 | psiconv_text_and_layout result, |
897 | psiconv_text_and_layout result, |
888 | const psiconv_character_layout base_char, |
898 | const psiconv_character_layout base_char, |
889 | const psiconv_paragraph_layout base_para) |
899 | const psiconv_paragraph_layout base_para) |
… | |
… | |
906 | goto ERROR5; |
916 | goto ERROR5; |
907 | if (!(styles_section->styles = psiconv_list_new(sizeof( |
917 | if (!(styles_section->styles = psiconv_list_new(sizeof( |
908 | struct psiconv_word_style_s)))) |
918 | struct psiconv_word_style_s)))) |
909 | goto ERROR6; |
919 | goto ERROR6; |
910 | |
920 | |
911 | res = psiconv_parse_layout_section(buf,lev,off,length,result, |
921 | res = psiconv_parse_layout_section(config,buf,lev,off,length,result, |
912 | styles_section,0); |
922 | styles_section,0); |
913 | |
923 | |
914 | psiconv_free_word_styles_section(styles_section); |
924 | psiconv_free_word_styles_section(styles_section); |
915 | return res; |
925 | return res; |
916 | |
926 | |
… | |
… | |
923 | ERROR3: |
933 | ERROR3: |
924 | free(styles_section->normal); |
934 | free(styles_section->normal); |
925 | ERROR2: |
935 | ERROR2: |
926 | free(styles_section); |
936 | free(styles_section); |
927 | ERROR1: |
937 | ERROR1: |
928 | psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed"); |
938 | psiconv_warn(config,lev+1,off,"Reading of Styleless Layout Section failed"); |
929 | if (length) |
939 | if (length) |
930 | *length = 0; |
940 | *length = 0; |
931 | if (!res) |
941 | if (!res) |
932 | return -PSICONV_E_NOMEM; |
942 | return -PSICONV_E_NOMEM; |
933 | else |
943 | else |
934 | return res; |
944 | return res; |
935 | } |
945 | } |
936 | |
946 | |
937 | int psiconv_parse_embedded_object(const psiconv_buffer buf, int lev, |
947 | int psiconv_parse_embedded_object_section(const psiconv_config config, |
|
|
948 | const psiconv_buffer buf, int lev, |
938 | psiconv_u32 off, int *length, |
949 | psiconv_u32 off, int *length, |
939 | psiconv_object *result) |
950 | psiconv_embedded_object_section *result) |
940 | { |
951 | { |
941 | int res=0; |
952 | int res=0; |
942 | int len=0; |
953 | int len=0; |
943 | int leng,i; |
954 | int leng,i; |
944 | psiconv_section_table_section table; |
955 | psiconv_section_table_section table; |
945 | psiconv_section_table_entry entry; |
956 | psiconv_section_table_entry entry; |
946 | psiconv_u32 icon_sec=0,display_sec=0,table_sec=0; |
957 | psiconv_u32 icon_sec=0,display_sec=0,table_sec=0; |
947 | psiconv_buffer subbuf; |
958 | psiconv_buffer subbuf; |
948 | |
959 | |
949 | psiconv_progress(lev+1,off+len,"Going to read an Embedded Object"); |
960 | psiconv_progress(config,lev+1,off+len,"Going to read an Embedded Object"); |
950 | if (!(*result = malloc(sizeof(**result)))) |
961 | if (!(*result = malloc(sizeof(**result)))) |
951 | goto ERROR1; |
962 | goto ERROR1; |
952 | |
963 | |
953 | psiconv_progress(lev+2,off+len,"Going to read the Embedded Object Section"); |
964 | psiconv_progress(config,lev+2,off+len,"Going to read the Embedded Object Section"); |
954 | psiconv_parse_section_table_section(buf,lev+2,off+len,&leng,&table); |
965 | psiconv_parse_section_table_section(config,buf,lev+2,off+len,&leng,&table); |
955 | len += leng; |
966 | len += leng; |
956 | |
967 | |
957 | for (i = 0; i < psiconv_list_length(table); i++) { |
968 | for (i = 0; i < psiconv_list_length(table); i++) { |
958 | psiconv_progress(lev+2,off+len,"Going to read entry %d",i); |
969 | psiconv_progress(config,lev+2,off+len,"Going to read entry %d",i); |
959 | if (!(entry = psiconv_list_get(table,i))) |
970 | if (!(entry = psiconv_list_get(table,i))) |
960 | goto ERROR2; |
971 | goto ERROR2; |
961 | if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) { |
972 | if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) { |
962 | display_sec = entry->offset; |
973 | display_sec = entry->offset; |
963 | psiconv_debug(lev+3,off+len,"Found the Object Display Section at %08x", |
974 | psiconv_debug(config,lev+3,off+len,"Found the Object Display Section at %08x", |
964 | display_sec); |
975 | display_sec); |
965 | } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) { |
976 | } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) { |
966 | icon_sec = entry->offset; |
977 | icon_sec = entry->offset; |
967 | psiconv_debug(lev+3,off+len,"Found the Object Icon Section at %08x", |
978 | psiconv_debug(config,lev+3,off+len,"Found the Object Icon Section at %08x", |
968 | icon_sec); |
979 | icon_sec); |
969 | } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) { |
980 | } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) { |
970 | table_sec = entry->offset; |
981 | table_sec = entry->offset; |
971 | psiconv_debug(lev+3,off+len,"Found the Object Section Table Section at %08x", |
982 | psiconv_debug(config,lev+3,off+len,"Found the Object Section Table Section at %08x", |
972 | table_sec); |
983 | table_sec); |
973 | } else { |
984 | } else { |
974 | psiconv_warn(lev+3,off+len, |
985 | psiconv_warn(config,lev+3,off+len, |
975 | "Found unknown section in the Object Display Section " |
986 | "Found unknown section in the Object Display Section " |
976 | "(ignoring)"); |
987 | "(ignoring)"); |
977 | psiconv_debug(lev+3,off+len,"Section ID %08x, offset %08x", |
988 | psiconv_debug(config,lev+3,off+len,"Section ID %08x, offset %08x", |
978 | entry->id, entry->offset); |
989 | entry->id, entry->offset); |
979 | } |
990 | } |
980 | } |
991 | } |
981 | |
992 | |
982 | psiconv_progress(lev+2,off+len,"Looking for the Object Display Section"); |
993 | psiconv_progress(config,lev+2,off+len,"Looking for the Object Display Section"); |
983 | if (!icon_sec) { |
994 | if (!icon_sec) { |
984 | psiconv_warn(lev+2,off+len,"Object Display Section not found"); |
995 | psiconv_warn(config,lev+2,off+len,"Object Display Section not found"); |
985 | (*result)->display = NULL; |
996 | (*result)->display = NULL; |
986 | } else { |
997 | } else { |
987 | psiconv_debug(lev+2,off+len,"Object Display Section at offset %08x", |
998 | psiconv_debug(config,lev+2,off+len,"Object Display Section at offset %08x", |
988 | display_sec); |
999 | display_sec); |
989 | if ((res = psiconv_parse_object_display_section(buf,lev+2,display_sec,NULL, |
1000 | if ((res = psiconv_parse_object_display_section(config,buf,lev+2,display_sec,NULL, |
990 | &(*result)->display))) |
1001 | &(*result)->display))) |
991 | goto ERROR2; |
1002 | goto ERROR2; |
992 | } |
1003 | } |
993 | |
1004 | |
994 | psiconv_progress(lev+2,off+len,"Looking for the Object Icon Section"); |
1005 | psiconv_progress(config,lev+2,off+len,"Looking for the Object Icon Section"); |
995 | if (!icon_sec) { |
1006 | if (!icon_sec) { |
996 | psiconv_warn(lev+2,off+len,"Object Icon Section not found"); |
1007 | psiconv_warn(config,lev+2,off+len,"Object Icon Section not found"); |
997 | (*result)->icon = NULL; |
1008 | (*result)->icon = NULL; |
998 | } else { |
1009 | } else { |
999 | psiconv_debug(lev+2,off+len,"Object Icon Section at offset %08x",icon_sec); |
1010 | psiconv_debug(config,lev+2,off+len,"Object Icon Section at offset %08x",icon_sec); |
1000 | if ((res = psiconv_parse_object_icon_section(buf,lev+2,icon_sec,NULL, |
1011 | if ((res = psiconv_parse_object_icon_section(config,buf,lev+2,icon_sec,NULL, |
1001 | &(*result)->icon))) |
1012 | &(*result)->icon))) |
1002 | goto ERROR3; |
1013 | goto ERROR3; |
1003 | } |
1014 | } |
1004 | |
1015 | |
1005 | psiconv_progress(lev+2,off+len, |
1016 | psiconv_progress(config,lev+2,off+len, |
1006 | "Looking for the Section Table Offset Section"); |
1017 | "Looking for the Section Table Offset Section"); |
1007 | if (!table_sec) { |
1018 | if (!table_sec) { |
1008 | psiconv_warn(lev+2,off+len, |
1019 | psiconv_warn(config,lev+2,off+len, |
1009 | "Embedded Section Table Offset Section not found"); |
1020 | "Embedded Section Table Offset Section not found"); |
1010 | (*result)->object = NULL; |
1021 | (*result)->object = NULL; |
1011 | } else { |
1022 | } else { |
1012 | psiconv_progress(lev+2,off+len, |
1023 | psiconv_progress(config,lev+2,off+len, |
1013 | "Extracting object: add %08x to all following offsets", |
1024 | "Extracting object: add %08x to all following offsets", |
1014 | table_sec); |
1025 | table_sec); |
1015 | /* We can't determine the length of the object, so we just take it all */ |
1026 | /* We can't determine the length of the object, so we just take it all */ |
1016 | if ((res = psiconv_buffer_subbuffer(&subbuf,buf,table_sec, |
1027 | if ((res = psiconv_buffer_subbuffer(&subbuf,buf,table_sec, |
1017 | psiconv_buffer_length(buf)-table_sec))) |
1028 | psiconv_buffer_length(buf)-table_sec))) |
… | |
… | |
1020 | if (!((*result)->object = malloc(sizeof(*(*result)->object)))) |
1031 | if (!((*result)->object = malloc(sizeof(*(*result)->object)))) |
1021 | goto ERROR5; |
1032 | goto ERROR5; |
1022 | |
1033 | |
1023 | /* We need to find the file type, but we don't have a normal header */ |
1034 | /* We need to find the file type, but we don't have a normal header */ |
1024 | /* So we try to find the Application ID Section and hope for the best */ |
1035 | /* So we try to find the Application ID Section and hope for the best */ |
1025 | psiconv_progress(lev+3,0,"Trying to determine the file type"); |
1036 | psiconv_progress(config,lev+3,0,"Trying to determine the file type"); |
1026 | (*result)->object->type = psiconv_determine_embedded_object_type |
1037 | (*result)->object->type = psiconv_determine_embedded_object_type |
1027 | (subbuf,lev+3,&res); |
1038 | (config,subbuf,lev+3,&res); |
1028 | switch ((*result)->object->type) { |
1039 | switch ((*result)->object->type) { |
1029 | case psiconv_word_file: |
1040 | case psiconv_word_file: |
1030 | if ((res = psiconv_parse_word_file(subbuf,lev+3,0, |
1041 | if ((res = psiconv_parse_word_file(config,subbuf,lev+3,0, |
1031 | ((psiconv_word_f *) &(*result)->object->file)))) |
1042 | ((psiconv_word_f *) &(*result)->object->file)))) |
1032 | goto ERROR6; |
1043 | goto ERROR6; |
1033 | break; |
1044 | break; |
1034 | case psiconv_texted_file: |
1045 | case psiconv_texted_file: |
1035 | if ((res = psiconv_parse_texted_file(subbuf,lev+3,0, |
1046 | if ((res = psiconv_parse_texted_file(config,subbuf,lev+3,0, |
1036 | ((psiconv_texted_f *) &(*result)->object->file)))) |
1047 | ((psiconv_texted_f *) &(*result)->object->file)))) |
1037 | goto ERROR6; |
1048 | goto ERROR6; |
1038 | break; |
1049 | break; |
1039 | case psiconv_sheet_file: |
1050 | case psiconv_sheet_file: |
1040 | if ((res = psiconv_parse_sheet_file(subbuf,lev+3,0, |
1051 | if ((res = psiconv_parse_sheet_file(config,subbuf,lev+3,0, |
1041 | ((psiconv_sheet_f *) &(*result)->object->file)))) |
1052 | ((psiconv_sheet_f *) &(*result)->object->file)))) |
1042 | goto ERROR6; |
1053 | goto ERROR6; |
1043 | break; |
1054 | break; |
1044 | case psiconv_sketch_file: |
1055 | case psiconv_sketch_file: |
1045 | if ((res = psiconv_parse_sketch_file(subbuf,lev+3,0, |
1056 | if ((res = psiconv_parse_sketch_file(config,subbuf,lev+3,0, |
1046 | ((psiconv_sketch_f *) &(*result)->object->file)))) |
1057 | ((psiconv_sketch_f *) &(*result)->object->file)))) |
1047 | goto ERROR6; |
1058 | goto ERROR6; |
1048 | break; |
1059 | break; |
1049 | default: |
1060 | default: |
1050 | psiconv_warn(lev+3,0,"Can't parse embedded object (still continuing)"); |
1061 | psiconv_warn(config,lev+3,0,"Can't parse embedded object (still continuing)"); |
1051 | (*result)->object->file = NULL; |
1062 | (*result)->object->file = NULL; |
1052 | } |
1063 | } |
1053 | } |
1064 | } |
1054 | |
1065 | |
1055 | if (length) |
1066 | if (length) |
1056 | *length = len; |
1067 | *length = len; |
1057 | |
1068 | |
1058 | psiconv_progress(lev+1,off+len-1,"End of Embedded Object Section " |
1069 | psiconv_progress(config,lev+1,off+len-1,"End of Embedded Object Section " |
1059 | "(total length: %08x)",len); |
1070 | "(total length: %08x)",len); |
1060 | |
1071 | |
1061 | return res; |
1072 | return res; |
1062 | |
1073 | |
1063 | |
1074 | |
… | |
… | |
1070 | ERROR3: |
1081 | ERROR3: |
1071 | psiconv_free_object_display_section((*result)->display); |
1082 | psiconv_free_object_display_section((*result)->display); |
1072 | ERROR2: |
1083 | ERROR2: |
1073 | psiconv_free_section_table_section(table); |
1084 | psiconv_free_section_table_section(table); |
1074 | ERROR1: |
1085 | ERROR1: |
1075 | psiconv_warn(lev+1,off,"Reading Embedded Object failed"); |
1086 | psiconv_warn(config,lev+1,off,"Reading Embedded Object failed"); |
1076 | |
1087 | |
1077 | if (length) |
1088 | if (length) |
1078 | *length = 0; |
1089 | *length = 0; |
1079 | |
1090 | |
1080 | if (res == 0) |
1091 | if (res == 0) |
… | |
… | |
1082 | else |
1093 | else |
1083 | return res; |
1094 | return res; |
1084 | } |
1095 | } |
1085 | |
1096 | |
1086 | psiconv_file_type_t psiconv_determine_embedded_object_type |
1097 | psiconv_file_type_t psiconv_determine_embedded_object_type |
1087 | (const psiconv_buffer buf,int lev, |
1098 | (const psiconv_config config, |
|
|
1099 | const psiconv_buffer buf,int lev, |
1088 | int *status) |
1100 | int *status) |
1089 | { |
1101 | { |
1090 | psiconv_u32 off; |
1102 | psiconv_u32 off; |
1091 | psiconv_section_table_section table; |
1103 | psiconv_section_table_section table; |
1092 | int res,i; |
1104 | int res,i; |
1093 | psiconv_file_type_t file_type = psiconv_unknown_file; |
1105 | psiconv_file_type_t file_type = psiconv_unknown_file; |
1094 | psiconv_section_table_entry entry; |
1106 | psiconv_section_table_entry entry; |
1095 | psiconv_application_id_section applid; |
1107 | psiconv_application_id_section applid; |
1096 | |
1108 | |
1097 | psiconv_progress(lev+1,0,"Going to determine embedded object file type"); |
1109 | psiconv_progress(config,lev+1,0,"Going to determine embedded object file type"); |
1098 | psiconv_progress(lev+2,0,"Going to read the Section Table Offset Section"); |
1110 | psiconv_progress(config,lev+2,0,"Going to read the Section Table Offset Section"); |
1099 | off = psiconv_read_u32(buf,lev,0,&res); |
1111 | off = psiconv_read_u32(config,buf,lev,0,&res); |
1100 | if (res) |
1112 | if (res) |
1101 | goto ERROR1; |
1113 | goto ERROR1; |
1102 | psiconv_debug(lev+2,0,"Offset: %08x",off); |
1114 | psiconv_debug(config,lev+2,0,"Offset: %08x",off); |
1103 | |
1115 | |
1104 | psiconv_progress(lev+2,off,"Going to read the Section Table Section"); |
1116 | psiconv_progress(config,lev+2,off,"Going to read the Section Table Section"); |
1105 | if ((res = psiconv_parse_section_table_section(buf,lev+2,off,NULL,&table))) |
1117 | if ((res = psiconv_parse_section_table_section(config,buf,lev+2,off,NULL,&table))) |
1106 | goto ERROR1; |
1118 | goto ERROR1; |
1107 | |
1119 | |
1108 | psiconv_progress(lev+2,off,"Going to search the Section Table Section " |
1120 | psiconv_progress(config,lev+2,off,"Going to search the Section Table Section " |
1109 | "for the Application ID Section"); |
1121 | "for the Application ID Section"); |
1110 | for (i=0; i < psiconv_list_length(table); i++) { |
1122 | for (i=0; i < psiconv_list_length(table); i++) { |
1111 | psiconv_progress(lev+3,off,"Going to read entry %d",i); |
1123 | psiconv_progress(config,lev+3,off,"Going to read entry %d",i); |
1112 | if (!(entry = psiconv_list_get(table,i))) |
1124 | if (!(entry = psiconv_list_get(table,i))) |
1113 | goto ERROR2; |
1125 | goto ERROR2; |
1114 | if (entry->id == PSICONV_ID_APPL_ID_SECTION) { |
1126 | if (entry->id == PSICONV_ID_APPL_ID_SECTION) { |
1115 | psiconv_progress(lev+3,off, |
1127 | psiconv_progress(config,lev+3,off, |
1116 | "Found the Application ID Section at offset %08x", |
1128 | "Found the Application ID Section at offset %08x", |
1117 | entry->offset); |
1129 | entry->offset); |
1118 | off = entry->offset; |
1130 | off = entry->offset; |
1119 | break; |
1131 | break; |
1120 | } |
1132 | } |
1121 | } |
1133 | } |
1122 | if (i == psiconv_list_length(table)) { |
1134 | if (i == psiconv_list_length(table)) { |
1123 | psiconv_warn(lev+2,off,"No Application ID Section found"); |
1135 | psiconv_warn(config,lev+2,off,"No Application ID Section found"); |
1124 | res = PSICONV_E_PARSE; |
1136 | res = PSICONV_E_PARSE; |
1125 | goto ERROR2; |
1137 | goto ERROR2; |
1126 | } |
1138 | } |
1127 | |
1139 | |
1128 | psiconv_progress(lev+2,off,"Going to read the Application ID Section"); |
1140 | psiconv_progress(config,lev+2,off,"Going to read the Application ID Section"); |
1129 | if ((res = psiconv_parse_application_id_section(buf,lev+2,off,NULL,&applid))) |
1141 | if ((res = psiconv_parse_application_id_section(config,buf,lev+2,off,NULL,&applid))) |
1130 | goto ERROR2; |
1142 | goto ERROR2; |
1131 | |
1143 | |
1132 | switch (applid->id) { |
1144 | switch (applid->id) { |
1133 | case PSICONV_ID_WORD: file_type = psiconv_word_file; |
1145 | case PSICONV_ID_WORD: file_type = psiconv_word_file; |
1134 | psiconv_debug(lev+2,off,"Found a Word file"); |
1146 | psiconv_debug(config,lev+2,off,"Found a Word file"); |
1135 | break; |
1147 | break; |
1136 | case PSICONV_ID_TEXTED: file_type = psiconv_texted_file; |
1148 | case PSICONV_ID_TEXTED: file_type = psiconv_texted_file; |
1137 | psiconv_debug(lev+2,off,"Found a TextEd file"); |
1149 | psiconv_debug(config,lev+2,off,"Found a TextEd file"); |
1138 | break; |
1150 | break; |
1139 | case PSICONV_ID_SKETCH: file_type = psiconv_sketch_file; |
1151 | case PSICONV_ID_SKETCH: file_type = psiconv_sketch_file; |
1140 | psiconv_debug(lev+2,off,"Found a Sketch file"); |
1152 | psiconv_debug(config,lev+2,off,"Found a Sketch file"); |
1141 | break; |
1153 | break; |
1142 | case PSICONV_ID_SHEET: file_type = psiconv_sheet_file; |
1154 | case PSICONV_ID_SHEET: file_type = psiconv_sheet_file; |
1143 | psiconv_debug(lev+2,off,"Found a Sheet file"); |
1155 | psiconv_debug(config,lev+2,off,"Found a Sheet file"); |
1144 | break; |
1156 | break; |
1145 | default: psiconv_warn(lev+2,off,"Found an unknown file type"); |
1157 | default: psiconv_warn(config,lev+2,off,"Found an unknown file type"); |
1146 | psiconv_debug(lev+2,off,"Found ID %08x",applid->id); |
1158 | psiconv_debug(config,lev+2,off,"Found ID %08x",applid->id); |
1147 | } |
1159 | } |
1148 | |
1160 | |
1149 | ERROR2: |
1161 | ERROR2: |
1150 | psiconv_free_application_id_section(applid); |
1162 | psiconv_free_application_id_section(applid); |
1151 | ERROR1: |
1163 | ERROR1: |
… | |
… | |
1154 | *status = res; |
1166 | *status = res; |
1155 | return file_type; |
1167 | return file_type; |
1156 | |
1168 | |
1157 | } |
1169 | } |
1158 | |
1170 | |
1159 | int psiconv_parse_object_display_section(const psiconv_buffer buf,int lev, |
1171 | int psiconv_parse_object_display_section(const psiconv_config config, |
|
|
1172 | const psiconv_buffer buf,int lev, |
1160 | psiconv_u32 off, int *length, |
1173 | psiconv_u32 off, int *length, |
1161 | psiconv_object_display_section *result) |
1174 | psiconv_object_display_section *result) |
1162 | { |
1175 | { |
1163 | int res = 0; |
1176 | int res = 0; |
1164 | int len = 0; |
1177 | int len = 0; |
1165 | int leng; |
1178 | int leng; |
1166 | psiconv_u32 temp; |
1179 | psiconv_u32 temp; |
1167 | |
1180 | |
1168 | psiconv_progress(lev+1,off,"Going to read the Object Display Section"); |
1181 | psiconv_progress(config,lev+1,off,"Going to read the Object Display Section"); |
1169 | if (!(*result = malloc(sizeof(**result)))) |
1182 | if (!(*result = malloc(sizeof(**result)))) |
1170 | goto ERROR1; |
1183 | goto ERROR1; |
1171 | |
1184 | |
1172 | psiconv_progress(lev+2,off+len,"Going to read the display as icon flag " |
1185 | psiconv_progress(config,lev+2,off+len,"Going to read the display as icon flag " |
1173 | "(expecting 0x00 or 0x01)"); |
1186 | "(expecting 0x00 or 0x01)"); |
1174 | temp = psiconv_read_u8(buf,lev+2,off+len,&res); |
1187 | temp = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
1175 | if (res) |
1188 | if (res) |
1176 | goto ERROR2; |
1189 | goto ERROR2; |
1177 | if (temp == 0x00) { |
1190 | if (temp == 0x00) { |
1178 | (*result)->show_icon = psiconv_bool_true; |
1191 | (*result)->show_icon = psiconv_bool_true; |
1179 | psiconv_debug(lev+2,off+len,"Displayed as icon"); |
1192 | psiconv_debug(config,lev+2,off+len,"Displayed as icon"); |
1180 | } else if (temp == 0x01) { |
1193 | } else if (temp == 0x01) { |
1181 | (*result)->show_icon = psiconv_bool_false; |
1194 | (*result)->show_icon = psiconv_bool_false; |
1182 | psiconv_debug(lev+2,off+len,"Displayed as full document"); |
1195 | psiconv_debug(config,lev+2,off+len,"Displayed as full document"); |
1183 | } else { |
1196 | } else { |
1184 | psiconv_warn(lev+2,off+len,"Unknown Object Display Section Icon Flag"); |
1197 | psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section Icon Flag"); |
1185 | psiconv_debug(lev+2,off+len,"Icon flag found: %02x",temp); |
1198 | psiconv_debug(config,lev+2,off+len,"Icon flag found: %02x",temp); |
1186 | /* Improvise */ |
1199 | /* Improvise */ |
1187 | (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true); |
1200 | (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true); |
1188 | } |
1201 | } |
1189 | len ++; |
1202 | len ++; |
1190 | |
1203 | |
1191 | psiconv_progress(lev+2,off+len,"Going to read the display width"); |
1204 | psiconv_progress(config,lev+2,off+len,"Going to read the display width"); |
1192 | (*result)->width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1205 | (*result)->width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1193 | if (res) |
1206 | if (res) |
1194 | goto ERROR2; |
1207 | goto ERROR2; |
1195 | psiconv_debug(lev+2,off+len,"Display width: %f cm",(*result)->width); |
1208 | psiconv_debug(config,lev+2,off+len,"Display width: %f cm",(*result)->width); |
1196 | len += leng; |
1209 | len += leng; |
1197 | |
1210 | |
1198 | psiconv_progress(lev+2,off+len,"Going to read the display height"); |
1211 | psiconv_progress(config,lev+2,off+len,"Going to read the display height"); |
1199 | (*result)->height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1212 | (*result)->height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1200 | if (res) |
1213 | if (res) |
1201 | goto ERROR2; |
1214 | goto ERROR2; |
1202 | psiconv_debug(lev+2,off+len,"Display length: %f cm",(*result)->height); |
1215 | psiconv_debug(config,lev+2,off+len,"Display length: %f cm",(*result)->height); |
1203 | len += leng; |
1216 | len += leng; |
1204 | |
1217 | |
1205 | psiconv_progress(lev+2,off+len,"Going to read unknown long (%08x expected)", |
1218 | psiconv_progress(config,lev+2,off+len,"Going to read unknown long (%08x expected)", |
1206 | 0); |
1219 | 0); |
1207 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
1220 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
1208 | if (temp != 0) { |
1221 | if (temp != 0) { |
1209 | psiconv_warn(lev+2,off+len,"Unknown Object Display Section final long"); |
1222 | psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section final long"); |
1210 | psiconv_debug(lev+2,off+len,"Long read: %08x",temp); |
1223 | psiconv_debug(config,lev+2,off+len,"Long read: %08x",temp); |
1211 | } |
1224 | } |
1212 | len += 4; |
1225 | len += 4; |
1213 | |
1226 | |
1214 | if (length) |
1227 | if (length) |
1215 | *length = len; |
1228 | *length = len; |
1216 | |
1229 | |
1217 | psiconv_progress(lev+1,off+len-1,"End of Object Display Section " |
1230 | psiconv_progress(config,lev+1,off+len-1,"End of Object Display Section " |
1218 | "(total length: %08x",len); |
1231 | "(total length: %08x",len); |
1219 | return res; |
1232 | return res; |
1220 | |
1233 | |
1221 | ERROR2: |
1234 | ERROR2: |
1222 | free(*result); |
1235 | free(*result); |
1223 | ERROR1: |
1236 | ERROR1: |
1224 | psiconv_warn(lev+1,off+len,"Reading of Object Display Section failed"); |
1237 | psiconv_warn(config,lev+1,off+len,"Reading of Object Display Section failed"); |
1225 | if (length) |
1238 | if (length) |
1226 | *length=0; |
1239 | *length=0; |
1227 | if (!res) |
1240 | if (!res) |
1228 | return -PSICONV_E_NOMEM; |
1241 | return -PSICONV_E_NOMEM; |
1229 | else |
1242 | else |
1230 | return res; |
1243 | return res; |
1231 | } |
1244 | } |
1232 | |
1245 | |
1233 | int psiconv_parse_object_icon_section(const psiconv_buffer buf,int lev, |
1246 | int psiconv_parse_object_icon_section(const psiconv_config config, |
|
|
1247 | const psiconv_buffer buf,int lev, |
1234 | psiconv_u32 off, int *length, |
1248 | psiconv_u32 off, int *length, |
1235 | psiconv_object_icon_section *result) |
1249 | psiconv_object_icon_section *result) |
1236 | { |
1250 | { |
1237 | int res = 0; |
1251 | int res = 0; |
1238 | int len = 0; |
1252 | int len = 0; |
1239 | int leng; |
1253 | int leng; |
1240 | |
1254 | |
1241 | psiconv_progress(lev+1,off,"Going to read the Object Icon Section"); |
1255 | psiconv_progress(config,lev+1,off,"Going to read the Object Icon Section"); |
1242 | if (!(*result = malloc(sizeof(**result)))) |
1256 | if (!(*result = malloc(sizeof(**result)))) |
1243 | goto ERROR1; |
1257 | goto ERROR1; |
1244 | |
1258 | |
1245 | psiconv_progress(lev+2,off+len,"Going to read the icon name"); |
1259 | psiconv_progress(config,lev+2,off+len,"Going to read the icon name"); |
1246 | (*result)->icon_name = psiconv_read_string(buf,lev+2,off+len,&leng,&res); |
1260 | (*result)->icon_name = psiconv_read_string(config,buf,lev+2,off+len,&leng,&res); |
1247 | if (res) |
1261 | if (res) |
1248 | goto ERROR2; |
1262 | goto ERROR2; |
1249 | psiconv_debug(lev+2,off+len,"Icon name: %s",(*result)->icon_name); |
1263 | psiconv_debug(config,lev+2,off+len,"Icon name: %s",(*result)->icon_name); |
1250 | len += leng; |
1264 | len += leng; |
1251 | |
1265 | |
1252 | psiconv_progress(lev+2,off+len,"Going to read the icon width"); |
1266 | psiconv_progress(config,lev+2,off+len,"Going to read the icon width"); |
1253 | (*result)->icon_width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1267 | (*result)->icon_width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1254 | if (res) |
1268 | if (res) |
1255 | goto ERROR3; |
1269 | goto ERROR3; |
1256 | psiconv_debug(lev+2,off+len,"Icon width: %f cm",(*result)->icon_width); |
1270 | psiconv_debug(config,lev+2,off+len,"Icon width: %f cm",(*result)->icon_width); |
1257 | len += leng; |
1271 | len += leng; |
1258 | |
1272 | |
1259 | psiconv_progress(lev+2,off+len,"Going to read the icon height"); |
1273 | psiconv_progress(config,lev+2,off+len,"Going to read the icon height"); |
1260 | (*result)->icon_height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1274 | (*result)->icon_height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1261 | if (res) |
1275 | if (res) |
1262 | goto ERROR3; |
1276 | goto ERROR3; |
1263 | psiconv_debug(lev+2,off+len,"Icon length: %f cm",(*result)->icon_height); |
1277 | psiconv_debug(config,lev+2,off+len,"Icon length: %f cm",(*result)->icon_height); |
1264 | len += leng; |
1278 | len += leng; |
1265 | |
1279 | |
1266 | if (length) |
1280 | if (length) |
1267 | *length = len; |
1281 | *length = len; |
1268 | |
1282 | |
1269 | psiconv_progress(lev+1,off+len-1,"End of Object Icon Section" |
1283 | psiconv_progress(config,lev+1,off+len-1,"End of Object Icon Section" |
1270 | "(total length: %08x",len); |
1284 | "(total length: %08x",len); |
1271 | return res; |
1285 | return res; |
1272 | |
1286 | |
1273 | ERROR3: |
1287 | ERROR3: |
1274 | free((*result)->icon_name); |
1288 | free((*result)->icon_name); |
1275 | ERROR2: |
1289 | ERROR2: |
1276 | free(*result); |
1290 | free(*result); |
1277 | ERROR1: |
1291 | ERROR1: |
1278 | psiconv_warn(lev+1,off+len,"Reading of Object Icon Section failed"); |
1292 | psiconv_warn(config,lev+1,off+len,"Reading of Object Icon Section failed"); |
1279 | if (length) |
1293 | if (length) |
1280 | *length=0; |
1294 | *length=0; |
1281 | if (!res) |
1295 | if (!res) |
1282 | return -PSICONV_E_NOMEM; |
1296 | return -PSICONV_E_NOMEM; |
1283 | else |
1297 | else |