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