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