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