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