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