/[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 167 Revision 168
29#ifdef DMALLOC 29#ifdef DMALLOC
30#include <dmalloc.h> 30#include <dmalloc.h>
31#endif 31#endif
32 32
33 33
34psiconv_file_type_t psiconv_file_type(psiconv_buffer buf,int *length, 34psiconv_file_type_t psiconv_file_type(const psiconv_config config,
35 psiconv_buffer buf,int *length,
35 psiconv_header_section *result) 36 psiconv_header_section *result)
36{ 37{
37 psiconv_header_section header; 38 psiconv_header_section header;
38 psiconv_file_type_t res; 39 psiconv_file_type_t res;
39 int leng; 40 int leng;
40 41
41 if ((psiconv_parse_header_section(buf,0,0,&leng,&header))) 42 if ((psiconv_parse_header_section(config,buf,0,0,&leng,&header)))
42 return psiconv_unknown_file; 43 return psiconv_unknown_file;
43 res = header->file; 44 res = header->file;
44 if (result) 45 if (result)
45 *result = header; 46 *result = header;
46 else 47 else
48 if (length) 49 if (length)
49 *length = leng; 50 *length = leng;
50 return res; 51 return res;
51} 52}
52 53
53int psiconv_parse(const psiconv_buffer buf,psiconv_file *result) 54int psiconv_parse(const psiconv_config config,const psiconv_buffer buf,
55 psiconv_file *result)
54{ 56{
55 int res=0; 57 int res=0;
56 int lev=0; 58 int lev=0;
57 int off=0; 59 int off=0;
58 int leng; 60 int leng;
59 61
60 if (!((*result) = malloc(sizeof(**result)))) 62 if (!((*result) = malloc(sizeof(**result))))
61 goto ERROR1; 63 goto ERROR1;
62 64
63 (*result)->type = psiconv_file_type(buf,&leng,NULL); 65 (*result)->type = psiconv_file_type(config,buf,&leng,NULL);
64 if ((*result)->type == psiconv_unknown_file) { 66 if ((*result)->type == psiconv_unknown_file) {
65 psiconv_warn(lev+1,off,"Unknown file type: can't parse!"); 67 psiconv_warn(config,lev+1,off,"Unknown file type: can't parse!");
66 (*result)->file = NULL; 68 (*result)->file = NULL;
67 } else if ((*result)->type == psiconv_word_file) 69 } else if ((*result)->type == psiconv_word_file)
68 res = psiconv_parse_word_file(buf,lev+2,leng, 70 res = psiconv_parse_word_file(config,buf,lev+2,leng,
69 (psiconv_word_f *)(&((*result)->file))); 71 (psiconv_word_f *)(&((*result)->file)));
70 else if ((*result)->type == psiconv_texted_file) 72 else if ((*result)->type == psiconv_texted_file)
71 res = psiconv_parse_texted_file(buf,lev+2,leng, 73 res = psiconv_parse_texted_file(config,buf,lev+2,leng,
72 (psiconv_texted_f *)(&((*result)->file))); 74 (psiconv_texted_f *)(&((*result)->file)));
73 else if ((*result)->type == psiconv_mbm_file) 75 else if ((*result)->type == psiconv_mbm_file)
74 res = psiconv_parse_mbm_file(buf,lev+2,leng, 76 res = psiconv_parse_mbm_file(config,buf,lev+2,leng,
75 (psiconv_mbm_f *)(&((*result)->file))); 77 (psiconv_mbm_f *)(&((*result)->file)));
76 else if ((*result)->type == psiconv_sketch_file) 78 else if ((*result)->type == psiconv_sketch_file)
77 res = psiconv_parse_sketch_file(buf,lev+2,leng, 79 res = psiconv_parse_sketch_file(config,buf,lev+2,leng,
78 (psiconv_sketch_f *)(&((*result)->file))); 80 (psiconv_sketch_f *)(&((*result)->file)));
79 else if ((*result)->type == psiconv_clipart_file) 81 else if ((*result)->type == psiconv_clipart_file)
80 res = psiconv_parse_clipart_file(buf,lev+2,leng, 82 res = psiconv_parse_clipart_file(config,buf,lev+2,leng,
81 (psiconv_clipart_f *)(&((*result)->file))); 83 (psiconv_clipart_f *)(&((*result)->file)));
82 else if ((*result)->type == psiconv_sheet_file) 84 else if ((*result)->type == psiconv_sheet_file)
83 res = psiconv_parse_sheet_file(buf,lev+2,leng, 85 res = psiconv_parse_sheet_file(config,buf,lev+2,leng,
84 (psiconv_sheet_f *)(&((*result)->file))); 86 (psiconv_sheet_f *)(&((*result)->file)));
85 else { 87 else {
86 psiconv_warn(lev+1,off,"Can't parse this file yet!"); 88 psiconv_warn(config,lev+1,off,"Can't parse this file yet!");
87 (*result)->file = NULL; 89 (*result)->file = NULL;
88 } 90 }
89 if (res) 91 if (res)
90 goto ERROR2; 92 goto ERROR2;
91 return 0; 93 return 0;
92 94
93ERROR2: 95ERROR2:
94 free(*result); 96 free(*result);
95ERROR1: 97ERROR1:
96 psiconv_warn(lev+1,off,"Reading of Psion File failed"); 98 psiconv_warn(config,lev+1,off,"Reading of Psion File failed");
97 if (res == 0) 99 if (res == 0)
98 return -PSICONV_E_NOMEM; 100 return -PSICONV_E_NOMEM;
99 else 101 else
100 return res; 102 return res;
101} 103}
102 104
103int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 105int psiconv_parse_clipart_file(const psiconv_config config,
106 const psiconv_buffer buf,int lev,
104 psiconv_u32 off, psiconv_clipart_f *result) 107 psiconv_u32 off, psiconv_clipart_f *result)
105{ 108{
106 int res=0; 109 int res=0;
107 int i; 110 int i;
108 psiconv_jumptable_section table; 111 psiconv_jumptable_section table;
109 psiconv_clipart_section clipart; 112 psiconv_clipart_section clipart;
110 psiconv_u32 *entry; 113 psiconv_u32 *entry;
111 114
112 psiconv_progress(lev+1,off,"Going to read a clipart file"); 115 psiconv_progress(config,lev+1,off,"Going to read a clipart file");
113 if (!((*result) = malloc(sizeof(**result)))) 116 if (!((*result) = malloc(sizeof(**result))))
114 goto ERROR1; 117 goto ERROR1;
115 118
116 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 119 psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
117 if ((res = psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table))) 120 if ((res = psiconv_parse_jumptable_section(config,buf,lev+2,off, NULL,&table)))
118 goto ERROR2; 121 goto ERROR2;
119 122
120 psiconv_progress(lev+2,off,"Going to read the clipart sections"); 123 psiconv_progress(config,lev+2,off,"Going to read the clipart sections");
121 if (!((*result)->sections = psiconv_list_new(sizeof(*clipart)))) 124 if (!((*result)->sections = psiconv_list_new(sizeof(*clipart))))
122 goto ERROR3; 125 goto ERROR3;
123 for (i = 0; i < psiconv_list_length(table); i ++) { 126 for (i = 0; i < psiconv_list_length(table); i ++) {
124 if (!(entry = psiconv_list_get(table,i))) 127 if (!(entry = psiconv_list_get(table,i)))
125 goto ERROR4; 128 goto ERROR4;
126 psiconv_progress(lev+3,off,"Going to read clipart section %i",i); 129 psiconv_progress(config,lev+3,off,"Going to read clipart section %i",i);
127 if ((res = psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart))) 130 if ((res = psiconv_parse_clipart_section(config,buf,lev+3,*entry,NULL,&clipart)))
128 goto ERROR4; 131 goto ERROR4;
129 if ((res = psiconv_list_add((*result)->sections,clipart))) 132 if ((res = psiconv_list_add((*result)->sections,clipart)))
130 goto ERROR5; 133 goto ERROR5;
131 } 134 }
132 135
133 psiconv_free_jumptable_section(table); 136 psiconv_free_jumptable_section(table);
134 psiconv_progress(lev+1,off,"End of clipart file"); 137 psiconv_progress(config,lev+1,off,"End of clipart file");
135 return res; 138 return res;
136ERROR5: 139ERROR5:
137 psiconv_free_clipart_section(clipart); 140 psiconv_free_clipart_section(clipart);
138ERROR4: 141ERROR4:
139 for (i = 0; i < psiconv_list_length((*result)->sections); i++) { 142 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
140 if (!(clipart = psiconv_list_get((*result)->sections,i))) { 143 if (!(clipart = psiconv_list_get((*result)->sections,i))) {
141 psiconv_warn(lev+1,off,"Massive memory corruption"); 144 psiconv_warn(config,lev+1,off,"Massive memory corruption");
142 goto ERROR3; 145 goto ERROR3;
143 } 146 }
144 psiconv_free_clipart_section(clipart); 147 psiconv_free_clipart_section(clipart);
145 } 148 }
146 psiconv_list_free((*result)->sections); 149 psiconv_list_free((*result)->sections);
147ERROR3: 150ERROR3:
148 psiconv_free_jumptable_section(table); 151 psiconv_free_jumptable_section(table);
149ERROR2: 152ERROR2:
150 free(*result); 153 free(*result);
151ERROR1: 154ERROR1:
152 psiconv_warn(lev+1,off,"Reading of Clipart File failed"); 155 psiconv_warn(config,lev+1,off,"Reading of Clipart File failed");
153 if (res == 0) 156 if (res == 0)
154 return -PSICONV_E_NOMEM; 157 return -PSICONV_E_NOMEM;
155 else 158 else
156 return res; 159 return res;
157} 160}
158 161
159int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 162int psiconv_parse_mbm_file(const psiconv_config config,
163 const psiconv_buffer buf,int lev, psiconv_u32 off,
160 psiconv_mbm_f *result) 164 psiconv_mbm_f *result)
161{ 165{
162 int res=0; 166 int res=0;
163 int i; 167 int i;
164 psiconv_jumptable_section table; 168 psiconv_jumptable_section table;
165 psiconv_paint_data_section paint; 169 psiconv_paint_data_section paint;
166 psiconv_u32 *entry; 170 psiconv_u32 *entry;
167 psiconv_u32 sto; 171 psiconv_u32 sto;
168 172
169 psiconv_progress(lev+1,off,"Going to read a mbm file"); 173 psiconv_progress(config,lev+1,off,"Going to read a mbm file");
170 if (!(*result = malloc(sizeof(**result)))) 174 if (!(*result = malloc(sizeof(**result))))
171 goto ERROR1; 175 goto ERROR1;
172 176
173 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable"); 177 psiconv_progress(config,lev+2,off,"Going to read the offset of the MBM jumptable");
174 sto = psiconv_read_u32(buf,lev+2,off,&res); 178 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
175 if (res) 179 if (res)
176 goto ERROR2; 180 goto ERROR2;
177 psiconv_debug(lev+2,off,"Offset: %08x",sto); 181 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
178 182
179 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 183 psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
180 if ((res = psiconv_parse_jumptable_section(buf,lev+2,sto, NULL,&table))) 184 if ((res = psiconv_parse_jumptable_section(config,buf,lev+2,sto, NULL,&table)))
181 goto ERROR2; 185 goto ERROR2;
182 186
183 psiconv_progress(lev+2,off,"Going to read the picture sections"); 187 psiconv_progress(config,lev+2,off,"Going to read the picture sections");
184 if (!((*result)->sections = psiconv_list_new(sizeof(*paint)))) 188 if (!((*result)->sections = psiconv_list_new(sizeof(*paint))))
185 goto ERROR3; 189 goto ERROR3;
186 for (i = 0; i < psiconv_list_length(table); i ++) { 190 for (i = 0; i < psiconv_list_length(table); i ++) {
187 if (!(entry = psiconv_list_get(table,i))) 191 if (!(entry = psiconv_list_get(table,i)))
188 goto ERROR4; 192 goto ERROR4;
189 psiconv_progress(lev+3,off,"Going to read picture section %i",i); 193 psiconv_progress(config,lev+3,off,"Going to read picture section %i",i);
190 if ((res = psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL, 194 if ((res = psiconv_parse_paint_data_section(config,buf,lev+3,*entry,NULL,
191 0,&paint))) 195 0,&paint)))
192 goto ERROR4; 196 goto ERROR4;
193 if ((res = psiconv_list_add((*result)->sections,paint))) 197 if ((res = psiconv_list_add((*result)->sections,paint)))
194 goto ERROR5; 198 goto ERROR5;
195 } 199 }
196 200
197 psiconv_free_jumptable_section(table); 201 psiconv_free_jumptable_section(table);
198 psiconv_progress(lev+1,off,"End of mbm file"); 202 psiconv_progress(config,lev+1,off,"End of mbm file");
199 return 0; 203 return 0;
200ERROR5: 204ERROR5:
201 psiconv_free_paint_data_section(paint); 205 psiconv_free_paint_data_section(paint);
202ERROR4: 206ERROR4:
203 for (i = 0; i < psiconv_list_length((*result)->sections); i++) { 207 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
204 if (!(paint = psiconv_list_get((*result)->sections,i))) { 208 if (!(paint = psiconv_list_get((*result)->sections,i))) {
205 psiconv_warn(lev+1,off,"Massive memory corruption"); 209 psiconv_warn(config,lev+1,off,"Massive memory corruption");
206 goto ERROR3; 210 goto ERROR3;
207 } 211 }
208 psiconv_free_paint_data_section(paint); 212 psiconv_free_paint_data_section(paint);
209 } 213 }
210 psiconv_list_free((*result)->sections); 214 psiconv_list_free((*result)->sections);
211ERROR3: 215ERROR3:
212 psiconv_free_jumptable_section(table); 216 psiconv_free_jumptable_section(table);
213ERROR2: 217ERROR2:
214 free(*result); 218 free(*result);
215ERROR1: 219ERROR1:
216 psiconv_warn(lev+1,off,"Reading of MBM File failed"); 220 psiconv_warn(config,lev+1,off,"Reading of MBM File failed");
217 if (res == 0) 221 if (res == 0)
218 return -PSICONV_E_NOMEM; 222 return -PSICONV_E_NOMEM;
219 else 223 else
220 return res; 224 return res;
221} 225}
222 226
223int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev, 227int psiconv_parse_sketch_file(const psiconv_config config,
228 const psiconv_buffer buf,int lev,
224 psiconv_u32 off, 229 psiconv_u32 off,
225 psiconv_sketch_f *result) 230 psiconv_sketch_f *result)
226{ 231{
227 psiconv_section_table_section table; 232 psiconv_section_table_section table;
228 psiconv_application_id_section appl_id; 233 psiconv_application_id_section appl_id;
232 psiconv_section_table_entry entry; 237 psiconv_section_table_entry entry;
233 int i; 238 int i;
234 int res=0; 239 int res=0;
235 char *temp_str; 240 char *temp_str;
236 241
237 psiconv_progress(lev+1,off,"Going to read a sketch file"); 242 psiconv_progress(config,lev+1,off,"Going to read a sketch file");
238 if (!(*result = malloc(sizeof(**result)))) 243 if (!(*result = malloc(sizeof(**result))))
239 goto ERROR1; 244 goto ERROR1;
240 245
241 psiconv_progress(lev+2,off, 246 psiconv_progress(config,lev+2,off,
242 "Going to read the offset of the section table section"); 247 "Going to read the offset of the section table section");
243 sto = psiconv_read_u32(buf,lev+2,off,&res); 248 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
244 if (res) 249 if (res)
245 goto ERROR2; 250 goto ERROR2;
246 psiconv_debug(lev+2,off,"Offset: %08x",sto); 251 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
247 252
248 psiconv_progress(lev+2,sto, "Going to read the section table section"); 253 psiconv_progress(config,lev+2,sto, "Going to read the section table section");
249 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table))) 254 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
250 goto ERROR2; 255 goto ERROR2;
251 256
252 for (i = 0; i < psiconv_list_length(table); i ++) { 257 for (i = 0; i < psiconv_list_length(table); i ++) {
253 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 258 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
254 if (!(entry = psiconv_list_get(table,i))) 259 if (!(entry = psiconv_list_get(table,i)))
255 goto ERROR3; 260 goto ERROR3;
256 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 261 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
257 applid_sec = entry->offset; 262 applid_sec = entry->offset;
258 psiconv_debug(lev+3,sto, 263 psiconv_debug(config,lev+3,sto,
259 "Found the Application ID section at %08x",applid_sec); 264 "Found the Application ID section at %08x",applid_sec);
260 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) { 265 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
261 sketch_sec = entry->offset; 266 sketch_sec = entry->offset;
262 psiconv_debug(lev+3,sto, 267 psiconv_debug(config,lev+3,sto,
263 "Found the Sketch section at %08x",sketch_sec); 268 "Found the Sketch section at %08x",sketch_sec);
264 } else { 269 } else {
265 psiconv_warn(lev+3,sto, 270 psiconv_warn(config,lev+3,sto,
266 "Found unknown section in the Section Table (ignoring)"); 271 "Found unknown section in the Section Table (ignoring)");
267 psiconv_debug(lev+3,sto, 272 psiconv_debug(config,lev+3,sto,
268 "Section ID %08x, offset %08x",entry->id,entry->offset); 273 "Section ID %08x, offset %08x",entry->id,entry->offset);
269 } 274 }
270 } 275 }
271 276
272 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 277 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
273 if (! applid_sec) { 278 if (! applid_sec) {
274 psiconv_warn(lev+2,sto, 279 psiconv_warn(config,lev+2,sto,
275 "Application ID section not found in the section table"); 280 "Application ID section not found in the section table");
276 res = -PSICONV_E_PARSE; 281 res = -PSICONV_E_PARSE;
277 goto ERROR3; 282 goto ERROR3;
278 } else { 283 } else {
279 psiconv_debug(lev+2,sto, 284 psiconv_debug(config,lev+2,sto,
280 "Application ID section at offset %08x",applid_sec); 285 "Application ID section at offset %08x",applid_sec);
281 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 286 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
282 &appl_id))) 287 &appl_id)))
283 goto ERROR3; 288 goto ERROR3;
284 } 289 }
285 if ((appl_id->id != PSICONV_ID_SKETCH) || 290 if ((appl_id->id != PSICONV_ID_SKETCH) ||
286 strcmp(appl_id->name,"Paint.app")) { 291 strcmp(appl_id->name,"Paint.app")) {
287 psiconv_warn(lev+2,applid_sec, 292 psiconv_warn(config,lev+2,applid_sec,
288 "Application ID section contains unexpected data"); 293 "Application ID section contains unexpected data");
289 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 294 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
290 PSICONV_ID_SKETCH,appl_id->id); 295 PSICONV_ID_SKETCH,appl_id->id);
291 if (!(temp_str = psiconv_make_printable(appl_id->name))) 296 if (!(temp_str = psiconv_make_printable(appl_id->name)))
292 goto ERROR4; 297 goto ERROR4;
293 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 298 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
294 "Paint.app",temp_str); 299 "Paint.app",temp_str);
295 free(temp_str); 300 free(temp_str);
296 res = -PSICONV_E_PARSE; 301 res = -PSICONV_E_PARSE;
297 goto ERROR4; 302 goto ERROR4;
298 } 303 }
299 304
300 psiconv_progress(lev+2,sto, "Looking for the Sketch section"); 305 psiconv_progress(config,lev+2,sto, "Looking for the Sketch section");
301 if (! sketch_sec) { 306 if (! sketch_sec) {
302 psiconv_warn(lev+2,sto, 307 psiconv_warn(config,lev+2,sto,
303 "Sketch section not found in the section table"); 308 "Sketch section not found in the section table");
304 } else { 309 } else {
305 psiconv_debug(lev+2,sto, 310 psiconv_debug(config,lev+2,sto,
306 "Sketch section at offset %08x",applid_sec); 311 "Sketch section at offset %08x",applid_sec);
307 if ((res = psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL, 312 if ((res = psiconv_parse_sketch_section(config,buf,lev+2,sketch_sec,NULL,
308 &(*result)->sketch_sec))) 313 &(*result)->sketch_sec)))
309 goto ERROR4; 314 goto ERROR4;
310 } 315 }
311 316
312 psiconv_free_application_id_section(appl_id); 317 psiconv_free_application_id_section(appl_id);
313 psiconv_free_section_table_section(table); 318 psiconv_free_section_table_section(table);
314 319
315 psiconv_progress(lev+1,off,"End of word file"); 320 psiconv_progress(config,lev+1,off,"End of word file");
316 return res; 321 return res;
317 322
318ERROR4: 323ERROR4:
319 psiconv_free_application_id_section(appl_id); 324 psiconv_free_application_id_section(appl_id);
320ERROR3: 325ERROR3:
321 free(table); 326 free(table);
322ERROR2: 327ERROR2:
323 free(*result); 328 free(*result);
324ERROR1: 329ERROR1:
325 psiconv_warn(lev+1,off,"Reading of Scketch File failed"); 330 psiconv_warn(config,lev+1,off,"Reading of Scketch File failed");
326 if (res == 0) 331 if (res == 0)
327 return -PSICONV_E_NOMEM; 332 return -PSICONV_E_NOMEM;
328 else 333 else
329 return res; 334 return res;
330} 335}
331 336
332 337
333int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, 338int psiconv_parse_texted_file(const psiconv_config config,
339 const psiconv_buffer buf,int lev,
334 psiconv_u32 off, 340 psiconv_u32 off,
335 psiconv_texted_f *result) 341 psiconv_texted_f *result)
336{ 342{
337 int res=0; 343 int res=0;
338 psiconv_section_table_section table; 344 psiconv_section_table_section table;
345 psiconv_u32 applid_sec = 0; 351 psiconv_u32 applid_sec = 0;
346 psiconv_u32 sto; 352 psiconv_u32 sto;
347 psiconv_section_table_entry entry; 353 psiconv_section_table_entry entry;
348 int i; 354 int i;
349 355
350 psiconv_progress(lev+1,off,"Going to read a texted file"); 356 psiconv_progress(config,lev+1,off,"Going to read a texted file");
351 if (!(*result = malloc(sizeof(**result)))) 357 if (!(*result = malloc(sizeof(**result))))
352 goto ERROR1; 358 goto ERROR1;
353 359
354 psiconv_progress(lev+2,off, 360 psiconv_progress(config,lev+2,off,
355 "Going to read the offset of the section table section"); 361 "Going to read the offset of the section table section");
356 sto = psiconv_read_u32(buf,lev+2,off,&res); 362 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
357 if (res) 363 if (res)
358 goto ERROR2; 364 goto ERROR2;
359 psiconv_debug(lev+2,off,"Offset: %08x",sto); 365 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
360 366
361 psiconv_progress(lev+2,sto, "Going to read the section table section"); 367 psiconv_progress(config,lev+2,sto, "Going to read the section table section");
362 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table))) 368 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
363 goto ERROR2; 369 goto ERROR2;
364 370
365 for (i = 0; i < psiconv_list_length(table); i ++) { 371 for (i = 0; i < psiconv_list_length(table); i ++) {
366 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 372 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
367 if (!(entry = psiconv_list_get(table,i))) 373 if (!(entry = psiconv_list_get(table,i)))
368 goto ERROR3; 374 goto ERROR3;
369 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 375 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
370 applid_sec = entry->offset; 376 applid_sec = entry->offset;
371 psiconv_debug(lev+3,sto, 377 psiconv_debug(config,lev+3,sto,
372 "Found the Application ID section at %08x",applid_sec); 378 "Found the Application ID section at %08x",applid_sec);
373 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 379 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
374 page_sec = entry->offset; 380 page_sec = entry->offset;
375 psiconv_debug(lev+3,sto, 381 psiconv_debug(config,lev+3,sto,
376 "Found the Page Layout section at %08x",page_sec); 382 "Found the Page Layout section at %08x",page_sec);
377 } else if (entry->id == PSICONV_ID_TEXTED) { 383 } else if (entry->id == PSICONV_ID_TEXTED) {
378 texted_sec = entry->offset; 384 texted_sec = entry->offset;
379 psiconv_debug(lev+3,sto, 385 psiconv_debug(config,lev+3,sto,
380 "Found the TextEd section at %08x",texted_sec); 386 "Found the TextEd section at %08x",texted_sec);
381 } else { 387 } else {
382 psiconv_warn(lev+3,sto, 388 psiconv_warn(config,lev+3,sto,
383 "Found unknown section in the Section Table (ignoring)"); 389 "Found unknown section in the Section Table (ignoring)");
384 psiconv_debug(lev+3,sto, 390 psiconv_debug(config,lev+3,sto,
385 "Section ID %08x, offset %08x",entry->id,entry->offset); 391 "Section ID %08x, offset %08x",entry->id,entry->offset);
386 } 392 }
387 } 393 }
388 394
389 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 395 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
390 if (! applid_sec) { 396 if (! applid_sec) {
391 psiconv_warn(lev+2,sto, 397 psiconv_warn(config,lev+2,sto,
392 "Application ID section not found in the section table"); 398 "Application ID section not found in the section table");
393 res = -PSICONV_E_PARSE; 399 res = -PSICONV_E_PARSE;
394 goto ERROR3; 400 goto ERROR3;
395 } else { 401 } else {
396 psiconv_debug(lev+2,sto, 402 psiconv_debug(config,lev+2,sto,
397 "Application ID section at offset %08x",applid_sec); 403 "Application ID section at offset %08x",applid_sec);
398 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 404 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
399 &appl_id))) 405 &appl_id)))
400 goto ERROR3; 406 goto ERROR3;
401 } 407 }
402 if ((appl_id->id != PSICONV_ID_TEXTED) || 408 if ((appl_id->id != PSICONV_ID_TEXTED) ||
403 strcmp(appl_id->name,"TextEd.app")) { 409 strcmp(appl_id->name,"TextEd.app")) {
404 psiconv_warn(lev+2,applid_sec, 410 psiconv_warn(config,lev+2,applid_sec,
405 "Application ID section contains unexpected data"); 411 "Application ID section contains unexpected data");
406 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 412 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
407 PSICONV_ID_TEXTED,appl_id->id); 413 PSICONV_ID_TEXTED,appl_id->id);
408 if (!(temp_str = psiconv_make_printable(appl_id->name))) 414 if (!(temp_str = psiconv_make_printable(appl_id->name)))
409 goto ERROR4; 415 goto ERROR4;
410 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 416 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
411 "TextEd.app",temp_str); 417 "TextEd.app",temp_str);
412 free(temp_str); 418 free(temp_str);
413 res = -PSICONV_E_PARSE; 419 res = -PSICONV_E_PARSE;
414 goto ERROR4; 420 goto ERROR4;
415 } 421 }
416 422
417 psiconv_progress(lev+2,sto, 423 psiconv_progress(config,lev+2,sto,
418 "Looking for the Page layout section"); 424 "Looking for the Page layout section");
419 if (! page_sec) { 425 if (! page_sec) {
420 psiconv_warn(lev+2,sto, 426 psiconv_warn(config,lev+2,sto,
421 "Page layout section not found in the section table"); 427 "Page layout section not found in the section table");
422 res = -PSICONV_E_PARSE; 428 res = -PSICONV_E_PARSE;
423 goto ERROR4; 429 goto ERROR4;
424 } else { 430 } else {
425 psiconv_debug(lev+2,sto, 431 psiconv_debug(config,lev+2,sto,
426 "Page layout section at offset %08x",page_sec); 432 "Page layout section at offset %08x",page_sec);
427 if ((res = psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 433 if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
428 &(*result)->page_sec))) 434 &(*result)->page_sec)))
429 goto ERROR4; 435 goto ERROR4;
430 } 436 }
431 437
432 if (!(base_char = psiconv_basic_character_layout())) 438 if (!(base_char = psiconv_basic_character_layout()))
433 goto ERROR5; 439 goto ERROR5;
434 if (!(base_para = psiconv_basic_paragraph_layout())) 440 if (!(base_para = psiconv_basic_paragraph_layout()))
435 goto ERROR6; 441 goto ERROR6;
436 442
437 psiconv_progress(lev+2,sto, 443 psiconv_progress(config,lev+2,sto,
438 "Looking for the TextEd section"); 444 "Looking for the TextEd section");
439 if (! texted_sec) { 445 if (! texted_sec) {
440 psiconv_warn(lev+2,sto, 446 psiconv_warn(config,lev+2,sto,
441 "TextEd section not found in the section table"); 447 "TextEd section not found in the section table");
442 res = -PSICONV_E_PARSE; 448 res = -PSICONV_E_PARSE;
443 goto ERROR7; 449 goto ERROR7;
444 } else { 450 } else {
445 psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec); 451 psiconv_debug(config,lev+2,sto, "TextEd section at offset %08x",texted_sec);
446 if ((res = psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL, 452 if ((res = psiconv_parse_texted_section(config,buf,lev+2,texted_sec,NULL,
447 &(*result)->texted_sec, 453 &(*result)->texted_sec,
448 base_char,base_para))) 454 base_char,base_para)))
449 goto ERROR7; 455 goto ERROR7;
450 } 456 }
451 psiconv_free_character_layout(base_char); 457 psiconv_free_character_layout(base_char);
452 psiconv_free_paragraph_layout(base_para); 458 psiconv_free_paragraph_layout(base_para);
453 459
454 psiconv_free_application_id_section(appl_id); 460 psiconv_free_application_id_section(appl_id);
455 psiconv_free_section_table_section(table); 461 psiconv_free_section_table_section(table);
456 462
457 psiconv_progress(lev+1,off,"End of TextEd file"); 463 psiconv_progress(config,lev+1,off,"End of TextEd file");
458 return 0; 464 return 0;
459 465
460ERROR7: 466ERROR7:
461 psiconv_free_paragraph_layout(base_para); 467 psiconv_free_paragraph_layout(base_para);
462ERROR6: 468ERROR6:
468ERROR3: 474ERROR3:
469 psiconv_free_section_table_section(table); 475 psiconv_free_section_table_section(table);
470ERROR2: 476ERROR2:
471 free(*result); 477 free(*result);
472ERROR1: 478ERROR1:
473 psiconv_warn(lev+1,off,"Reading of TextEd File failed"); 479 psiconv_warn(config,lev+1,off,"Reading of TextEd File failed");
474 if (res == 0) 480 if (res == 0)
475 return -PSICONV_E_NOMEM; 481 return -PSICONV_E_NOMEM;
476 else 482 else
477 return res; 483 return res;
478} 484}
479 485
480int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 486int psiconv_parse_word_file(const psiconv_config config,
487 const psiconv_buffer buf,int lev, psiconv_u32 off,
481 psiconv_word_f *result) 488 psiconv_word_f *result)
482{ 489{
483 int res=0; 490 int res=0;
484 psiconv_section_table_section table; 491 psiconv_section_table_section table;
485 psiconv_application_id_section appl_id; 492 psiconv_application_id_section appl_id;
493 psiconv_u32 applid_sec = 0; 500 psiconv_u32 applid_sec = 0;
494 psiconv_section_table_entry entry; 501 psiconv_section_table_entry entry;
495 psiconv_u32 sto; 502 psiconv_u32 sto;
496 int i; 503 int i;
497 504
498 psiconv_progress(lev+1,off,"Going to read a word file"); 505 psiconv_progress(config,lev+1,off,"Going to read a word file");
499 if (!(*result = malloc(sizeof(**result)))) 506 if (!(*result = malloc(sizeof(**result))))
500 goto ERROR1; 507 goto ERROR1;
501 508
502 psiconv_progress(lev+2,off, 509 psiconv_progress(config,lev+2,off,
503 "Going to read the offset of the section table section"); 510 "Going to read the offset of the section table section");
504 sto = psiconv_read_u32(buf,lev+2,off,&res); 511 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
505 if (res) 512 if (res)
506 goto ERROR2; 513 goto ERROR2;
507 psiconv_debug(lev+2,off,"Offset: %08x",sto); 514 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
508 515
509 psiconv_progress(lev+2,sto, 516 psiconv_progress(config,lev+2,sto,
510 "Going to read the section table section"); 517 "Going to read the section table section");
511 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table))) 518 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
512 goto ERROR2; 519 goto ERROR2;
513 520
514 for (i = 0; i < psiconv_list_length(table); i ++) { 521 for (i = 0; i < psiconv_list_length(table); i ++) {
515 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 522 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
516 if (!(entry = psiconv_list_get(table,i))) 523 if (!(entry = psiconv_list_get(table,i)))
517 goto ERROR3; 524 goto ERROR3;
518 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 525 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
519 applid_sec = entry->offset; 526 applid_sec = entry->offset;
520 psiconv_debug(lev+3,sto, 527 psiconv_debug(config,lev+3,sto,
521 "Found the Application ID section at %08x",applid_sec); 528 "Found the Application ID section at %08x",applid_sec);
522 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 529 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
523 page_sec = entry->offset; 530 page_sec = entry->offset;
524 psiconv_debug(lev+3,sto, 531 psiconv_debug(config,lev+3,sto,
525 "Found the Page Layout section at %08x",page_sec); 532 "Found the Page Layout section at %08x",page_sec);
526 } else if (entry->id == PSICONV_ID_TEXT_SECTION) { 533 } else if (entry->id == PSICONV_ID_TEXT_SECTION) {
527 text_sec = entry->offset; 534 text_sec = entry->offset;
528 psiconv_debug(lev+3,sto, "Found the Text section at %08x",text_sec); 535 psiconv_debug(config,lev+3,sto, "Found the Text section at %08x",text_sec);
529 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) { 536 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
530 pwd_sec = entry->offset; 537 pwd_sec = entry->offset;
531 psiconv_debug(lev+3,sto, 538 psiconv_debug(config,lev+3,sto,
532 "Found the Password section at %08x",pwd_sec); 539 "Found the Password section at %08x",pwd_sec);
533 psiconv_warn(lev+3,sto, 540 psiconv_warn(config,lev+3,sto,
534 "Password section found - can't read encrypted data"); 541 "Password section found - can't read encrypted data");
535 res = -PSICONV_E_PARSE; 542 res = -PSICONV_E_PARSE;
536 goto ERROR3; 543 goto ERROR3;
537 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 544 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
538 status_sec = entry->offset; 545 status_sec = entry->offset;
539 psiconv_debug(lev+3,sto, 546 psiconv_debug(config,lev+3,sto,
540 "Found the Word Status section at %08x",status_sec); 547 "Found the Word Status section at %08x",status_sec);
541 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 548 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
542 styles_sec = entry->offset; 549 styles_sec = entry->offset;
543 psiconv_debug(lev+3,sto, 550 psiconv_debug(config,lev+3,sto,
544 "Found the Word Styles section at %08x",styles_sec); 551 "Found the Word Styles section at %08x",styles_sec);
545 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) { 552 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) {
546 layout_sec = entry->offset; 553 layout_sec = entry->offset;
547 psiconv_debug(lev+3,sto, 554 psiconv_debug(config,lev+3,sto,
548 "Found the Layout section at %08x",layout_sec); 555 "Found the Layout section at %08x",layout_sec);
549 } else { 556 } else {
550 psiconv_warn(lev+3,sto, 557 psiconv_warn(config,lev+3,sto,
551 "Found unknown section in the Section Table (ignoring)"); 558 "Found unknown section in the Section Table (ignoring)");
552 psiconv_debug(lev+3,sto, 559 psiconv_debug(config,lev+3,sto,
553 "Section ID %08x, offset %08x",entry->id,entry->offset); 560 "Section ID %08x, offset %08x",entry->id,entry->offset);
554 } 561 }
555 } 562 }
556 563
557 564
558 psiconv_progress(lev+2,sto, 565 psiconv_progress(config,lev+2,sto,
559 "Looking for the Status section"); 566 "Looking for the Status section");
560 if (!status_sec) { 567 if (!status_sec) {
561 psiconv_warn(lev+2,sto, "Status section not found in the section table"); 568 psiconv_warn(config,lev+2,sto, "Status section not found in the section table");
562 res = -PSICONV_E_PARSE; 569 res = -PSICONV_E_PARSE;
563 goto ERROR3; 570 goto ERROR3;
564 } else { 571 } else {
565 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec); 572 psiconv_debug(config,lev+2,sto, "Status section at offset %08x",status_sec);
566 if ((res = psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL, 573 if ((res = psiconv_parse_word_status_section(config,buf,lev+2,status_sec,NULL,
567 &((*result)->status_sec)))) 574 &((*result)->status_sec))))
568 goto ERROR3; 575 goto ERROR3;
569 } 576 }
570 577
571 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 578 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
572 if (! applid_sec) { 579 if (! applid_sec) {
573 psiconv_warn(lev+2,sto, 580 psiconv_warn(config,lev+2,sto,
574 "Application ID section not found in the section table"); 581 "Application ID section not found in the section table");
575 res = -PSICONV_E_PARSE; 582 res = -PSICONV_E_PARSE;
576 goto ERROR4; 583 goto ERROR4;
577 } else { 584 } else {
578 psiconv_debug(lev+2,sto, 585 psiconv_debug(config,lev+2,sto,
579 "Application ID section at offset %08x",applid_sec); 586 "Application ID section at offset %08x",applid_sec);
580 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 587 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
581 &appl_id))) 588 &appl_id)))
582 goto ERROR4; 589 goto ERROR4;
583 } 590 }
584 if ((appl_id->id != PSICONV_ID_WORD) || 591 if ((appl_id->id != PSICONV_ID_WORD) ||
585 strcmp(appl_id->name,"Word.app")) { 592 strcmp(appl_id->name,"Word.app")) {
586 psiconv_warn(lev+2,applid_sec, 593 psiconv_warn(config,lev+2,applid_sec,
587 "Application ID section contains unexpected data"); 594 "Application ID section contains unexpected data");
588 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 595 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
589 PSICONV_ID_WORD,appl_id->id); 596 PSICONV_ID_WORD,appl_id->id);
590 if (!(temp_str = psiconv_make_printable(appl_id->name))) 597 if (!(temp_str = psiconv_make_printable(appl_id->name)))
591 goto ERROR5; 598 goto ERROR5;
592 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 599 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
593 "Word.app",temp_str); 600 "Word.app",temp_str);
594 free(temp_str); 601 free(temp_str);
595 res = -PSICONV_E_PARSE; 602 res = -PSICONV_E_PARSE;
596 goto ERROR5; 603 goto ERROR5;
597 } 604 }
598 605
599 psiconv_progress(lev+2,sto, 606 psiconv_progress(config,lev+2,sto,
600 "Looking for the Page layout section"); 607 "Looking for the Page layout section");
601 if (! page_sec) { 608 if (! page_sec) {
602 psiconv_warn(lev+2,sto, 609 psiconv_warn(config,lev+2,sto,
603 "Page layout section not found in the section table"); 610 "Page layout section not found in the section table");
604 res = -PSICONV_E_PARSE; 611 res = -PSICONV_E_PARSE;
605 goto ERROR5; 612 goto ERROR5;
606 } else { 613 } else {
607 psiconv_debug(lev+2,sto, 614 psiconv_debug(config,lev+2,sto,
608 "Page layout section at offset %08x",page_sec); 615 "Page layout section at offset %08x",page_sec);
609 if ((res = psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 616 if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
610 &(*result)->page_sec))) 617 &(*result)->page_sec)))
611 goto ERROR5; 618 goto ERROR5;
612 } 619 }
613 620
614 psiconv_progress(lev+2,sto, 621 psiconv_progress(config,lev+2,sto,
615 "Looking for the Word Style section"); 622 "Looking for the Word Style section");
616 if (!styles_sec) { 623 if (!styles_sec) {
617 psiconv_warn(lev+2,sto, 624 psiconv_warn(config,lev+2,sto,
618 "Word styles section not found in the section table"); 625 "Word styles section not found in the section table");
619 res = -PSICONV_E_PARSE; 626 res = -PSICONV_E_PARSE;
620 goto ERROR6; 627 goto ERROR6;
621 } else { 628 } else {
622 psiconv_debug(lev+2,sto, 629 psiconv_debug(config,lev+2,sto,
623 "Word styles section at offset %08x",styles_sec); 630 "Word styles section at offset %08x",styles_sec);
624 if ((res = psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL, 631 if ((res = psiconv_parse_word_styles_section(config,buf,lev+2,styles_sec,NULL,
625 &(*result)->styles_sec))) 632 &(*result)->styles_sec)))
626 goto ERROR6; 633 goto ERROR6;
627 } 634 }
628 635
629 psiconv_progress(lev+2,sto, 636 psiconv_progress(config,lev+2,sto,
630 "Looking for the Text section"); 637 "Looking for the Text section");
631 if (!text_sec) { 638 if (!text_sec) {
632 psiconv_warn(lev+2,sto, "Text section not found in the section table"); 639 psiconv_warn(config,lev+2,sto, "Text section not found in the section table");
633 res = -PSICONV_E_PARSE; 640 res = -PSICONV_E_PARSE;
634 goto ERROR7; 641 goto ERROR7;
635 } else { 642 } else {
636 psiconv_debug(lev+2,sto, 643 psiconv_debug(config,lev+2,sto,
637 "Text section at offset %08x",text_sec); 644 "Text section at offset %08x",text_sec);
638 if ((res = psiconv_parse_text_section(buf,lev+2,text_sec,NULL, 645 if ((res = psiconv_parse_text_section(config,buf,lev+2,text_sec,NULL,
639 &(*result)->paragraphs))) 646 &(*result)->paragraphs)))
640 goto ERROR7; 647 goto ERROR7;
641 } 648 }
642 649
643 psiconv_progress(lev+2,sto, "Looking for the Layout section"); 650 psiconv_progress(config,lev+2,sto, "Looking for the Layout section");
644 if (!layout_sec) { 651 if (!layout_sec) {
645 psiconv_debug(lev+2,sto, "No layout section today"); 652 psiconv_debug(config,lev+2,sto, "No layout section today");
646 } else { 653 } else {
647 psiconv_debug(lev+2,sto, 654 psiconv_debug(config,lev+2,sto,
648 "Layout section at offset %08x",layout_sec); 655 "Layout section at offset %08x",layout_sec);
649 if ((res = psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL, 656 if ((res = psiconv_parse_styled_layout_section(config,buf,lev+2,layout_sec,NULL,
650 (*result)->paragraphs, 657 (*result)->paragraphs,
651 (*result)->styles_sec))) 658 (*result)->styles_sec)))
652 goto ERROR8; 659 goto ERROR8;
653 } 660 }
654 661
655 psiconv_free_application_id_section(appl_id); 662 psiconv_free_application_id_section(appl_id);
656 psiconv_free_section_table_section(table); 663 psiconv_free_section_table_section(table);
657 664
658 psiconv_progress(lev+1,off,"End of word file"); 665 psiconv_progress(config,lev+1,off,"End of word file");
659 return 0; 666 return 0;
660 667
661 668
662ERROR8: 669ERROR8:
663 psiconv_free_text_and_layout((*result)->paragraphs); 670 psiconv_free_text_and_layout((*result)->paragraphs);
672ERROR3: 679ERROR3:
673 psiconv_free_section_table_section(table); 680 psiconv_free_section_table_section(table);
674ERROR2: 681ERROR2:
675 free(*result); 682 free(*result);
676ERROR1: 683ERROR1:
677 psiconv_warn(lev+1,off,"Reading of Word File failed"); 684 psiconv_warn(config,lev+1,off,"Reading of Word File failed");
678 if (res == 0) 685 if (res == 0)
679 return -PSICONV_E_NOMEM; 686 return -PSICONV_E_NOMEM;
680 else 687 else
681 return res; 688 return res;
682} 689}
683 690
684int psiconv_parse_sheet_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 691int psiconv_parse_sheet_file(const psiconv_config config,
692 const psiconv_buffer buf,int lev, psiconv_u32 off,
685 psiconv_sheet_f *result) 693 psiconv_sheet_f *result)
686{ 694{
687 int res=0; 695 int res=0;
688 psiconv_section_table_section table; 696 psiconv_section_table_section table;
689 psiconv_application_id_section appl_id; 697 psiconv_application_id_section appl_id;
690 char *temp_str; 698 char *temp_str;
695 psiconv_u32 workbook_sec = 0; 703 psiconv_u32 workbook_sec = 0;
696 psiconv_section_table_entry entry; 704 psiconv_section_table_entry entry;
697 psiconv_u32 sto; 705 psiconv_u32 sto;
698 int i; 706 int i;
699 707
700 psiconv_progress(lev+1,off,"Going to read a sheet file"); 708 psiconv_progress(config,lev+1,off,"Going to read a sheet file");
701 if (!(*result = malloc(sizeof(**result)))) 709 if (!(*result = malloc(sizeof(**result))))
702 goto ERROR1; 710 goto ERROR1;
703 711
704 psiconv_progress(lev+2,off, 712 psiconv_progress(config,lev+2,off,
705 "Going to read the offset of the section table section"); 713 "Going to read the offset of the section table section");
706 sto = psiconv_read_u32(buf,lev+2,off,&res); 714 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
707 if (res) 715 if (res)
708 goto ERROR2; 716 goto ERROR2;
709 psiconv_debug(lev+2,off,"Offset: %08x",sto); 717 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
710 718
711 psiconv_progress(lev+2,sto, 719 psiconv_progress(config,lev+2,sto,
712 "Going to read the section table section"); 720 "Going to read the section table section");
713 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table))) 721 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
714 goto ERROR2; 722 goto ERROR2;
715 723
716 for (i = 0; i < psiconv_list_length(table); i ++) { 724 for (i = 0; i < psiconv_list_length(table); i ++) {
717 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 725 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
718 if (!(entry = psiconv_list_get(table,i))) 726 if (!(entry = psiconv_list_get(table,i)))
719 goto ERROR3; 727 goto ERROR3;
720 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 728 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
721 applid_sec = entry->offset; 729 applid_sec = entry->offset;
722 psiconv_debug(lev+3,sto, 730 psiconv_debug(config,lev+3,sto,
723 "Found the Application ID section at %08x",applid_sec); 731 "Found the Application ID section at %08x",applid_sec);
724 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 732 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
725 page_sec = entry->offset; 733 page_sec = entry->offset;
726 psiconv_debug(lev+3,sto, 734 psiconv_debug(config,lev+3,sto,
727 "Found the Page Layout section at %08x",page_sec); 735 "Found the Page Layout section at %08x",page_sec);
728 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) { 736 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
729 pwd_sec = entry->offset; 737 pwd_sec = entry->offset;
730 psiconv_debug(lev+3,sto, 738 psiconv_debug(config,lev+3,sto,
731 "Found the Password section at %08x",pwd_sec); 739 "Found the Password section at %08x",pwd_sec);
732 psiconv_warn(lev+3,sto, 740 psiconv_warn(config,lev+3,sto,
733 "Password section found - can't read encrypted data"); 741 "Password section found - can't read encrypted data");
734 res = -PSICONV_E_PARSE; 742 res = -PSICONV_E_PARSE;
735 goto ERROR3; 743 goto ERROR3;
736 } else if (entry->id == PSICONV_ID_SHEET_WORKBOOK_SECTION) { 744 } else if (entry->id == PSICONV_ID_SHEET_WORKBOOK_SECTION) {
737 workbook_sec = entry->offset; 745 workbook_sec = entry->offset;
738 psiconv_debug(lev+3,sto, 746 psiconv_debug(config,lev+3,sto,
739 "Found the Sheet Workbook section at %08x",workbook_sec); 747 "Found the Sheet Workbook section at %08x",workbook_sec);
740 } else if (entry->id == PSICONV_ID_SHEET_STATUS_SECTION) { 748 } else if (entry->id == PSICONV_ID_SHEET_STATUS_SECTION) {
741 status_sec = entry->offset; 749 status_sec = entry->offset;
742 psiconv_debug(lev+3,sto, 750 psiconv_debug(config,lev+3,sto,
743 "Found the Sheet Status section at %08x",status_sec); 751 "Found the Sheet Status section at %08x",status_sec);
744 } else { 752 } else {
745 psiconv_warn(lev+3,sto, 753 psiconv_warn(config,lev+3,sto,
746 "Found unknown section in the Section Table (ignoring)"); 754 "Found unknown section in the Section Table (ignoring)");
747 psiconv_debug(lev+3,sto, 755 psiconv_debug(config,lev+3,sto,
748 "Section ID %08x, offset %08x",entry->id,entry->offset); 756 "Section ID %08x, offset %08x",entry->id,entry->offset);
749 } 757 }
750 } 758 }
751 759
752 760
753 psiconv_progress(lev+2,sto, 761 psiconv_progress(config,lev+2,sto,
754 "Looking for the Status section"); 762 "Looking for the Status section");
755 if (!status_sec) { 763 if (!status_sec) {
756 psiconv_warn(lev+2,sto, "Status section not found in the section table"); 764 psiconv_warn(config,lev+2,sto, "Status section not found in the section table");
757 res = -PSICONV_E_PARSE; 765 res = -PSICONV_E_PARSE;
758 goto ERROR3; 766 goto ERROR3;
759 } else { 767 } else {
760 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec); 768 psiconv_debug(config,lev+2,sto, "Status section at offset %08x",status_sec);
761 if ((res = psiconv_parse_sheet_status_section(buf,lev+2,status_sec,NULL, 769 if ((res = psiconv_parse_sheet_status_section(config,buf,lev+2,status_sec,NULL,
762 &((*result)->status_sec)))) 770 &((*result)->status_sec))))
763 goto ERROR3; 771 goto ERROR3;
764 } 772 }
765 773
766 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 774 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
767 if (! applid_sec) { 775 if (! applid_sec) {
768 psiconv_warn(lev+2,sto, 776 psiconv_warn(config,lev+2,sto,
769 "Application ID section not found in the section table"); 777 "Application ID section not found in the section table");
770 res = -PSICONV_E_PARSE; 778 res = -PSICONV_E_PARSE;
771 goto ERROR4; 779 goto ERROR4;
772 } else { 780 } else {
773 psiconv_debug(lev+2,sto, 781 psiconv_debug(config,lev+2,sto,
774 "Application ID section at offset %08x",applid_sec); 782 "Application ID section at offset %08x",applid_sec);
775 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 783 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
776 &appl_id))) 784 &appl_id)))
777 goto ERROR4; 785 goto ERROR4;
778 } 786 }
779 if ((appl_id->id != PSICONV_ID_SHEET) || 787 if ((appl_id->id != PSICONV_ID_SHEET) ||
780 strcmp(appl_id->name,"Sheet.app")) { 788 strcmp(appl_id->name,"Sheet.app")) {
781 psiconv_warn(lev+2,applid_sec, 789 psiconv_warn(config,lev+2,applid_sec,
782 "Application ID section contains unexpected data"); 790 "Application ID section contains unexpected data");
783 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 791 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
784 PSICONV_ID_SHEET,appl_id->id); 792 PSICONV_ID_SHEET,appl_id->id);
785 if (!(temp_str = psiconv_make_printable(appl_id->name))) 793 if (!(temp_str = psiconv_make_printable(appl_id->name)))
786 goto ERROR5; 794 goto ERROR5;
787 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 795 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
788 "Sheet.app",temp_str); 796 "Sheet.app",temp_str);
789 free(temp_str); 797 free(temp_str);
790 res = -PSICONV_E_PARSE; 798 res = -PSICONV_E_PARSE;
791 goto ERROR5; 799 goto ERROR5;
792 } 800 }
793 801
794 psiconv_progress(lev+2,sto, 802 psiconv_progress(config,lev+2,sto,
795 "Looking for the Page layout section"); 803 "Looking for the Page layout section");
796 if (! page_sec) { 804 if (! page_sec) {
797 psiconv_warn(lev+2,sto, 805 psiconv_warn(config,lev+2,sto,
798 "Page layout section not found in the section table"); 806 "Page layout section not found in the section table");
799 res = -PSICONV_E_PARSE; 807 res = -PSICONV_E_PARSE;
800 goto ERROR5; 808 goto ERROR5;
801 } else { 809 } else {
802 psiconv_debug(lev+2,sto, 810 psiconv_debug(config,lev+2,sto,
803 "Page layout section at offset %08x",page_sec); 811 "Page layout section at offset %08x",page_sec);
804 if ((res = psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 812 if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
805 &(*result)->page_sec))) 813 &(*result)->page_sec)))
806 goto ERROR5; 814 goto ERROR5;
807 } 815 }
808 816
809 psiconv_progress(lev+2,sto, 817 psiconv_progress(config,lev+2,sto,
810 "Looking for the Sheet Workbook section"); 818 "Looking for the Sheet Workbook section");
811 if (! workbook_sec) { 819 if (! workbook_sec) {
812 psiconv_warn(lev+2,sto, 820 psiconv_warn(config,lev+2,sto,
813 "Sheet workbook section not found in the section table"); 821 "Sheet workbook section not found in the section table");
814 res = -PSICONV_E_PARSE; 822 res = -PSICONV_E_PARSE;
815 goto ERROR6; 823 goto ERROR6;
816 } else { 824 } else {
817 psiconv_debug(lev+2,sto, 825 psiconv_debug(config,lev+2,sto,
818 "Sheet workbook section at offset %08x",page_sec); 826 "Sheet workbook section at offset %08x",page_sec);
819 if ((res = psiconv_parse_sheet_workbook_section(buf,lev+2,workbook_sec,NULL, 827 if ((res = psiconv_parse_sheet_workbook_section(config,buf,lev+2,workbook_sec,NULL,
820 &(*result)->workbook_sec))) 828 &(*result)->workbook_sec)))
821 goto ERROR6; 829 goto ERROR6;
822 } 830 }
823 831
824 psiconv_free_application_id_section(appl_id); 832 psiconv_free_application_id_section(appl_id);
825 psiconv_free_section_table_section(table); 833 psiconv_free_section_table_section(table);
826 834
827 psiconv_progress(lev+1,off,"End of Sheet file"); 835 psiconv_progress(config,lev+1,off,"End of Sheet file");
828 return 0; 836 return 0;
829 837
830ERROR6: 838ERROR6:
831 psiconv_free_page_layout_section((*result)->page_sec); 839 psiconv_free_page_layout_section((*result)->page_sec);
832ERROR5: 840ERROR5:
836ERROR3: 844ERROR3:
837 psiconv_free_section_table_section(table); 845 psiconv_free_section_table_section(table);
838ERROR2: 846ERROR2:
839 free(*result); 847 free(*result);
840ERROR1: 848ERROR1:
841 psiconv_warn(lev+1,off,"Reading of Sheet File failed"); 849 psiconv_warn(config,lev+1,off,"Reading of Sheet File failed");
842 if (res == 0) 850 if (res == 0)
843 return -PSICONV_E_NOMEM; 851 return -PSICONV_E_NOMEM;
844 else 852 else
845 return res; 853 return res;
846} 854}

Legend:
Removed from v.167  
changed lines
  Added in v.168

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