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