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