/[public]/psiconv/trunk/lib/psiconv/parse_driver.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_driver.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 63 Revision 64
29{ 29{
30 psiconv_header_section header; 30 psiconv_header_section header;
31 psiconv_file_type_t res; 31 psiconv_file_type_t res;
32 int leng; 32 int leng;
33 33
34 psiconv_parse_header_section(buf,0,0,&leng,&header); 34 if ((psiconv_parse_header_section(buf,0,0,&leng,&header)))
35 return psiconv_unknown_file;
35 res = header->file; 36 res = header->file;
36 if (result) 37 if (result)
37 *result = header; 38 *result = header;
38 else 39 else
39 psiconv_free_header_section(header); 40 psiconv_free_header_section(header);
47 int res=0; 48 int res=0;
48 int lev=0; 49 int lev=0;
49 int off=0; 50 int off=0;
50 int leng; 51 int leng;
51 52
52 (*result) = malloc(sizeof(**result)); 53 if (!((*result) = malloc(sizeof(**result))))
54 goto ERROR1;
53 55
54 (*result)->type = psiconv_file_type(buf,&leng,NULL); 56 (*result)->type = psiconv_file_type(buf,&leng,NULL);
55 if ((*result)->type == psiconv_unknown_file) { 57 if ((*result)->type == psiconv_unknown_file) {
56 psiconv_warn(lev+1,off,"Unknown file type: can't parse!"); 58 psiconv_warn(lev+1,off,"Unknown file type: can't parse!");
57 (*result)->file = NULL; 59 (*result)->file = NULL;
58 res = -1;
59 } else if ((*result)->type == psiconv_word_file) 60 } else if ((*result)->type == psiconv_word_file)
60 res = psiconv_parse_word_file(buf,lev+2,leng, 61 res = psiconv_parse_word_file(buf,lev+2,leng,
61 (psiconv_word_f *)(&((*result)->file))); 62 (psiconv_word_f *)(&((*result)->file)));
62 else if ((*result)->type == psiconv_texted_file) 63 else if ((*result)->type == psiconv_texted_file)
63 res = psiconv_parse_texted_file(buf,lev+2,leng, 64 res = psiconv_parse_texted_file(buf,lev+2,leng,
73 (psiconv_clipart_f *)(&((*result)->file))); 74 (psiconv_clipart_f *)(&((*result)->file)));
74 else { 75 else {
75 psiconv_warn(lev+1,off,"Can't parse this file yet!"); 76 psiconv_warn(lev+1,off,"Can't parse this file yet!");
76 (*result)->file = NULL; 77 (*result)->file = NULL;
77 } 78 }
78 res = -1; 79 if (res)
80 goto ERROR2;
81 return 0;
79 82
83ERROR2:
84 free(*result);
85ERROR1:
86 psiconv_warn(lev+1,off,"Reading of Psion File failed");
87 if (res == 0)
88 return -PSICONV_E_NOMEM;
89 else
80 return res; 90 return res;
81} 91}
82 92
83int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 93int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev,
84 psiconv_u32 off, psiconv_clipart_f *result) 94 psiconv_u32 off, psiconv_clipart_f *result)
85{ 95{
88 psiconv_jumptable_section table; 98 psiconv_jumptable_section table;
89 psiconv_clipart_section clipart; 99 psiconv_clipart_section clipart;
90 psiconv_u32 *entry; 100 psiconv_u32 *entry;
91 101
92 psiconv_progress(lev+1,off,"Going to read a clipart file"); 102 psiconv_progress(lev+1,off,"Going to read a clipart file");
93 (*result) = malloc(sizeof(**result)); 103 if (!((*result) = malloc(sizeof(**result))))
104 goto ERROR1;
94 105
95 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 106 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
96 res |= psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table); 107 if ((res = psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table)))
108 goto ERROR2;
97 109
98 psiconv_progress(lev+2,off,"Going to read the clipart sections"); 110 psiconv_progress(lev+2,off,"Going to read the clipart sections");
99 (*result)->sections = psiconv_list_new(sizeof(*clipart)); 111 if (!((*result)->sections = psiconv_list_new(sizeof(*clipart))))
112 goto ERROR3;
100 for (i = 0; i < psiconv_list_length(table); i ++) { 113 for (i = 0; i < psiconv_list_length(table); i ++) {
101 entry = psiconv_list_get(table,i); 114 if (!(entry = psiconv_list_get(table,i)))
115 goto ERROR4;
102 psiconv_progress(lev+3,off,"Going to read clipart section %i",i); 116 psiconv_progress(lev+3,off,"Going to read clipart section %i",i);
103 psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart); 117 if (!(psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart)))
118 goto ERROR4;
104 psiconv_list_add((*result)->sections,clipart); 119 if (!(psiconv_list_add((*result)->sections,clipart)))
120 goto ERROR5;
105 } 121 }
106 122
107 psiconv_free_jumptable_section(table); 123 psiconv_free_jumptable_section(table);
108 psiconv_progress(lev+1,off,"End of clipart file"); 124 psiconv_progress(lev+1,off,"End of clipart file");
109 return res; 125 return res;
126ERROR5:
127 psiconv_free_clipart_section(clipart);
128ERROR4:
129 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
130 if (!(clipart = psiconv_list_get((*result)->sections,i))) {
131 psiconv_warn(lev+1,off,"Massive memory corruption");
132 goto ERROR3;
133 }
134 psiconv_free_clipart_section(clipart);
135 }
136 psiconv_list_free((*result)->sections);
137ERROR3:
138 psiconv_free_jumptable_section(table);
139ERROR2:
140 free(*result);
141ERROR1:
142 psiconv_warn(lev+1,off,"Reading of Clipart File failed");
143 if (res == 0)
144 return -PSICONV_E_NOMEM;
145 else
146 return res;
110} 147}
111 148
112int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 149int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
113 psiconv_mbm_f *result) 150 psiconv_mbm_f *result)
114{ 151{
118 psiconv_paint_data_section paint; 155 psiconv_paint_data_section paint;
119 psiconv_u32 *entry; 156 psiconv_u32 *entry;
120 psiconv_u32 sto; 157 psiconv_u32 sto;
121 158
122 psiconv_progress(lev+1,off,"Going to read a mbm file"); 159 psiconv_progress(lev+1,off,"Going to read a mbm file");
123 *result = malloc(sizeof(**result)); 160 if (!(*result = malloc(sizeof(**result))))
161 goto ERROR1;
124 162
125 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable"); 163 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable");
126 sto = psiconv_read_u32(buf,lev+2,off); 164 sto = psiconv_read_u32(buf,lev+2,off,&res);
165 if (res)
166 goto ERROR2;
127 psiconv_debug(lev+2,off,"Offset: %08x",sto); 167 psiconv_debug(lev+2,off,"Offset: %08x",sto);
128 168
129 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 169 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
130 res |= psiconv_parse_jumptable_section(buf,lev+2,sto, NULL,&table); 170 if ((res = psiconv_parse_jumptable_section(buf,lev+2,sto, NULL,&table)))
171 goto ERROR2;
131 172
132 psiconv_progress(lev+2,off,"Going to read the picture sections"); 173 psiconv_progress(lev+2,off,"Going to read the picture sections");
133 (*result)->sections = psiconv_list_new(sizeof(*paint)); 174 if (!((*result)->sections = psiconv_list_new(sizeof(*paint))))
175 goto ERROR3;
134 for (i = 0; i < psiconv_list_length(table); i ++) { 176 for (i = 0; i < psiconv_list_length(table); i ++) {
135 entry = psiconv_list_get(table,i); 177 if (!(entry = psiconv_list_get(table,i)))
178 goto ERROR4;
136 psiconv_progress(lev+3,off,"Going to read picture section %i",i); 179 psiconv_progress(lev+3,off,"Going to read picture section %i",i);
137 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,0,&paint); 180 if ((res = psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,
181 0,&paint)))
182 goto ERROR4;
138 psiconv_list_add((*result)->sections,paint); 183 if ((res = psiconv_list_add((*result)->sections,paint)))
184 goto ERROR5;
139 } 185 }
140 186
141 psiconv_free_jumptable_section(table); 187 psiconv_free_jumptable_section(table);
142 psiconv_progress(lev+1,off,"End of mbm file"); 188 psiconv_progress(lev+1,off,"End of mbm file");
189 return 0;
190ERROR5:
191 psiconv_free_paint_data_section(paint);
192ERROR4:
193 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
194 if (!(paint = psiconv_list_get((*result)->sections,i))) {
195 psiconv_warn(lev+1,off,"Massive memory corruption");
196 goto ERROR3;
197 }
198 psiconv_free_paint_data_section(paint);
199 }
200 psiconv_list_free((*result)->sections);
201ERROR3:
202 psiconv_free_jumptable_section(table);
203ERROR2:
204 free(*result);
205ERROR1:
206 psiconv_warn(lev+1,off,"Reading of MBM File failed");
207 if (res == 0)
208 return -PSICONV_E_NOMEM;
209 else
143 return res; 210 return res;
144} 211}
145 212
146int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev, 213int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev,
147 psiconv_u32 off, 214 psiconv_u32 off,
148 psiconv_sketch_f *result) 215 psiconv_sketch_f *result)
156 int i; 223 int i;
157 int res=0; 224 int res=0;
158 char *temp_str; 225 char *temp_str;
159 226
160 psiconv_progress(lev+1,off,"Going to read a sketch file"); 227 psiconv_progress(lev+1,off,"Going to read a sketch file");
161 *result = malloc(sizeof(**result)); 228 if (!(*result = malloc(sizeof(**result))))
229 goto ERROR1;
162 230
163 psiconv_progress(lev+2,off, 231 psiconv_progress(lev+2,off,
164 "Going to read the offset of the section table section"); 232 "Going to read the offset of the section table section");
165 sto = psiconv_read_u32(buf,lev+2,off); 233 sto = psiconv_read_u32(buf,lev+2,off,&res);
234 if (res)
235 goto ERROR2;
166 psiconv_debug(lev+2,off,"Offset: %08x",sto); 236 psiconv_debug(lev+2,off,"Offset: %08x",sto);
167 237
168 psiconv_progress(lev+2,sto, "Going to read the section table section"); 238 psiconv_progress(lev+2,sto, "Going to read the section table section");
169 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 239 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table)))
240 goto ERROR2;
170 241
171 for (i = 0; i < psiconv_list_length(table); i ++) { 242 for (i = 0; i < psiconv_list_length(table); i ++) {
172 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 243 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
173 entry = psiconv_list_get(table,i); 244 if (!(entry = psiconv_list_get(table,i)))
245 goto ERROR3;
174 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 246 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
175 applid_sec = entry->offset; 247 applid_sec = entry->offset;
176 psiconv_debug(lev+3,sto, 248 psiconv_debug(lev+3,sto,
177 "Found the Application ID section at %08x",applid_sec); 249 "Found the Application ID section at %08x",applid_sec);
178 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) { 250 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
179 sketch_sec = entry->offset; 251 sketch_sec = entry->offset;
180 psiconv_debug(lev+3,sto, 252 psiconv_debug(lev+3,sto,
181 "Found the Sketch section at %08x",sketch_sec); 253 "Found the Sketch section at %08x",sketch_sec);
182 } else { 254 } else {
183 psiconv_warn(lev+3,sto, 255 psiconv_warn(lev+3,sto,
184 "Found unknown section in the Section Table"); 256 "Found unknown section in the Section Table (ignoring)");
185 psiconv_debug(lev+3,sto, 257 psiconv_debug(lev+3,sto,
186 "Section ID %08x, offset %08x",entry->id,entry->offset); 258 "Section ID %08x, offset %08x",entry->id,entry->offset);
187 res = -1;
188 } 259 }
189 } 260 }
190 261
191 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 262 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
192 if (! applid_sec) { 263 if (! applid_sec) {
193 psiconv_warn(lev+2,sto, 264 psiconv_warn(lev+2,sto,
194 "Application ID section not found in the section table"); 265 "Application ID section not found in the section table");
195 res = -1; 266 res = -PSICONV_E_PARSE;
267 goto ERROR3;
196 } else { 268 } else {
197 psiconv_debug(lev+2,sto, 269 psiconv_debug(lev+2,sto,
198 "Application ID section at offset %08x",applid_sec); 270 "Application ID section at offset %08x",applid_sec);
199 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 271 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
200 &appl_id); 272 &appl_id)))
273 goto ERROR3;
201 } 274 }
202 if ((appl_id->id != PSICONV_ID_SKETCH) || 275 if ((appl_id->id != PSICONV_ID_SKETCH) ||
203 strcmp(appl_id->name,"Paint.app")) { 276 strcmp(appl_id->name,"Paint.app")) {
204 psiconv_warn(lev+2,applid_sec, 277 psiconv_warn(lev+2,applid_sec,
205 "Application ID section contains unexpected data"); 278 "Application ID section contains unexpected data");
206 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 279 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
207 PSICONV_ID_SKETCH,appl_id->id); 280 PSICONV_ID_SKETCH,appl_id->id);
208 temp_str = psiconv_make_printable(appl_id->name); 281 if (!(temp_str = psiconv_make_printable(appl_id->name)))
282 goto ERROR4;
209 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 283 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
210 "Paint.app",temp_str); 284 "Paint.app",temp_str);
211 free(temp_str); 285 free(temp_str);
286 res = -PSICONV_E_PARSE;
287 goto ERROR4;
212 } 288 }
213 289
214 psiconv_progress(lev+2,sto, "Looking for the Sketch section"); 290 psiconv_progress(lev+2,sto, "Looking for the Sketch section");
215 if (! sketch_sec) { 291 if (! sketch_sec) {
216 psiconv_warn(lev+2,sto, 292 psiconv_warn(lev+2,sto,
217 "Sketch section not found in the section table"); 293 "Sketch section not found in the section table");
218 res = -1;
219 } else { 294 } else {
220 psiconv_debug(lev+2,sto, 295 psiconv_debug(lev+2,sto,
221 "Sketch section at offset %08x",applid_sec); 296 "Sketch section at offset %08x",applid_sec);
222 res |= psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL,0, 297 if ((res = psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL,0,
223 &(*result)->sketch_sec); 298 &(*result)->sketch_sec)))
299 goto ERROR4;
224 } 300 }
225 301
226 psiconv_free_application_id_section(appl_id); 302 psiconv_free_application_id_section(appl_id);
227 psiconv_free_section_table_section(table); 303 psiconv_free_section_table_section(table);
228 304
229 psiconv_progress(lev+1,off,"End of word file"); 305 psiconv_progress(lev+1,off,"End of word file");
230 return res; 306 return res;
307
308ERROR4:
309 psiconv_free_application_id_section(appl_id);
310ERROR3:
311 free(table);
312ERROR2:
313 free(*result);
314ERROR1:
315 psiconv_warn(lev+1,off,"Reading of Scketch File failed");
316 if (res == 0)
317 return -PSICONV_E_NOMEM;
318 else
319 return res;
231} 320}
232
233 321
234 322
235int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, 323int psiconv_parse_texted_file(const psiconv_buffer buf,int lev,
236 psiconv_u32 off, 324 psiconv_u32 off,
237 psiconv_texted_f *result) 325 psiconv_texted_f *result)
248 psiconv_u32 sto; 336 psiconv_u32 sto;
249 psiconv_section_table_entry entry; 337 psiconv_section_table_entry entry;
250 int i; 338 int i;
251 339
252 psiconv_progress(lev+1,off,"Going to read a texted file"); 340 psiconv_progress(lev+1,off,"Going to read a texted file");
253 *result = malloc(sizeof(**result)); 341 if (!(*result = malloc(sizeof(**result))))
342 goto ERROR1;
254 343
255 psiconv_progress(lev+2,off, 344 psiconv_progress(lev+2,off,
256 "Going to read the offset of the section table section"); 345 "Going to read the offset of the section table section");
257 sto = psiconv_read_u32(buf,lev+2,off); 346 sto = psiconv_read_u32(buf,lev+2,off,&res);
347 if (res)
348 goto ERROR2;
258 psiconv_debug(lev+2,off,"Offset: %08x",sto); 349 psiconv_debug(lev+2,off,"Offset: %08x",sto);
259 350
260 psiconv_progress(lev+2,sto, "Going to read the section table section"); 351 psiconv_progress(lev+2,sto, "Going to read the section table section");
261 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 352 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table)))
353 goto ERROR2;
262 354
263 for (i = 0; i < psiconv_list_length(table); i ++) { 355 for (i = 0; i < psiconv_list_length(table); i ++) {
264 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 356 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
265 entry = psiconv_list_get(table,i); 357 if (!(entry = psiconv_list_get(table,i)))
358 goto ERROR3;
266 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 359 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
267 applid_sec = entry->offset; 360 applid_sec = entry->offset;
268 psiconv_debug(lev+3,sto, 361 psiconv_debug(lev+3,sto,
269 "Found the Application ID section at %08x",applid_sec); 362 "Found the Application ID section at %08x",applid_sec);
270 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 363 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
275 texted_sec = entry->offset; 368 texted_sec = entry->offset;
276 psiconv_debug(lev+3,sto, 369 psiconv_debug(lev+3,sto,
277 "Found the TextEd section at %08x",texted_sec); 370 "Found the TextEd section at %08x",texted_sec);
278 } else { 371 } else {
279 psiconv_warn(lev+3,sto, 372 psiconv_warn(lev+3,sto,
280 "Found unknown section in the Section Table"); 373 "Found unknown section in the Section Table (ignoring)");
281 psiconv_debug(lev+3,sto, 374 psiconv_debug(lev+3,sto,
282 "Section ID %08x, offset %08x",entry->id,entry->offset); 375 "Section ID %08x, offset %08x",entry->id,entry->offset);
283 res = -1;
284 } 376 }
285 } 377 }
286 378
287 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 379 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
288 if (! applid_sec) { 380 if (! applid_sec) {
289 psiconv_warn(lev+2,sto, 381 psiconv_warn(lev+2,sto,
290 "Application ID section not found in the section table"); 382 "Application ID section not found in the section table");
291 res = -1; 383 res = -PSICONV_E_PARSE;
384 goto ERROR3;
292 } else { 385 } else {
293 psiconv_debug(lev+2,sto, 386 psiconv_debug(lev+2,sto,
294 "Application ID section at offset %08x",applid_sec); 387 "Application ID section at offset %08x",applid_sec);
295 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 388 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
296 &appl_id); 389 &appl_id)))
390 goto ERROR3;
297 } 391 }
298 if ((appl_id->id != PSICONV_ID_TEXTED) || 392 if ((appl_id->id != PSICONV_ID_TEXTED) ||
299 strcmp(appl_id->name,"TextEd.app")) { 393 strcmp(appl_id->name,"TextEd.app")) {
300 psiconv_warn(lev+2,applid_sec, 394 psiconv_warn(lev+2,applid_sec,
301 "Application ID section contains unexpected data"); 395 "Application ID section contains unexpected data");
302 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 396 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
303 PSICONV_ID_TEXTED,appl_id->id); 397 PSICONV_ID_TEXTED,appl_id->id);
304 temp_str = psiconv_make_printable(appl_id->name); 398 if (!(temp_str = psiconv_make_printable(appl_id->name)))
399 goto ERROR4;
305 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 400 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
306 "TextEd.app",temp_str); 401 "TextEd.app",temp_str);
307 free(temp_str); 402 free(temp_str);
403 res = -PSICONV_E_PARSE;
404 goto ERROR4;
308 } 405 }
309 406
310 psiconv_progress(lev+2,sto, 407 psiconv_progress(lev+2,sto,
311 "Looking for the Page layout section"); 408 "Looking for the Page layout section");
312 if (! page_sec) { 409 if (! page_sec) {
313 psiconv_warn(lev+2,sto, 410 psiconv_warn(lev+2,sto,
314 "Page layout section not found in the section table"); 411 "Page layout section not found in the section table");
315 (*result)->page_sec = NULL; 412 res = -PSICONV_E_PARSE;
316 res = -1; 413 goto ERROR4;
317 } else { 414 } else {
318 psiconv_debug(lev+2,sto, 415 psiconv_debug(lev+2,sto,
319 "Page layout section at offset %08x",page_sec); 416 "Page layout section at offset %08x",page_sec);
320 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 417 if ((res = psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
321 &(*result)->page_sec); 418 &(*result)->page_sec)))
419 goto ERROR4;
322 } 420 }
323 421
324 base_char = psiconv_basic_character_layout(); 422 if (!(base_char = psiconv_basic_character_layout()))
423 goto ERROR5;
325 base_para = psiconv_basic_paragraph_layout(); 424 if (!(base_para = psiconv_basic_paragraph_layout()))
425 goto ERROR6;
326 426
327 psiconv_progress(lev+2,sto, 427 psiconv_progress(lev+2,sto,
328 "Looking for the TextEd section"); 428 "Looking for the TextEd section");
329 if (! texted_sec) { 429 if (! texted_sec) {
330 psiconv_warn(lev+2,sto, 430 psiconv_warn(lev+2,sto,
331 "TextEd section not found in the section table"); 431 "TextEd section not found in the section table");
332 (*result)->texted_sec = NULL; 432 res = -PSICONV_E_PARSE;
333 res = -1; 433 goto ERROR7;
334 } else { 434 } else {
335 psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec); 435 psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec);
336 res |= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL, 436 if ((res = psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL,
337 &(*result)->texted_sec, 437 &(*result)->texted_sec,
338 base_char,base_para); 438 base_char,base_para)))
439 goto ERROR7;
339 } 440 }
340 psiconv_free_character_layout(base_char); 441 psiconv_free_character_layout(base_char);
341 psiconv_free_paragraph_layout(base_para); 442 psiconv_free_paragraph_layout(base_para);
342 443
343 psiconv_free_application_id_section(appl_id); 444 psiconv_free_application_id_section(appl_id);
344 psiconv_free_section_table_section(table); 445 psiconv_free_section_table_section(table);
345 446
346 psiconv_progress(lev+1,off,"End of word file"); 447 psiconv_progress(lev+1,off,"End of TextEd file");
448 return 0;
449
450ERROR7:
451 psiconv_free_paragraph_layout(base_para);
452ERROR6:
453 psiconv_free_character_layout(base_char);
454ERROR5:
455 psiconv_free_page_layout_section((*result)->page_sec);
456ERROR4:
457 psiconv_free_application_id_section(appl_id);
458ERROR3:
459 psiconv_free_section_table_section(table);
460ERROR2:
461 free(*result);
462ERROR1:
463 psiconv_warn(lev+1,off,"Reading of TextEd File failed");
464 if (res == 0)
465 return -PSICONV_E_NOMEM;
466 else
347 return res; 467 return res;
348} 468}
349 469
350int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 470int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
351 psiconv_word_f *result) 471 psiconv_word_f *result)
352{ 472{
364 psiconv_section_table_entry entry; 484 psiconv_section_table_entry entry;
365 psiconv_u32 sto; 485 psiconv_u32 sto;
366 int i; 486 int i;
367 487
368 psiconv_progress(lev+1,off,"Going to read a word file"); 488 psiconv_progress(lev+1,off,"Going to read a word file");
369 *result = malloc(sizeof(**result)); 489 if (!(*result = malloc(sizeof(**result))))
490 goto ERROR1;
370 491
371 psiconv_progress(lev+2,off, 492 psiconv_progress(lev+2,off,
372 "Going to read the offset of the section table section"); 493 "Going to read the offset of the section table section");
373 sto = psiconv_read_u32(buf,lev+2,off); 494 sto = psiconv_read_u32(buf,lev+2,off,&res);
495 if (res)
496 goto ERROR2;
374 psiconv_debug(lev+2,off,"Offset: %08x",sto); 497 psiconv_debug(lev+2,off,"Offset: %08x",sto);
375 498
376 psiconv_progress(lev+2,sto, 499 psiconv_progress(lev+2,sto,
377 "Going to read the section table section"); 500 "Going to read the section table section");
378 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 501 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table)))
502 goto ERROR2;
379 503
380 for (i = 0; i < psiconv_list_length(table); i ++) { 504 for (i = 0; i < psiconv_list_length(table); i ++) {
381 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 505 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
382 entry = psiconv_list_get(table,i); 506 if (!(entry = psiconv_list_get(table,i)))
507 goto ERROR3;
383 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 508 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
384 applid_sec = entry->offset; 509 applid_sec = entry->offset;
385 psiconv_debug(lev+3,sto, 510 psiconv_debug(lev+3,sto,
386 "Found the Application ID section at %08x",applid_sec); 511 "Found the Application ID section at %08x",applid_sec);
387 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 512 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
395 pwd_sec = entry->offset; 520 pwd_sec = entry->offset;
396 psiconv_debug(lev+3,sto, 521 psiconv_debug(lev+3,sto,
397 "Found the Password section at %08x",pwd_sec); 522 "Found the Password section at %08x",pwd_sec);
398 psiconv_warn(lev+3,sto, 523 psiconv_warn(lev+3,sto,
399 "Password section found - can't read encrypted data"); 524 "Password section found - can't read encrypted data");
400 res = -1; 525 res = -PSICONV_E_PARSE;
526 goto ERROR3;
401 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 527 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
402 status_sec = entry->offset; 528 status_sec = entry->offset;
403 psiconv_debug(lev+3,sto, 529 psiconv_debug(lev+3,sto,
404 "Found the Word Status section at %08x",status_sec); 530 "Found the Word Status section at %08x",status_sec);
405 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 531 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
410 layout_sec = entry->offset; 536 layout_sec = entry->offset;
411 psiconv_debug(lev+3,sto, 537 psiconv_debug(lev+3,sto,
412 "Found the Layout section at %08x",layout_sec); 538 "Found the Layout section at %08x",layout_sec);
413 } else { 539 } else {
414 psiconv_warn(lev+3,sto, 540 psiconv_warn(lev+3,sto,
415 "Found unknown section in the Section Table"); 541 "Found unknown section in the Section Table (ignoring)");
416 psiconv_debug(lev+3,sto, 542 psiconv_debug(lev+3,sto,
417 "Section ID %08x, offset %08x",entry->id,entry->offset); 543 "Section ID %08x, offset %08x",entry->id,entry->offset);
418 res = -1;
419 } 544 }
420 } 545 }
421 546
422 547
423 psiconv_progress(lev+2,sto, 548 psiconv_progress(lev+2,sto,
424 "Looking for the Status section"); 549 "Looking for the Status section");
425 if (!status_sec) { 550 if (!status_sec) {
426 psiconv_warn(lev+2,sto, "Status section not found in the section table"); 551 psiconv_warn(lev+2,sto, "Status section not found in the section table");
427 res = -1; 552 res = -PSICONV_E_PARSE;
553 goto ERROR3;
428 } else { 554 } else {
429 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec); 555 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec);
430 res |= psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL, 556 if ((res = psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL,
431 &((*result)->status_sec)); 557 &((*result)->status_sec))))
558 goto ERROR3;
432 } 559 }
433 560
434 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 561 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
435 if (! applid_sec) { 562 if (! applid_sec) {
436 psiconv_warn(lev+2,sto, 563 psiconv_warn(lev+2,sto,
437 "Application ID section not found in the section table"); 564 "Application ID section not found in the section table");
438 res = -1; 565 res = -PSICONV_E_PARSE;
566 goto ERROR4;
439 } else { 567 } else {
440 psiconv_debug(lev+2,sto, 568 psiconv_debug(lev+2,sto,
441 "Application ID section at offset %08x",applid_sec); 569 "Application ID section at offset %08x",applid_sec);
442 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 570 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
443 &appl_id); 571 &appl_id)))
572 goto ERROR4;
444 } 573 }
445 if ((appl_id->id != PSICONV_ID_WORD) || 574 if ((appl_id->id != PSICONV_ID_WORD) ||
446 strcmp(appl_id->name,"Word.app")) { 575 strcmp(appl_id->name,"Word.app")) {
447 psiconv_warn(lev+2,applid_sec, 576 psiconv_warn(lev+2,applid_sec,
448 "Application ID section contains unexpected data"); 577 "Application ID section contains unexpected data");
449 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 578 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
450 PSICONV_ID_WORD,appl_id->id); 579 PSICONV_ID_WORD,appl_id->id);
451 temp_str = psiconv_make_printable(appl_id->name); 580 if (!(temp_str = psiconv_make_printable(appl_id->name)))
581 goto ERROR5;
452 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 582 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
453 "Word.app",temp_str); 583 "Word.app",temp_str);
454 free(temp_str); 584 free(temp_str);
585 res = -PSICONV_E_PARSE;
586 goto ERROR5;
455 } 587 }
456 588
457 psiconv_progress(lev+2,sto, 589 psiconv_progress(lev+2,sto,
458 "Looking for the Page layout section"); 590 "Looking for the Page layout section");
459 if (! page_sec) { 591 if (! page_sec) {
460 psiconv_warn(lev+2,sto, 592 psiconv_warn(lev+2,sto,
461 "Page layout section not found in the section table"); 593 "Page layout section not found in the section table");
462 (*result)->page_sec = NULL; 594 res = -PSICONV_E_PARSE;
463 res = -1; 595 goto ERROR5;
464 } else { 596 } else {
465 psiconv_debug(lev+2,sto, 597 psiconv_debug(lev+2,sto,
466 "Page layout section at offset %08x",page_sec); 598 "Page layout section at offset %08x",page_sec);
467 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 599 if ((res = psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
468 &(*result)->page_sec); 600 &(*result)->page_sec)))
601 goto ERROR5;
469 } 602 }
470 603
471 psiconv_progress(lev+2,sto, 604 psiconv_progress(lev+2,sto,
472 "Looking for the Word Style section"); 605 "Looking for the Word Style section");
473 if (!styles_sec) { 606 if (!styles_sec) {
474 psiconv_warn(lev+2,sto, 607 psiconv_warn(lev+2,sto,
475 "Word styles section not found in the section table"); 608 "Word styles section not found in the section table");
476 (*result)->styles_sec = NULL; 609 res = -PSICONV_E_PARSE;
477 res = -1; 610 goto ERROR6;
478 } else { 611 } else {
479 psiconv_debug(lev+2,sto, 612 psiconv_debug(lev+2,sto,
480 "Word styles section at offset %08x",styles_sec); 613 "Word styles section at offset %08x",styles_sec);
481 res |= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL, 614 if ((res = psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL,
482 &(*result)->styles_sec); 615 &(*result)->styles_sec)))
616 goto ERROR6;
483 } 617 }
484 618
485 psiconv_progress(lev+2,sto, 619 psiconv_progress(lev+2,sto,
486 "Looking for the Text section"); 620 "Looking for the Text section");
487 if (!text_sec) { 621 if (!text_sec) {
488 psiconv_warn(lev+2,sto, "Text section not found in the section table"); 622 psiconv_warn(lev+2,sto, "Text section not found in the section table");
489 (*result)->paragraphs = NULL; 623 res = -PSICONV_E_PARSE;
490 res = -1; 624 goto ERROR7;
491 } else { 625 } else {
492 psiconv_debug(lev+2,sto, 626 psiconv_debug(lev+2,sto,
493 "Text section at offset %08x",text_sec); 627 "Text section at offset %08x",text_sec);
494 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL, 628 if ((res = psiconv_parse_text_section(buf,lev+2,text_sec,NULL,
495 &(*result)->paragraphs); 629 &(*result)->paragraphs)))
630 goto ERROR7;
496 } 631 }
497 632
498 if (((*result)->paragraphs) && ((*result)->styles_sec)) { 633 psiconv_progress(lev+2,sto, "Looking for the Layout section");
499 psiconv_progress(lev+2,sto,
500 "Looking for the Layout section");
501 if (!layout_sec) { 634 if (!layout_sec) {
635 psiconv_debug(lev+2,sto, "No layout section today");
636 } else {
502 psiconv_debug(lev+2,sto, 637 psiconv_debug(lev+2,sto,
503 "Layout section not found in the section table");
504 res = -1;
505 } else {
506 psiconv_debug(lev+2,sto,
507 "Layout section at offset %08x",layout_sec); 638 "Layout section at offset %08x",layout_sec);
508 res |= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL, 639 if ((res = psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL,
509 (*result)->paragraphs, 640 (*result)->paragraphs,
510 (*result)->styles_sec); 641 (*result)->styles_sec)))
642 goto ERROR8;
511 } 643 }
512 } else
513 psiconv_debug(lev+2,sto,
514 "Skipping search for Layout section, as either the "
515 "text or the word styles section was not found");
516 644
517 psiconv_free_application_id_section(appl_id); 645 psiconv_free_application_id_section(appl_id);
518 psiconv_free_section_table_section(table); 646 psiconv_free_section_table_section(table);
519 647
520 psiconv_progress(lev+1,off,"End of word file"); 648 psiconv_progress(lev+1,off,"End of word file");
521 return res; 649 return res;
650
651
652ERROR8:
653 psiconv_free_text_and_layout((*result)->paragraphs);
654ERROR7:
655 psiconv_free_word_styles_section((*result)->styles_sec);
656ERROR6:
657 psiconv_free_page_layout_section((*result)->page_sec);
658ERROR5:
659 psiconv_free_application_id_section(appl_id);
660ERROR4:
661 psiconv_free_word_status_section((*result)->status_sec);
662ERROR3:
663 psiconv_free_section_table_section(table);
664ERROR2:
665 free(*result);
666ERROR1:
667 psiconv_warn(lev+1,off,"Reading of Word File failed");
668 if (res == 0)
669 return -PSICONV_E_NOMEM;
670 else
671 return res;
522} 672}

Legend:
Removed from v.63  
changed lines
  Added in v.64

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26