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