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