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

Legend:
Removed from v.42  
changed lines
  Added in v.184

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26