/[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 61 Revision 170
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;
87 int i; 110 int i;
88 psiconv_jumptable_section table; 111 psiconv_jumptable_section table;
89 psiconv_clipart_section clipart; 112 psiconv_clipart_section clipart;
90 psiconv_u32 *entry; 113 psiconv_u32 *entry;
91 114
92 psiconv_progress(lev+1,off,"Going to read a clipart file"); 115 psiconv_progress(config,lev+1,off,"Going to read a clipart file");
93 (*result) = malloc(sizeof(**result)); 116 if (!((*result) = malloc(sizeof(**result))))
117 goto ERROR1;
94 118
95 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 119 psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
96 res |= psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table); 120 if ((res = psiconv_parse_jumptable_section(config,buf,lev+2,off, NULL,&table)))
121 goto ERROR2;
97 122
98 psiconv_progress(lev+2,off,"Going to read the clipart sections"); 123 psiconv_progress(config,lev+2,off,"Going to read the clipart sections");
99 (*result)->sections = psiconv_list_new(sizeof(*clipart)); 124 if (!((*result)->sections = psiconv_list_new(sizeof(*clipart))))
125 goto ERROR3;
100 for (i = 0; i < psiconv_list_length(table); i ++) { 126 for (i = 0; i < psiconv_list_length(table); i ++) {
101 entry = psiconv_list_get(table,i); 127 if (!(entry = psiconv_list_get(table,i)))
128 goto ERROR4;
102 psiconv_progress(lev+3,off,"Going to read clipart section %i",i); 129 psiconv_progress(config,lev+3,off,"Going to read clipart section %i",i);
103 psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart); 130 if ((res = psiconv_parse_clipart_section(config,buf,lev+3,*entry,NULL,&clipart)))
131 goto ERROR4;
104 psiconv_list_add((*result)->sections,clipart); 132 if ((res = psiconv_list_add((*result)->sections,clipart)))
133 goto ERROR5;
105 } 134 }
106 135
107 psiconv_free_jumptable_section(table); 136 psiconv_free_jumptable_section(table);
108 psiconv_progress(lev+1,off,"End of clipart file"); 137 psiconv_progress(config,lev+1,off,"End of clipart file");
109 return res; 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;
110} 160}
111 161
112int 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,
113 psiconv_mbm_f *result) 164 psiconv_mbm_f *result)
114{ 165{
115 int res=0; 166 int res=0;
116 int i; 167 int i;
117 psiconv_jumptable_section table; 168 psiconv_jumptable_section table;
118 psiconv_paint_data_section paint; 169 psiconv_paint_data_section paint;
119 psiconv_u32 *entry; 170 psiconv_u32 *entry;
120 psiconv_u32 sto; 171 psiconv_u32 sto;
121 172
122 psiconv_progress(lev+1,off,"Going to read a mbm file"); 173 psiconv_progress(config,lev+1,off,"Going to read a mbm file");
123 *result = malloc(sizeof(**result)); 174 if (!(*result = malloc(sizeof(**result))))
175 goto ERROR1;
124 176
125 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");
126 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;
127 psiconv_debug(lev+2,off,"Offset: %08x",sto); 181 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
128 182
129 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 183 psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
130 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;
131 186
132 psiconv_progress(lev+2,off,"Going to read the picture sections"); 187 psiconv_progress(config,lev+2,off,"Going to read the picture sections");
133 (*result)->sections = psiconv_list_new(sizeof(*paint)); 188 if (!((*result)->sections = psiconv_list_new(sizeof(*paint))))
189 goto ERROR3;
134 for (i = 0; i < psiconv_list_length(table); i ++) { 190 for (i = 0; i < psiconv_list_length(table); i ++) {
135 entry = psiconv_list_get(table,i); 191 if (!(entry = psiconv_list_get(table,i)))
192 goto ERROR4;
136 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);
137 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,0,&paint); 194 if ((res = psiconv_parse_paint_data_section(config,buf,lev+3,*entry,NULL,
195 0,&paint)))
196 goto ERROR4;
138 psiconv_list_add((*result)->sections,paint); 197 if ((res = psiconv_list_add((*result)->sections,paint)))
198 goto ERROR5;
139 } 199 }
140 200
141 psiconv_free_jumptable_section(table); 201 psiconv_free_jumptable_section(table);
142 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
143 return res; 224 return res;
144} 225}
145 226
146int 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,
147 psiconv_u32 off, 229 psiconv_u32 off,
148 psiconv_sketch_f *result) 230 psiconv_sketch_f *result)
149{ 231{
150 psiconv_section_table_section table; 232 psiconv_section_table_section table;
151 psiconv_application_id_section appl_id; 233 psiconv_application_id_section appl_id;
… …
155 psiconv_section_table_entry entry; 237 psiconv_section_table_entry entry;
156 int i; 238 int i;
157 int res=0; 239 int res=0;
158 char *temp_str; 240 char *temp_str;
159 241
160 psiconv_progress(lev+1,off,"Going to read a sketch file"); 242 psiconv_progress(config,lev+1,off,"Going to read a sketch file");
161 *result = malloc(sizeof(**result)); 243 if (!(*result = malloc(sizeof(**result))))
244 goto ERROR1;
162 245
163 psiconv_progress(lev+2,off, 246 psiconv_progress(config,lev+2,off,
164 "Going to read the offset of the section table section"); 247 "Going to read the offset of the section table section");
165 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;
166 psiconv_debug(lev+2,off,"Offset: %08x",sto); 251 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
167 252
168 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");
169 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;
170 256
171 for (i = 0; i < psiconv_list_length(table); i ++) { 257 for (i = 0; i < psiconv_list_length(table); i ++) {
172 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 258 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
173 entry = psiconv_list_get(table,i); 259 if (!(entry = psiconv_list_get(table,i)))
260 goto ERROR3;
174 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 261 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
175 applid_sec = entry->offset; 262 applid_sec = entry->offset;
176 psiconv_debug(lev+3,sto, 263 psiconv_debug(config,lev+3,sto,
177 "Found the Application ID section at %08x",applid_sec); 264 "Found the Application ID section at %08x",applid_sec);
178 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) { 265 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
179 sketch_sec = entry->offset; 266 sketch_sec = entry->offset;
180 psiconv_debug(lev+3,sto, 267 psiconv_debug(config,lev+3,sto,
181 "Found the Sketch section at %08x",sketch_sec); 268 "Found the Sketch section at %08x",sketch_sec);
182 } else { 269 } else {
183 psiconv_warn(lev+3,sto, 270 psiconv_warn(config,lev+3,sto,
184 "Found unknown section in the Section Table"); 271 "Found unknown section in the Section Table (ignoring)");
185 psiconv_debug(lev+3,sto, 272 psiconv_debug(config,lev+3,sto,
186 "Section ID %08x, offset %08x",entry->id,entry->offset); 273 "Section ID %08x, offset %08x",entry->id,entry->offset);
187 res = -1;
188 } 274 }
189 } 275 }
190 276
191 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 277 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
192 if (! applid_sec) { 278 if (! applid_sec) {
193 psiconv_warn(lev+2,sto, 279 psiconv_warn(config,lev+2,sto,
194 "Application ID section not found in the section table"); 280 "Application ID section not found in the section table");
195 res = -1; 281 res = -PSICONV_E_PARSE;
282 goto ERROR3;
196 } else { 283 } else {
197 psiconv_debug(lev+2,sto, 284 psiconv_debug(config,lev+2,sto,
198 "Application ID section at offset %08x",applid_sec); 285 "Application ID section at offset %08x",applid_sec);
199 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,
200 &appl_id); 287 &appl_id)))
288 goto ERROR3;
201 } 289 }
202 if ((appl_id->id != PSICONV_ID_SKETCH) || 290 if ((appl_id->id != PSICONV_ID_SKETCH) ||
203 strcmp(appl_id->name,"Paint.app")) { 291 strcmp(appl_id->name,"Paint.app")) {
204 psiconv_warn(lev+2,applid_sec, 292 psiconv_warn(config,lev+2,applid_sec,
205 "Application ID section contains unexpected data"); 293 "Application ID section contains unexpected data");
206 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 294 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
207 PSICONV_ID_SKETCH,appl_id->id); 295 PSICONV_ID_SKETCH,appl_id->id);
208 temp_str = psiconv_make_printable(appl_id->name); 296 if (!(temp_str = psiconv_make_printable(appl_id->name)))
297 goto ERROR4;
209 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 298 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
210 "Paint.app",temp_str); 299 "Paint.app",temp_str);
211 free(temp_str); 300 free(temp_str);
301 res = -PSICONV_E_PARSE;
302 goto ERROR4;
212 } 303 }
213 304
214 psiconv_progress(lev+2,sto, "Looking for the Sketch section"); 305 psiconv_progress(config,lev+2,sto, "Looking for the Sketch section");
215 if (! sketch_sec) { 306 if (! sketch_sec) {
216 psiconv_warn(lev+2,sto, 307 psiconv_warn(config,lev+2,sto,
217 "Sketch section not found in the section table"); 308 "Sketch section not found in the section table");
218 res = -1;
219 } else { 309 } else {
220 psiconv_debug(lev+2,sto, 310 psiconv_debug(config,lev+2,sto,
221 "Sketch section at offset %08x",applid_sec); 311 "Sketch section at offset %08x",applid_sec);
222 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,
223 &(*result)->sketch_sec); 313 &(*result)->sketch_sec)))
314 goto ERROR4;
224 } 315 }
225 316
226 psiconv_free_application_id_section(appl_id); 317 psiconv_free_application_id_section(appl_id);
227 psiconv_free_section_table_section(table); 318 psiconv_free_section_table_section(table);
228 319
229 psiconv_progress(lev+1,off,"End of word file"); 320 psiconv_progress(config,lev+1,off,"End of sketch file");
230 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 Sketch File failed");
331 if (res == 0)
332 return -PSICONV_E_NOMEM;
333 else
334 return res;
231} 335}
232
233 336
234 337
235int 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,
236 psiconv_u32 off, 340 psiconv_u32 off,
237 psiconv_texted_f *result) 341 psiconv_texted_f *result)
238{ 342{
239 int res=0; 343 int res=0;
240 psiconv_section_table_section table; 344 psiconv_section_table_section table;
… …
247 psiconv_u32 applid_sec = 0; 351 psiconv_u32 applid_sec = 0;
248 psiconv_u32 sto; 352 psiconv_u32 sto;
249 psiconv_section_table_entry entry; 353 psiconv_section_table_entry entry;
250 int i; 354 int i;
251 355
252 psiconv_progress(lev+1,off,"Going to read a texted file"); 356 psiconv_progress(config,lev+1,off,"Going to read a texted file");
253 *result = malloc(sizeof(**result)); 357 if (!(*result = malloc(sizeof(**result))))
358 goto ERROR1;
254 359
255 psiconv_progress(lev+2,off, 360 psiconv_progress(config,lev+2,off,
256 "Going to read the offset of the section table section"); 361 "Going to read the offset of the section table section");
257 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;
258 psiconv_debug(lev+2,off,"Offset: %08x",sto); 365 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
259 366
260 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");
261 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;
262 370
263 for (i = 0; i < psiconv_list_length(table); i ++) { 371 for (i = 0; i < psiconv_list_length(table); i ++) {
264 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 372 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
265 entry = psiconv_list_get(table,i); 373 if (!(entry = psiconv_list_get(table,i)))
374 goto ERROR3;
266 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 375 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
267 applid_sec = entry->offset; 376 applid_sec = entry->offset;
268 psiconv_debug(lev+3,sto, 377 psiconv_debug(config,lev+3,sto,
269 "Found the Application ID section at %08x",applid_sec); 378 "Found the Application ID section at %08x",applid_sec);
270 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 379 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
271 page_sec = entry->offset; 380 page_sec = entry->offset;
272 psiconv_debug(lev+3,sto, 381 psiconv_debug(config,lev+3,sto,
273 "Found the Page Layout section at %08x",page_sec); 382 "Found the Page Layout section at %08x",page_sec);
274 } else if (entry->id == PSICONV_ID_TEXTED) { 383 } else if (entry->id == PSICONV_ID_TEXTED) {
275 texted_sec = entry->offset; 384 texted_sec = entry->offset;
276 psiconv_debug(lev+3,sto, 385 psiconv_debug(config,lev+3,sto,
277 "Found the TextEd section at %08x",texted_sec); 386 "Found the TextEd section at %08x",texted_sec);
278 } else { 387 } else {
279 psiconv_warn(lev+3,sto, 388 psiconv_warn(config,lev+3,sto,
280 "Found unknown section in the Section Table"); 389 "Found unknown section in the Section Table (ignoring)");
281 psiconv_debug(lev+3,sto, 390 psiconv_debug(config,lev+3,sto,
282 "Section ID %08x, offset %08x",entry->id,entry->offset); 391 "Section ID %08x, offset %08x",entry->id,entry->offset);
283 res = -1;
284 } 392 }
285 } 393 }
286 394
287 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 395 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
288 if (! applid_sec) { 396 if (! applid_sec) {
289 psiconv_warn(lev+2,sto, 397 psiconv_warn(config,lev+2,sto,
290 "Application ID section not found in the section table"); 398 "Application ID section not found in the section table");
291 res = -1; 399 res = -PSICONV_E_PARSE;
400 goto ERROR3;
292 } else { 401 } else {
293 psiconv_debug(lev+2,sto, 402 psiconv_debug(config,lev+2,sto,
294 "Application ID section at offset %08x",applid_sec); 403 "Application ID section at offset %08x",applid_sec);
295 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,
296 &appl_id); 405 &appl_id)))
406 goto ERROR3;
297 } 407 }
298 if ((appl_id->id != PSICONV_ID_TEXTED) || 408 if ((appl_id->id != PSICONV_ID_TEXTED) ||
299 strcmp(appl_id->name,"TextEd.app")) { 409 strcmp(appl_id->name,"TextEd.app")) {
300 psiconv_warn(lev+2,applid_sec, 410 psiconv_warn(config,lev+2,applid_sec,
301 "Application ID section contains unexpected data"); 411 "Application ID section contains unexpected data");
302 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 412 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
303 PSICONV_ID_TEXTED,appl_id->id); 413 PSICONV_ID_TEXTED,appl_id->id);
304 temp_str = psiconv_make_printable(appl_id->name); 414 if (!(temp_str = psiconv_make_printable(appl_id->name)))
415 goto ERROR4;
305 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 416 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
306 "TextEd.app",temp_str); 417 "TextEd.app",temp_str);
307 free(temp_str); 418 free(temp_str);
419 res = -PSICONV_E_PARSE;
420 goto ERROR4;
308 } 421 }
309 422
310 psiconv_progress(lev+2,sto, 423 psiconv_progress(config,lev+2,sto,
311 "Looking for the Page layout section"); 424 "Looking for the Page layout section");
312 if (! page_sec) { 425 if (! page_sec) {
313 psiconv_warn(lev+2,sto, 426 psiconv_warn(config,lev+2,sto,
314 "Page layout section not found in the section table"); 427 "Page layout section not found in the section table");
315 (*result)->page_sec = NULL; 428 res = -PSICONV_E_PARSE;
316 res = -1; 429 goto ERROR4;
317 } else { 430 } else {
318 psiconv_debug(lev+2,sto, 431 psiconv_debug(config,lev+2,sto,
319 "Page layout section at offset %08x",page_sec); 432 "Page layout section at offset %08x",page_sec);
320 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,
321 &(*result)->page_sec); 434 &(*result)->page_sec)))
435 goto ERROR4;
322 } 436 }
323 437
324 base_char = psiconv_basic_character_layout(); 438 if (!(base_char = psiconv_basic_character_layout()))
439 goto ERROR5;
325 base_para = psiconv_basic_paragraph_layout(); 440 if (!(base_para = psiconv_basic_paragraph_layout()))
441 goto ERROR6;
326 442
327 psiconv_progress(lev+2,sto, 443 psiconv_progress(config,lev+2,sto,
328 "Looking for the TextEd section"); 444 "Looking for the TextEd section");
329 if (! texted_sec) { 445 if (! texted_sec) {
330 psiconv_warn(lev+2,sto, 446 psiconv_warn(config,lev+2,sto,
331 "TextEd section not found in the section table"); 447 "TextEd section not found in the section table");
332 (*result)->texted_sec = NULL; 448 res = -PSICONV_E_PARSE;
333 res = -1; 449 goto ERROR7;
334 } else { 450 } else {
335 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);
336 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,
337 &(*result)->texted_sec, 453 &(*result)->texted_sec,
338 base_char,base_para); 454 base_char,base_para)))
455 goto ERROR7;
339 } 456 }
340 psiconv_free_character_layout(base_char); 457 psiconv_free_character_layout(base_char);
341 psiconv_free_paragraph_layout(base_para); 458 psiconv_free_paragraph_layout(base_para);
342 459
343 psiconv_free_application_id_section(appl_id); 460 psiconv_free_application_id_section(appl_id);
344 psiconv_free_section_table_section(table); 461 psiconv_free_section_table_section(table);
345 462
346 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
347 return res; 483 return res;
348} 484}
349 485
350int 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,
351 psiconv_word_f *result) 488 psiconv_word_f *result)
352{ 489{
353 int res=0; 490 int res=0;
354 psiconv_section_table_section table; 491 psiconv_section_table_section table;
355 psiconv_application_id_section appl_id; 492 psiconv_application_id_section appl_id;
… …
363 psiconv_u32 applid_sec = 0; 500 psiconv_u32 applid_sec = 0;
364 psiconv_section_table_entry entry; 501 psiconv_section_table_entry entry;
365 psiconv_u32 sto; 502 psiconv_u32 sto;
366 int i; 503 int i;
367 504
368 psiconv_progress(lev+1,off,"Going to read a word file"); 505 psiconv_progress(config,lev+1,off,"Going to read a word file");
369 *result = malloc(sizeof(**result)); 506 if (!(*result = malloc(sizeof(**result))))
507 goto ERROR1;
370 508
371 psiconv_progress(lev+2,off, 509 psiconv_progress(config,lev+2,off,
372 "Going to read the offset of the section table section"); 510 "Going to read the offset of the section table section");
373 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;
374 psiconv_debug(lev+2,off,"Offset: %08x",sto); 514 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
375 515
376 psiconv_progress(lev+2,sto, 516 psiconv_progress(config,lev+2,sto,
377 "Going to read the section table section"); 517 "Going to read the section table section");
378 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;
379 520
380 for (i = 0; i < psiconv_list_length(table); i ++) { 521 for (i = 0; i < psiconv_list_length(table); i ++) {
381 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 522 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
382 entry = psiconv_list_get(table,i); 523 if (!(entry = psiconv_list_get(table,i)))
524 goto ERROR3;
383 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 525 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
384 applid_sec = entry->offset; 526 applid_sec = entry->offset;
385 psiconv_debug(lev+3,sto, 527 psiconv_debug(config,lev+3,sto,
386 "Found the Application ID section at %08x",applid_sec); 528 "Found the Application ID section at %08x",applid_sec);
387 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 529 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
388 page_sec = entry->offset; 530 page_sec = entry->offset;
389 psiconv_debug(lev+3,sto, 531 psiconv_debug(config,lev+3,sto,
390 "Found the Page Layout section at %08x",page_sec); 532 "Found the Page Layout section at %08x",page_sec);
391 } else if (entry->id == PSICONV_ID_TEXT_SECTION) { 533 } else if (entry->id == PSICONV_ID_TEXT_SECTION) {
392 text_sec = entry->offset; 534 text_sec = entry->offset;
393 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);
394 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) { 536 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
395 pwd_sec = entry->offset; 537 pwd_sec = entry->offset;
396 psiconv_debug(lev+3,sto, 538 psiconv_debug(config,lev+3,sto,
397 "Found the Password section at %08x",pwd_sec); 539 "Found the Password section at %08x",pwd_sec);
398 psiconv_warn(lev+3,sto, 540 psiconv_warn(config,lev+3,sto,
399 "Password section found - can't read encrypted data"); 541 "Password section found - can't read encrypted data");
400 res = -1; 542 res = -PSICONV_E_PARSE;
543 goto ERROR3;
401 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 544 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
402 status_sec = entry->offset; 545 status_sec = entry->offset;
403 psiconv_debug(lev+3,sto, 546 psiconv_debug(config,lev+3,sto,
404 "Found the Word Status section at %08x",status_sec); 547 "Found the Word Status section at %08x",status_sec);
405 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 548 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
406 styles_sec = entry->offset; 549 styles_sec = entry->offset;
407 psiconv_debug(lev+3,sto, 550 psiconv_debug(config,lev+3,sto,
408 "Found the Word Styles section at %08x",styles_sec); 551 "Found the Word Styles section at %08x",styles_sec);
409 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) { 552 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) {
410 layout_sec = entry->offset; 553 layout_sec = entry->offset;
411 psiconv_debug(lev+3,sto, 554 psiconv_debug(config,lev+3,sto,
412 "Found the Layout section at %08x",layout_sec); 555 "Found the Layout section at %08x",layout_sec);
413 } else { 556 } else {
414 psiconv_warn(lev+3,sto, 557 psiconv_warn(config,lev+3,sto,
415 "Found unknown section in the Section Table"); 558 "Found unknown section in the Section Table (ignoring)");
416 psiconv_debug(lev+3,sto, 559 psiconv_debug(config,lev+3,sto,
417 "Section ID %08x, offset %08x",entry->id,entry->offset); 560 "Section ID %08x, offset %08x",entry->id,entry->offset);
418 res = -1;
419 } 561 }
420 } 562 }
421 563
422 564
423 psiconv_progress(lev+2,sto, 565 psiconv_progress(config,lev+2,sto,
424 "Looking for the Status section"); 566 "Looking for the Status section");
425 if (!status_sec) { 567 if (!status_sec) {
426 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");
427 res = -1; 569 res = -PSICONV_E_PARSE;
570 goto ERROR3;
428 } else { 571 } else {
429 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);
430 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,
431 &((*result)->status_sec)); 574 &((*result)->status_sec))))
575 goto ERROR3;
432 } 576 }
433 577
434 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 578 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
435 if (! applid_sec) { 579 if (! applid_sec) {
436 psiconv_warn(lev+2,sto, 580 psiconv_warn(config,lev+2,sto,
437 "Application ID section not found in the section table"); 581 "Application ID section not found in the section table");
438 res = -1; 582 res = -PSICONV_E_PARSE;
583 goto ERROR4;
439 } else { 584 } else {
440 psiconv_debug(lev+2,sto, 585 psiconv_debug(config,lev+2,sto,
441 "Application ID section at offset %08x",applid_sec); 586 "Application ID section at offset %08x",applid_sec);
442 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,
443 &appl_id); 588 &appl_id)))
589 goto ERROR4;
444 } 590 }
445 if ((appl_id->id != PSICONV_ID_WORD) || 591 if ((appl_id->id != PSICONV_ID_WORD) ||
446 strcmp(appl_id->name,"Word.app")) { 592 strcmp(appl_id->name,"Word.app")) {
447 psiconv_warn(lev+2,applid_sec, 593 psiconv_warn(config,lev+2,applid_sec,
448 "Application ID section contains unexpected data"); 594 "Application ID section contains unexpected data");
449 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 595 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
450 PSICONV_ID_WORD,appl_id->id); 596 PSICONV_ID_WORD,appl_id->id);
451 temp_str = psiconv_make_printable(appl_id->name); 597 if (!(temp_str = psiconv_make_printable(appl_id->name)))
598 goto ERROR5;
452 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 599 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
453 "Word.app",temp_str); 600 "Word.app",temp_str);
454 free(temp_str); 601 free(temp_str);
602 res = -PSICONV_E_PARSE;
603 goto ERROR5;
455 } 604 }
456 605
457 psiconv_progress(lev+2,sto, 606 psiconv_progress(config,lev+2,sto,
458 "Looking for the Page layout section"); 607 "Looking for the Page layout section");
459 if (! page_sec) { 608 if (! page_sec) {
460 psiconv_warn(lev+2,sto, 609 psiconv_warn(config,lev+2,sto,
461 "Page layout section not found in the section table"); 610 "Page layout section not found in the section table");
462 (*result)->page_sec = NULL; 611 res = -PSICONV_E_PARSE;
463 res = -1; 612 goto ERROR5;
464 } else { 613 } else {
465 psiconv_debug(lev+2,sto, 614 psiconv_debug(config,lev+2,sto,
466 "Page layout section at offset %08x",page_sec); 615 "Page layout section at offset %08x",page_sec);
467 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,
468 &(*result)->page_sec); 617 &(*result)->page_sec)))
618 goto ERROR5;
469 } 619 }
470 620
471 psiconv_progress(lev+2,sto, 621 psiconv_progress(config,lev+2,sto,
472 "Looking for the Word Style section"); 622 "Looking for the Word Style section");
473 if (!styles_sec) { 623 if (!styles_sec) {
474 psiconv_warn(lev+2,sto, 624 psiconv_warn(config,lev+2,sto,
475 "Word styles section not found in the section table"); 625 "Word styles section not found in the section table");
476 (*result)->styles_sec = NULL; 626 res = -PSICONV_E_PARSE;
477 res = -1; 627 goto ERROR6;
478 } else { 628 } else {
479 psiconv_debug(lev+2,sto, 629 psiconv_debug(config,lev+2,sto,
480 "Word styles section at offset %08x",styles_sec); 630 "Word styles section at offset %08x",styles_sec);
481 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,
482 &(*result)->styles_sec); 632 &(*result)->styles_sec)))
633 goto ERROR6;
483 } 634 }
484 635
485 psiconv_progress(lev+2,sto, 636 psiconv_progress(config,lev+2,sto,
486 "Looking for the Text section"); 637 "Looking for the Text section");
487 if (!text_sec) { 638 if (!text_sec) {
488 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");
489 (*result)->paragraphs = NULL; 640 res = -PSICONV_E_PARSE;
490 res = -1; 641 goto ERROR7;
491 } else { 642 } else {
492 psiconv_debug(lev+2,sto, 643 psiconv_debug(config,lev+2,sto,
493 "Text section at offset %08x",text_sec); 644 "Text section at offset %08x",text_sec);
494 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,
495 &(*result)->paragraphs); 646 &(*result)->paragraphs)))
647 goto ERROR7;
496 } 648 }
497 649
498 if (((*result)->paragraphs) && ((*result)->styles_sec)) { 650 psiconv_progress(config,lev+2,sto, "Looking for the Layout section");
499 psiconv_progress(lev+2,sto,
500 "Looking for the Layout section");
501 if (!layout_sec) { 651 if (!layout_sec) {
502 psiconv_debug(lev+2,sto, 652 psiconv_debug(config,lev+2,sto, "No layout section today");
503 "Layout section not found in the section table");
504 res = -1;
505 } else { 653 } else {
506 psiconv_debug(lev+2,sto, 654 psiconv_debug(config,lev+2,sto,
507 "Layout section at offset %08x",layout_sec); 655 "Layout section at offset %08x",layout_sec);
508 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,
509 (*result)->paragraphs, 657 (*result)->paragraphs,
510 (*result)->styles_sec); 658 (*result)->styles_sec)))
659 goto ERROR8;
511 } 660 }
512 } else
513 psiconv_debug(lev+2,sto,
514 "Skipping search for Layout section, as either the "
515 "text or the word styles section was not found");
516 661
517 psiconv_free_application_id_section(appl_id); 662 psiconv_free_application_id_section(appl_id);
518 psiconv_free_section_table_section(table); 663 psiconv_free_section_table_section(table);
519 664
520 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
521 return res; 688 return res;
522} 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.61  
changed lines
  Added in v.170
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26