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