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