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