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