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