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