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