/[public]/psiconv/trunk/lib/psiconv/parse_driver.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_driver.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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