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