/[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 13 Revision 63
1/* 1/*
2 parse_driver.c - Part of psiconv, a PSION 5 file formats converter 2 parse_driver.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
22 22
23#include "parse.h" 23#include "parse.h"
24#include "parse_routines.h" 24#include "parse_routines.h"
25#include "data.h" 25#include "data.h"
26 26
27psiconv_file_type_t psiconv_file_type(psiconv_buffer buf) 27psiconv_file_type_t psiconv_file_type(psiconv_buffer buf,int *length,
28 psiconv_header_section *result)
28{ 29{
29 psiconv_header_section header; 30 psiconv_header_section header;
30 psiconv_file_type_t res; 31 psiconv_file_type_t res;
32 int leng;
31 33
32 psiconv_parse_header_section(buf,0,0,NULL,&header); 34 psiconv_parse_header_section(buf,0,0,&leng,&header);
33 res = header->file; 35 res = header->file;
36 if (result)
37 *result = header;
38 else
34 psiconv_free_header_section(header); 39 psiconv_free_header_section(header);
40 if (length)
41 *length = leng;
35 return res; 42 return res;
36} 43}
37 44
38int psiconv_parse(const psiconv_buffer buf,psiconv_file *result) 45int psiconv_parse(const psiconv_buffer buf,psiconv_file *result)
39{ 46{
40 int res=0; 47 int res=0;
41 int lev=0; 48 int lev=0;
42 int off=0; 49 int off=0;
50 int leng;
43 51
44 (*result) = malloc(sizeof(**result)); 52 (*result) = malloc(sizeof(**result));
45 53
46 (*result)->type = psiconv_file_type(buf); 54 (*result)->type = psiconv_file_type(buf,&leng,NULL);
47 if ((*result)->type == psiconv_unknown_file) { 55 if ((*result)->type == psiconv_unknown_file) {
48 psiconv_warn(lev+1,off,"Unknown file type: can't parse!"); 56 psiconv_warn(lev+1,off,"Unknown file type: can't parse!");
49 (*result)->file = NULL; 57 (*result)->file = NULL;
50 res = -1; 58 res = -1;
51 } else if ((*result)->type == psiconv_word_file) 59 } else if ((*result)->type == psiconv_word_file)
52 res = psiconv_parse_word_file(buf,lev+2,off, 60 res = psiconv_parse_word_file(buf,lev+2,leng,
53 (psiconv_word_f *)(&((*result)->file))); 61 (psiconv_word_f *)(&((*result)->file)));
54 else if ((*result)->type == psiconv_texted_file) 62 else if ((*result)->type == psiconv_texted_file)
55 res = psiconv_parse_texted_file(buf,lev+2,off, 63 res = psiconv_parse_texted_file(buf,lev+2,leng,
56 (psiconv_texted_f *)(&((*result)->file))); 64 (psiconv_texted_f *)(&((*result)->file)));
57 else if ((*result)->type == psiconv_mbm_file) 65 else if ((*result)->type == psiconv_mbm_file)
58 res = psiconv_parse_mbm_file(buf,lev+2,off, 66 res = psiconv_parse_mbm_file(buf,lev+2,leng,
59 (psiconv_mbm_f *)(&((*result)->file))); 67 (psiconv_mbm_f *)(&((*result)->file)));
68 else if ((*result)->type == psiconv_sketch_file)
69 res = psiconv_parse_sketch_file(buf,lev+2,leng,
70 (psiconv_sketch_f *)(&((*result)->file)));
71 else if ((*result)->type == psiconv_clipart_file)
72 res = psiconv_parse_clipart_file(buf,lev+2,leng,
73 (psiconv_clipart_f *)(&((*result)->file)));
60 else { 74 else {
61 psiconv_warn(lev+1,off,"Can't parse this file yet!"); 75 psiconv_warn(lev+1,off,"Can't parse this file yet!");
62 (*result)->file = NULL; 76 (*result)->file = NULL;
63 } 77 }
64 res = -1; 78 res = -1;
65 79
66 return res; 80 return res;
67} 81}
68 82
83int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev,
84 psiconv_u32 off, psiconv_clipart_f *result)
85{
86 int res=0;
87 int i;
88 psiconv_jumptable_section table;
89 psiconv_clipart_section clipart;
90 psiconv_u32 *entry;
91
92 psiconv_progress(lev+1,off,"Going to read a clipart file");
93 (*result) = malloc(sizeof(**result));
94
95 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
96 res |= psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table);
97
98 psiconv_progress(lev+2,off,"Going to read the clipart sections");
99 (*result)->sections = psiconv_list_new(sizeof(*clipart));
100 for (i = 0; i < psiconv_list_length(table); i ++) {
101 entry = psiconv_list_get(table,i);
102 psiconv_progress(lev+3,off,"Going to read clipart section %i",i);
103 psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart);
104 psiconv_list_add((*result)->sections,clipart);
105 }
106
107 psiconv_free_jumptable_section(table);
108 psiconv_progress(lev+1,off,"End of clipart file");
109 return res;
110}
111
69int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 112int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
70 psiconv_mbm_f *result) 113 psiconv_mbm_f *result)
71{ 114{
72 int res=0; 115 int res=0;
73 int i; 116 int i;
74 psiconv_mbm_jumptable_section table; 117 psiconv_jumptable_section table;
75 psiconv_paint_data_section paint; 118 psiconv_paint_data_section paint;
76 psiconv_header_section header;
77 psiconv_u32 *entry; 119 psiconv_u32 *entry;
120 psiconv_u32 sto;
78 121
79 psiconv_progress(lev+1,off,"Going to read a mbm file"); 122 psiconv_progress(lev+1,off,"Going to read a mbm file");
80 *result = malloc(sizeof(**result)); 123 *result = malloc(sizeof(**result));
81 124
82 psiconv_progress(lev+2,off, "Going to read the header section"); 125 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable");
83 res |= psiconv_parse_header_section(buf,lev+2,off,NULL,&header); 126 sto = psiconv_read_u32(buf,lev+2,off);
127 psiconv_debug(lev+2,off,"Offset: %08x",sto);
84 128
85 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 129 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
86 res |= psiconv_parse_mbm_jumptable_section(buf,lev+2, 130 res |= psiconv_parse_jumptable_section(buf,lev+2,sto, NULL,&table);
87 header->section_table_offset,
88 NULL,&table);
89 131
90 psiconv_progress(lev+2,off,"Going to read the picture sections"); 132 psiconv_progress(lev+2,off,"Going to read the picture sections");
91 (*result)->sections = psiconv_list_new(sizeof(*paint)); 133 (*result)->sections = psiconv_list_new(sizeof(*paint));
92 for (i = 0; i < psiconv_list_length(table); i ++) { 134 for (i = 0; i < psiconv_list_length(table); i ++) {
93 entry = psiconv_list_get(table,i); 135 entry = psiconv_list_get(table,i);
94 psiconv_progress(lev+3,off,"Going to read picture section %i",i); 136 psiconv_progress(lev+3,off,"Going to read picture section %i",i);
95 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,&paint); 137 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,0,&paint);
96 psiconv_list_add((*result)->sections,paint); 138 psiconv_list_add((*result)->sections,paint);
97 } 139 }
98 140
99 psiconv_free_header_section(header);
100 psiconv_free_mbm_jumptable_section(table); 141 psiconv_free_jumptable_section(table);
101 psiconv_progress(lev+1,off,"End of mbm file"); 142 psiconv_progress(lev+1,off,"End of mbm file");
102 return res; 143 return res;
103} 144}
104 145
146int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev,
147 psiconv_u32 off,
148 psiconv_sketch_f *result)
149{
150 psiconv_section_table_section table;
151 psiconv_application_id_section appl_id;
152 psiconv_u32 applid_sec = 0;
153 psiconv_u32 sketch_sec = 0;
154 psiconv_u32 sto;
155 psiconv_section_table_entry entry;
156 int i;
157 int res=0;
158 char *temp_str;
159
160 psiconv_progress(lev+1,off,"Going to read a sketch file");
161 *result = malloc(sizeof(**result));
162
163 psiconv_progress(lev+2,off,
164 "Going to read the offset of the section table section");
165 sto = psiconv_read_u32(buf,lev+2,off);
166 psiconv_debug(lev+2,off,"Offset: %08x",sto);
167
168 psiconv_progress(lev+2,sto, "Going to read the section table section");
169 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);
170
171 for (i = 0; i < psiconv_list_length(table); i ++) {
172 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
173 entry = psiconv_list_get(table,i);
174 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
175 applid_sec = entry->offset;
176 psiconv_debug(lev+3,sto,
177 "Found the Application ID section at %08x",applid_sec);
178 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
179 sketch_sec = entry->offset;
180 psiconv_debug(lev+3,sto,
181 "Found the Sketch section at %08x",sketch_sec);
182 } else {
183 psiconv_warn(lev+3,sto,
184 "Found unknown section in the Section Table");
185 psiconv_debug(lev+3,sto,
186 "Section ID %08x, offset %08x",entry->id,entry->offset);
187 res = -1;
188 }
189 }
190
191 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
192 if (! applid_sec) {
193 psiconv_warn(lev+2,sto,
194 "Application ID section not found in the section table");
195 res = -1;
196 } else {
197 psiconv_debug(lev+2,sto,
198 "Application ID section at offset %08x",applid_sec);
199 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
200 &appl_id);
201 }
202 if ((appl_id->id != PSICONV_ID_SKETCH) ||
203 strcmp(appl_id->name,"Paint.app")) {
204 psiconv_warn(lev+2,applid_sec,
205 "Application ID section contains unexpected data");
206 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
207 PSICONV_ID_SKETCH,appl_id->id);
208 temp_str = psiconv_make_printable(appl_id->name);
209 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
210 "Paint.app",temp_str);
211 free(temp_str);
212 }
213
214 psiconv_progress(lev+2,sto, "Looking for the Sketch section");
215 if (! sketch_sec) {
216 psiconv_warn(lev+2,sto,
217 "Sketch section not found in the section table");
218 res = -1;
219 } else {
220 psiconv_debug(lev+2,sto,
221 "Sketch section at offset %08x",applid_sec);
222 res |= psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL,0,
223 &(*result)->sketch_sec);
224 }
225
226 psiconv_free_application_id_section(appl_id);
227 psiconv_free_section_table_section(table);
228
229 psiconv_progress(lev+1,off,"End of word file");
230 return res;
231}
232
233
234
105int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 235int psiconv_parse_texted_file(const psiconv_buffer buf,int lev,
236 psiconv_u32 off,
106 psiconv_texted_f *result) 237 psiconv_texted_f *result)
107{ 238{
108 int res=0; 239 int res=0;
109 psiconv_header_section header;
110 psiconv_section_table_section table; 240 psiconv_section_table_section table;
111 psiconv_application_id_section appl_id; 241 psiconv_application_id_section appl_id;
112 char *temp_str; 242 char *temp_str;
113 psiconv_character_layout base_char; 243 psiconv_character_layout base_char;
114 psiconv_paragraph_layout base_para; 244 psiconv_paragraph_layout base_para;
115 psiconv_u32 page_sec = 0; 245 psiconv_u32 page_sec = 0;
116 psiconv_u32 texted_sec = 0; 246 psiconv_u32 texted_sec = 0;
117 psiconv_u32 applid_sec = 0; 247 psiconv_u32 applid_sec = 0;
248 psiconv_u32 sto;
118 psiconv_section_table_entry entry; 249 psiconv_section_table_entry entry;
119 int i; 250 int i;
120 251
121 psiconv_progress(lev+1,off,"Going to read a texted file"); 252 psiconv_progress(lev+1,off,"Going to read a texted file");
122 *result = malloc(sizeof(**result)); 253 *result = malloc(sizeof(**result));
123 254
124 psiconv_progress(lev+2,off, "Going to read the header section"); 255 psiconv_progress(lev+2,off,
125 res |= psiconv_parse_header_section(buf,lev+2,off,NULL,&header);
126
127 psiconv_progress(lev+2,header->section_table_offset,
128 "Going to read the section table section"); 256 "Going to read the offset of the section table section");
257 sto = psiconv_read_u32(buf,lev+2,off);
258 psiconv_debug(lev+2,off,"Offset: %08x",sto);
259
260 psiconv_progress(lev+2,sto, "Going to read the section table section");
129 res |= psiconv_parse_section_table_section(buf,lev+2, 261 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);
130 header->section_table_offset,
131 NULL,&table);
132 262
133 for (i = 0; i < psiconv_list_length(table); i ++) { 263 for (i = 0; i < psiconv_list_length(table); i ++) {
134 psiconv_progress(lev+2,header->section_table_offset, 264 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
135 "Going to read entry %d",i);
136 entry = psiconv_list_get(table,i); 265 entry = psiconv_list_get(table,i);
137 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 266 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
138 applid_sec = entry->offset; 267 applid_sec = entry->offset;
139 psiconv_debug(lev+3,header->section_table_offset, 268 psiconv_debug(lev+3,sto,
140 "Found the Application ID section at %08x",applid_sec); 269 "Found the Application ID section at %08x",applid_sec);
141 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 270 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
142 page_sec = entry->offset; 271 page_sec = entry->offset;
143 psiconv_debug(lev+3,header->section_table_offset, 272 psiconv_debug(lev+3,sto,
144 "Found the Page Layout section at %08x",page_sec); 273 "Found the Page Layout section at %08x",page_sec);
145 } else if (entry->id == PSICONV_ID_TEXTED) { 274 } else if (entry->id == PSICONV_ID_TEXTED) {
146 texted_sec = entry->offset; 275 texted_sec = entry->offset;
147 psiconv_debug(lev+3,header->section_table_offset, 276 psiconv_debug(lev+3,sto,
148 "Found the TextEd section at %08x",texted_sec); 277 "Found the TextEd section at %08x",texted_sec);
149 } else { 278 } else {
150 psiconv_warn(lev+3,header->section_table_offset, 279 psiconv_warn(lev+3,sto,
151 "Found unknown section in the Section Table"); 280 "Found unknown section in the Section Table");
152 psiconv_debug(lev+3,header->section_table_offset, 281 psiconv_debug(lev+3,sto,
153 "Section ID %08x, offset %08x",entry->id,entry->offset); 282 "Section ID %08x, offset %08x",entry->id,entry->offset);
154 res = -1; 283 res = -1;
155 } 284 }
156 } 285 }
157 286
158 psiconv_progress(lev+2,header->section_table_offset, 287 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
159 "Looking for the Application ID section");
160 if (! applid_sec) { 288 if (! applid_sec) {
161 psiconv_warn(lev+2,header->section_table_offset, 289 psiconv_warn(lev+2,sto,
162 "Application ID section not found in the section table"); 290 "Application ID section not found in the section table");
163 res = -1; 291 res = -1;
164 } else { 292 } else {
165 psiconv_debug(lev+2,header->section_table_offset, 293 psiconv_debug(lev+2,sto,
166 "Application ID section at offset %08x",applid_sec); 294 "Application ID section at offset %08x",applid_sec);
167 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 295 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
168 &appl_id); 296 &appl_id);
169 } 297 }
170 if ((appl_id->id != PSICONV_ID_TEXTED) || 298 if ((appl_id->id != PSICONV_ID_TEXTED) ||
… …
173 "Application ID section contains unexpected data"); 301 "Application ID section contains unexpected data");
174 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 302 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
175 PSICONV_ID_TEXTED,appl_id->id); 303 PSICONV_ID_TEXTED,appl_id->id);
176 temp_str = psiconv_make_printable(appl_id->name); 304 temp_str = psiconv_make_printable(appl_id->name);
177 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 305 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
178 PSICONV_ID_TEXTED,temp_str); 306 "TextEd.app",temp_str);
179 free(temp_str); 307 free(temp_str);
180 } 308 }
181 309
182 psiconv_progress(lev+2,header->section_table_offset, 310 psiconv_progress(lev+2,sto,
183 "Looking for the Page layout section"); 311 "Looking for the Page layout section");
184 if (! page_sec) { 312 if (! page_sec) {
185 psiconv_warn(lev+2,header->section_table_offset, 313 psiconv_warn(lev+2,sto,
186 "Page layout section not found in the section table"); 314 "Page layout section not found in the section table");
187 (*result)->page_sec = NULL; 315 (*result)->page_sec = NULL;
188 res = -1; 316 res = -1;
189 } else { 317 } else {
190 psiconv_debug(lev+2,header->section_table_offset, 318 psiconv_debug(lev+2,sto,
191 "Page layout section at offset %08x",page_sec); 319 "Page layout section at offset %08x",page_sec);
192 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 320 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
193 &(*result)->page_sec); 321 &(*result)->page_sec);
194 } 322 }
195 323
196 base_char = psiconv_basic_character_layout(); 324 base_char = psiconv_basic_character_layout();
197 base_para = psiconv_basic_paragraph_layout(); 325 base_para = psiconv_basic_paragraph_layout();
198 326
199 psiconv_progress(lev+2,header->section_table_offset, 327 psiconv_progress(lev+2,sto,
200 "Looking for the TextEd section"); 328 "Looking for the TextEd section");
201 if (! texted_sec) { 329 if (! texted_sec) {
202 psiconv_warn(lev+2,header->section_table_offset, 330 psiconv_warn(lev+2,sto,
203 "TextEd section not found in the section table"); 331 "TextEd section not found in the section table");
204 (*result)->texted_sec = NULL; 332 (*result)->texted_sec = NULL;
205 res = -1; 333 res = -1;
206 } else { 334 } else {
207 psiconv_debug(lev+2,header->section_table_offset, 335 psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec);
208 "TextEd section at offset %08x",texted_sec);
209 res |= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL, 336 res |= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL,
210 &(*result)->texted_sec, 337 &(*result)->texted_sec,
211 base_char,base_para); 338 base_char,base_para);
212 } 339 }
213 psiconv_free_character_layout(base_char); 340 psiconv_free_character_layout(base_char);
214 psiconv_free_paragraph_layout(base_para); 341 psiconv_free_paragraph_layout(base_para);
215 342
216 psiconv_free_application_id_section(appl_id); 343 psiconv_free_application_id_section(appl_id);
217 psiconv_free_header_section(header);
218 psiconv_free_section_table_section(table); 344 psiconv_free_section_table_section(table);
219 345
220 psiconv_progress(lev+1,off,"End of word file"); 346 psiconv_progress(lev+1,off,"End of word file");
221 return res; 347 return res;
222} 348}
223 349
224int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 350int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
225 psiconv_word_f *result) 351 psiconv_word_f *result)
226{ 352{
227 int res=0; 353 int res=0;
228 psiconv_header_section header;
229 psiconv_section_table_section table; 354 psiconv_section_table_section table;
230 psiconv_application_id_section appl_id; 355 psiconv_application_id_section appl_id;
231 char *temp_str; 356 char *temp_str;
232 psiconv_u32 pwd_sec = 0; 357 psiconv_u32 pwd_sec = 0;
233 psiconv_u32 status_sec = 0; 358 psiconv_u32 status_sec = 0;
… …
235 psiconv_u32 page_sec = 0; 360 psiconv_u32 page_sec = 0;
236 psiconv_u32 text_sec = 0; 361 psiconv_u32 text_sec = 0;
237 psiconv_u32 layout_sec = 0; 362 psiconv_u32 layout_sec = 0;
238 psiconv_u32 applid_sec = 0; 363 psiconv_u32 applid_sec = 0;
239 psiconv_section_table_entry entry; 364 psiconv_section_table_entry entry;
365 psiconv_u32 sto;
240 int i; 366 int i;
241 367
242 psiconv_progress(lev+1,off,"Going to read a word file"); 368 psiconv_progress(lev+1,off,"Going to read a word file");
243 *result = malloc(sizeof(**result)); 369 *result = malloc(sizeof(**result));
244 370
245 psiconv_progress(lev+2,off, "Going to read the header section"); 371 psiconv_progress(lev+2,off,
246 res |= psiconv_parse_header_section(buf,lev+2,off,NULL,&header); 372 "Going to read the offset of the section table section");
373 sto = psiconv_read_u32(buf,lev+2,off);
374 psiconv_debug(lev+2,off,"Offset: %08x",sto);
247 375
248 psiconv_progress(lev+2,header->section_table_offset, 376 psiconv_progress(lev+2,sto,
249 "Going to read the section table section"); 377 "Going to read the section table section");
250 res |= psiconv_parse_section_table_section(buf,lev+2, 378 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);
251 header->section_table_offset,
252 NULL,&table);
253 379
254 for (i = 0; i < psiconv_list_length(table); i ++) { 380 for (i = 0; i < psiconv_list_length(table); i ++) {
255 psiconv_progress(lev+2,header->section_table_offset, 381 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
256 "Going to read entry %d",i);
257 entry = psiconv_list_get(table,i); 382 entry = psiconv_list_get(table,i);
258 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 383 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
259 applid_sec = entry->offset; 384 applid_sec = entry->offset;
260 psiconv_debug(lev+3,header->section_table_offset, 385 psiconv_debug(lev+3,sto,
261 "Found the Application ID section at %08x",applid_sec); 386 "Found the Application ID section at %08x",applid_sec);
262 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 387 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
263 page_sec = entry->offset; 388 page_sec = entry->offset;
264 psiconv_debug(lev+3,header->section_table_offset, 389 psiconv_debug(lev+3,sto,
265 "Found the Page Layout section at %08x",page_sec); 390 "Found the Page Layout section at %08x",page_sec);
266 } else if (entry->id == PSICONV_ID_TEXT_SECTION) { 391 } else if (entry->id == PSICONV_ID_TEXT_SECTION) {
267 text_sec = entry->offset; 392 text_sec = entry->offset;
268 psiconv_debug(lev+3,header->section_table_offset, 393 psiconv_debug(lev+3,sto, "Found the Text section at %08x",text_sec);
269 "Found the Text section at %08x",text_sec);
270 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) { 394 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
271 pwd_sec = entry->offset; 395 pwd_sec = entry->offset;
272 psiconv_debug(lev+3,header->section_table_offset, 396 psiconv_debug(lev+3,sto,
273 "Found the Password section at %08x",pwd_sec); 397 "Found the Password section at %08x",pwd_sec);
274 psiconv_warn(lev+3,header->section_table_offset, 398 psiconv_warn(lev+3,sto,
275 "Password section found - can't read encrypted data"); 399 "Password section found - can't read encrypted data");
276 res = -1; 400 res = -1;
277 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 401 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
278 status_sec = entry->offset; 402 status_sec = entry->offset;
279 psiconv_debug(lev+3,header->section_table_offset, 403 psiconv_debug(lev+3,sto,
280 "Found the Word Status section at %08x",status_sec); 404 "Found the Word Status section at %08x",status_sec);
281 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 405 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
282 styles_sec = entry->offset; 406 styles_sec = entry->offset;
283 psiconv_debug(lev+3,header->section_table_offset, 407 psiconv_debug(lev+3,sto,
284 "Found the Word Styles section at %08x",styles_sec); 408 "Found the Word Styles section at %08x",styles_sec);
285 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) { 409 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) {
286 layout_sec = entry->offset; 410 layout_sec = entry->offset;
287 psiconv_debug(lev+3,header->section_table_offset, 411 psiconv_debug(lev+3,sto,
288 "Found the Layout section at %08x",layout_sec); 412 "Found the Layout section at %08x",layout_sec);
289 } else { 413 } else {
290 psiconv_warn(lev+3,header->section_table_offset, 414 psiconv_warn(lev+3,sto,
291 "Found unknown section in the Section Table"); 415 "Found unknown section in the Section Table");
292 psiconv_debug(lev+3,header->section_table_offset, 416 psiconv_debug(lev+3,sto,
293 "Section ID %08x, offset %08x",entry->id,entry->offset); 417 "Section ID %08x, offset %08x",entry->id,entry->offset);
294 res = -1; 418 res = -1;
295 } 419 }
296 } 420 }
297 421
298 422
299 psiconv_progress(lev+2,header->section_table_offset, 423 psiconv_progress(lev+2,sto,
300 "Looking for the Status section"); 424 "Looking for the Status section");
301 if (!status_sec) { 425 if (!status_sec) {
302 psiconv_warn(lev+2,header->section_table_offset,
303 "Status section not found in the section table"); 426 psiconv_warn(lev+2,sto, "Status section not found in the section table");
304 res = -1; 427 res = -1;
305 } else { 428 } else {
306 psiconv_debug(lev+2,header->section_table_offset, 429 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec);
307 "Status section at offset %08x",status_sec);
308 res |= psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL, 430 res |= psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL,
309 &((*result)->status_sec)); 431 &((*result)->status_sec));
310 } 432 }
311 433
312 psiconv_progress(lev+2,header->section_table_offset, 434 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
313 "Looking for the Application ID section");
314 if (! applid_sec) { 435 if (! applid_sec) {
315 psiconv_warn(lev+2,header->section_table_offset, 436 psiconv_warn(lev+2,sto,
316 "Application ID section not found in the section table"); 437 "Application ID section not found in the section table");
317 res = -1; 438 res = -1;
318 } else { 439 } else {
319 psiconv_debug(lev+2,header->section_table_offset, 440 psiconv_debug(lev+2,sto,
320 "Application ID section at offset %08x",applid_sec); 441 "Application ID section at offset %08x",applid_sec);
321 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 442 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
322 &appl_id); 443 &appl_id);
323 } 444 }
324 if ((appl_id->id != PSICONV_ID_WORD) || 445 if ((appl_id->id != PSICONV_ID_WORD) ||
… …
327 "Application ID section contains unexpected data"); 448 "Application ID section contains unexpected data");
328 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 449 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
329 PSICONV_ID_WORD,appl_id->id); 450 PSICONV_ID_WORD,appl_id->id);
330 temp_str = psiconv_make_printable(appl_id->name); 451 temp_str = psiconv_make_printable(appl_id->name);
331 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 452 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
332 PSICONV_ID_WORD,temp_str); 453 "Word.app",temp_str);
333 free(temp_str); 454 free(temp_str);
334 } 455 }
335 456
336 psiconv_progress(lev+2,header->section_table_offset, 457 psiconv_progress(lev+2,sto,
337 "Looking for the Page layout section"); 458 "Looking for the Page layout section");
338 if (! page_sec) { 459 if (! page_sec) {
339 psiconv_warn(lev+2,header->section_table_offset, 460 psiconv_warn(lev+2,sto,
340 "Page layout section not found in the section table"); 461 "Page layout section not found in the section table");
341 (*result)->page_sec = NULL; 462 (*result)->page_sec = NULL;
342 res = -1; 463 res = -1;
343 } else { 464 } else {
344 psiconv_debug(lev+2,header->section_table_offset, 465 psiconv_debug(lev+2,sto,
345 "Page layout section at offset %08x",page_sec); 466 "Page layout section at offset %08x",page_sec);
346 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 467 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
347 &(*result)->page_sec); 468 &(*result)->page_sec);
348 } 469 }
349 470
350 psiconv_progress(lev+2,header->section_table_offset, 471 psiconv_progress(lev+2,sto,
351 "Looking for the Word Style section"); 472 "Looking for the Word Style section");
352 if (!styles_sec) { 473 if (!styles_sec) {
353 psiconv_warn(lev+2,header->section_table_offset, 474 psiconv_warn(lev+2,sto,
354 "Word styles section not found in the section table"); 475 "Word styles section not found in the section table");
355 (*result)->styles_sec = NULL; 476 (*result)->styles_sec = NULL;
356 res = -1; 477 res = -1;
357 } else { 478 } else {
358 psiconv_debug(lev+2,header->section_table_offset, 479 psiconv_debug(lev+2,sto,
359 "Word styles section at offset %08x",styles_sec); 480 "Word styles section at offset %08x",styles_sec);
360 res |= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL, 481 res |= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL,
361 &(*result)->styles_sec); 482 &(*result)->styles_sec);
362 } 483 }
363 484
364 psiconv_progress(lev+2,header->section_table_offset, 485 psiconv_progress(lev+2,sto,
365 "Looking for the Text section"); 486 "Looking for the Text section");
366 if (!text_sec) { 487 if (!text_sec) {
367 psiconv_warn(lev+2,header->section_table_offset, 488 psiconv_warn(lev+2,sto, "Text section not found in the section table");
368 "Text section not found in the section table");
369 (*result)->paragraphs = NULL; 489 (*result)->paragraphs = NULL;
370 res = -1; 490 res = -1;
371 } else { 491 } else {
372 psiconv_debug(lev+2,header->section_table_offset, 492 psiconv_debug(lev+2,sto,
373 "Text section at offset %08x",text_sec); 493 "Text section at offset %08x",text_sec);
374 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL, 494 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL,
375 &(*result)->paragraphs); 495 &(*result)->paragraphs);
376 } 496 }
377 497
378 if (((*result)->paragraphs) && ((*result)->styles_sec)) { 498 if (((*result)->paragraphs) && ((*result)->styles_sec)) {
379 psiconv_progress(lev+2,header->section_table_offset, 499 psiconv_progress(lev+2,sto,
380 "Looking for the Layout section"); 500 "Looking for the Layout section");
381 if (!layout_sec) { 501 if (!layout_sec) {
382 psiconv_debug(lev+2,header->section_table_offset, 502 psiconv_debug(lev+2,sto,
383 "Layout section not found in the section table"); 503 "Layout section not found in the section table");
384 res = -1; 504 res = -1;
385 } else { 505 } else {
386 psiconv_debug(lev+2,header->section_table_offset, 506 psiconv_debug(lev+2,sto,
387 "Layout section at offset %08x",layout_sec); 507 "Layout section at offset %08x",layout_sec);
388 res |= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL, 508 res |= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL,
389 (*result)->paragraphs, 509 (*result)->paragraphs,
390 (*result)->styles_sec); 510 (*result)->styles_sec);
391 } 511 }
392 } else 512 } else
393 psiconv_debug(lev+2,header->section_table_offset, 513 psiconv_debug(lev+2,sto,
394 "Skipping search for Layout section, as either the " 514 "Skipping search for Layout section, as either the "
395 "text or the word styles section was not found"); 515 "text or the word styles section was not found");
396 516
397 psiconv_free_application_id_section(appl_id); 517 psiconv_free_application_id_section(appl_id);
398 psiconv_free_header_section(header);
399 psiconv_free_section_table_section(table); 518 psiconv_free_section_table_section(table);
400 519
401 psiconv_progress(lev+1,off,"End of word file"); 520 psiconv_progress(lev+1,off,"End of word file");
402 return res; 521 return res;
403} 522}
Legend:
Removed from v.13  
changed lines
  Added in v.63
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26