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