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