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