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