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