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