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