/[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 18
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)));
60 else { 68 else {
61 psiconv_warn(lev+1,off,"Can't parse this file yet!"); 69 psiconv_warn(lev+1,off,"Can't parse this file yet!");
62 (*result)->file = NULL; 70 (*result)->file = NULL;
63 } 71 }
71{ 79{
72 int res=0; 80 int res=0;
73 int i; 81 int i;
74 psiconv_mbm_jumptable_section table; 82 psiconv_mbm_jumptable_section table;
75 psiconv_paint_data_section paint; 83 psiconv_paint_data_section paint;
76 psiconv_header_section header;
77 psiconv_u32 *entry; 84 psiconv_u32 *entry;
85 psiconv_u32 sto;
78 86
79 psiconv_progress(lev+1,off,"Going to read a mbm file"); 87 psiconv_progress(lev+1,off,"Going to read a mbm file");
80 *result = malloc(sizeof(**result)); 88 *result = malloc(sizeof(**result));
81 89
82 psiconv_progress(lev+2,off, "Going to read the header section"); 90 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); 91 sto = psiconv_read_u32(buf,lev+2,off);
92 psiconv_debug(lev+2,off,"Offset: %08x",sto);
84 93
85 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 94 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
86 res |= psiconv_parse_mbm_jumptable_section(buf,lev+2, 95 res |= psiconv_parse_mbm_jumptable_section(buf,lev+2,sto, NULL,&table);
87 header->section_table_offset,
88 NULL,&table);
89 96
90 psiconv_progress(lev+2,off,"Going to read the picture sections"); 97 psiconv_progress(lev+2,off,"Going to read the picture sections");
91 (*result)->sections = psiconv_list_new(sizeof(*paint)); 98 (*result)->sections = psiconv_list_new(sizeof(*paint));
92 for (i = 0; i < psiconv_list_length(table); i ++) { 99 for (i = 0; i < psiconv_list_length(table); i ++) {
93 entry = psiconv_list_get(table,i); 100 entry = psiconv_list_get(table,i);
94 psiconv_progress(lev+3,off,"Going to read picture section %i",i); 101 psiconv_progress(lev+3,off,"Going to read picture section %i",i);
95 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,&paint); 102 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,&paint);
96 psiconv_list_add((*result)->sections,paint); 103 psiconv_list_add((*result)->sections,paint);
97 } 104 }
98 105
99 psiconv_free_header_section(header);
100 psiconv_free_mbm_jumptable_section(table); 106 psiconv_free_mbm_jumptable_section(table);
101 psiconv_progress(lev+1,off,"End of mbm file"); 107 psiconv_progress(lev+1,off,"End of mbm file");
102 return res; 108 return res;
103} 109}
104 110
105int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 111int psiconv_parse_texted_file(const psiconv_buffer buf,int lev,
112 psiconv_u32 off,
106 psiconv_texted_f *result) 113 psiconv_texted_f *result)
107{ 114{
108 int res=0; 115 int res=0;
109 psiconv_header_section header;
110 psiconv_section_table_section table; 116 psiconv_section_table_section table;
111 psiconv_application_id_section appl_id; 117 psiconv_application_id_section appl_id;
112 char *temp_str; 118 char *temp_str;
113 psiconv_character_layout base_char; 119 psiconv_character_layout base_char;
114 psiconv_paragraph_layout base_para; 120 psiconv_paragraph_layout base_para;
115 psiconv_u32 page_sec = 0; 121 psiconv_u32 page_sec = 0;
116 psiconv_u32 texted_sec = 0; 122 psiconv_u32 texted_sec = 0;
117 psiconv_u32 applid_sec = 0; 123 psiconv_u32 applid_sec = 0;
124 psiconv_u32 sto;
118 psiconv_section_table_entry entry; 125 psiconv_section_table_entry entry;
119 int i; 126 int i;
120 127
121 psiconv_progress(lev+1,off,"Going to read a texted file"); 128 psiconv_progress(lev+1,off,"Going to read a texted file");
122 *result = malloc(sizeof(**result)); 129 *result = malloc(sizeof(**result));
123 130
131 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable");
132 sto = psiconv_read_u32(buf,lev+2,off);
133 psiconv_debug(lev+2,off,"Offset: %08x",sto);
134
124 psiconv_progress(lev+2,off, "Going to read the header section"); 135 psiconv_progress(lev+2,sto, "Going to read the section table section");
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");
129 res |= psiconv_parse_section_table_section(buf,lev+2, 136 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);
130 header->section_table_offset,
131 NULL,&table);
132 137
133 for (i = 0; i < psiconv_list_length(table); i ++) { 138 for (i = 0; i < psiconv_list_length(table); i ++) {
134 psiconv_progress(lev+2,header->section_table_offset, 139 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); 140 entry = psiconv_list_get(table,i);
137 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 141 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
138 applid_sec = entry->offset; 142 applid_sec = entry->offset;
139 psiconv_debug(lev+3,header->section_table_offset, 143 psiconv_debug(lev+3,sto,
140 "Found the Application ID section at %08x",applid_sec); 144 "Found the Application ID section at %08x",applid_sec);
141 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 145 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
142 page_sec = entry->offset; 146 page_sec = entry->offset;
143 psiconv_debug(lev+3,header->section_table_offset, 147 psiconv_debug(lev+3,sto,
144 "Found the Page Layout section at %08x",page_sec); 148 "Found the Page Layout section at %08x",page_sec);
145 } else if (entry->id == PSICONV_ID_TEXTED) { 149 } else if (entry->id == PSICONV_ID_TEXTED) {
146 texted_sec = entry->offset; 150 texted_sec = entry->offset;
147 psiconv_debug(lev+3,header->section_table_offset, 151 psiconv_debug(lev+3,sto,
148 "Found the TextEd section at %08x",texted_sec); 152 "Found the TextEd section at %08x",texted_sec);
149 } else { 153 } else {
150 psiconv_warn(lev+3,header->section_table_offset, 154 psiconv_warn(lev+3,sto,
151 "Found unknown section in the Section Table"); 155 "Found unknown section in the Section Table");
152 psiconv_debug(lev+3,header->section_table_offset, 156 psiconv_debug(lev+3,sto,
153 "Section ID %08x, offset %08x",entry->id,entry->offset); 157 "Section ID %08x, offset %08x",entry->id,entry->offset);
154 res = -1; 158 res = -1;
155 } 159 }
156 } 160 }
157 161
158 psiconv_progress(lev+2,header->section_table_offset, 162 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
159 "Looking for the Application ID section");
160 if (! applid_sec) { 163 if (! applid_sec) {
161 psiconv_warn(lev+2,header->section_table_offset, 164 psiconv_warn(lev+2,sto,
162 "Application ID section not found in the section table"); 165 "Application ID section not found in the section table");
163 res = -1; 166 res = -1;
164 } else { 167 } else {
165 psiconv_debug(lev+2,header->section_table_offset, 168 psiconv_debug(lev+2,sto,
166 "Application ID section at offset %08x",applid_sec); 169 "Application ID section at offset %08x",applid_sec);
167 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 170 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
168 &appl_id); 171 &appl_id);
169 } 172 }
170 if ((appl_id->id != PSICONV_ID_TEXTED) || 173 if ((appl_id->id != PSICONV_ID_TEXTED) ||
177 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 180 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
178 PSICONV_ID_TEXTED,temp_str); 181 PSICONV_ID_TEXTED,temp_str);
179 free(temp_str); 182 free(temp_str);
180 } 183 }
181 184
182 psiconv_progress(lev+2,header->section_table_offset, 185 psiconv_progress(lev+2,sto,
183 "Looking for the Page layout section"); 186 "Looking for the Page layout section");
184 if (! page_sec) { 187 if (! page_sec) {
185 psiconv_warn(lev+2,header->section_table_offset, 188 psiconv_warn(lev+2,sto,
186 "Page layout section not found in the section table"); 189 "Page layout section not found in the section table");
187 (*result)->page_sec = NULL; 190 (*result)->page_sec = NULL;
188 res = -1; 191 res = -1;
189 } else { 192 } else {
190 psiconv_debug(lev+2,header->section_table_offset, 193 psiconv_debug(lev+2,sto,
191 "Page layout section at offset %08x",page_sec); 194 "Page layout section at offset %08x",page_sec);
192 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 195 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
193 &(*result)->page_sec); 196 &(*result)->page_sec);
194 } 197 }
195 198
196 base_char = psiconv_basic_character_layout(); 199 base_char = psiconv_basic_character_layout();
197 base_para = psiconv_basic_paragraph_layout(); 200 base_para = psiconv_basic_paragraph_layout();
198 201
199 psiconv_progress(lev+2,header->section_table_offset, 202 psiconv_progress(lev+2,sto,
200 "Looking for the TextEd section"); 203 "Looking for the TextEd section");
201 if (! texted_sec) { 204 if (! texted_sec) {
202 psiconv_warn(lev+2,header->section_table_offset, 205 psiconv_warn(lev+2,sto,
203 "TextEd section not found in the section table"); 206 "TextEd section not found in the section table");
204 (*result)->texted_sec = NULL; 207 (*result)->texted_sec = NULL;
205 res = -1; 208 res = -1;
206 } else { 209 } else {
207 psiconv_debug(lev+2,header->section_table_offset, 210 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, 211 res |= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL,
210 &(*result)->texted_sec, 212 &(*result)->texted_sec,
211 base_char,base_para); 213 base_char,base_para);
212 } 214 }
213 psiconv_free_character_layout(base_char); 215 psiconv_free_character_layout(base_char);
214 psiconv_free_paragraph_layout(base_para); 216 psiconv_free_paragraph_layout(base_para);
215 217
216 psiconv_free_application_id_section(appl_id); 218 psiconv_free_application_id_section(appl_id);
217 psiconv_free_header_section(header);
218 psiconv_free_section_table_section(table); 219 psiconv_free_section_table_section(table);
219 220
220 psiconv_progress(lev+1,off,"End of word file"); 221 psiconv_progress(lev+1,off,"End of word file");
221 return res; 222 return res;
222} 223}
223 224
224int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 225int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
225 psiconv_word_f *result) 226 psiconv_word_f *result)
226{ 227{
227 int res=0; 228 int res=0;
228 psiconv_header_section header;
229 psiconv_section_table_section table; 229 psiconv_section_table_section table;
230 psiconv_application_id_section appl_id; 230 psiconv_application_id_section appl_id;
231 char *temp_str; 231 char *temp_str;
232 psiconv_u32 pwd_sec = 0; 232 psiconv_u32 pwd_sec = 0;
233 psiconv_u32 status_sec = 0; 233 psiconv_u32 status_sec = 0;
235 psiconv_u32 page_sec = 0; 235 psiconv_u32 page_sec = 0;
236 psiconv_u32 text_sec = 0; 236 psiconv_u32 text_sec = 0;
237 psiconv_u32 layout_sec = 0; 237 psiconv_u32 layout_sec = 0;
238 psiconv_u32 applid_sec = 0; 238 psiconv_u32 applid_sec = 0;
239 psiconv_section_table_entry entry; 239 psiconv_section_table_entry entry;
240 psiconv_u32 sto;
240 int i; 241 int i;
241 242
242 psiconv_progress(lev+1,off,"Going to read a word file"); 243 psiconv_progress(lev+1,off,"Going to read a word file");
243 *result = malloc(sizeof(**result)); 244 *result = malloc(sizeof(**result));
244 245
245 psiconv_progress(lev+2,off, "Going to read the header section"); 246 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable");
246 res |= psiconv_parse_header_section(buf,lev+2,off,NULL,&header); 247 sto = psiconv_read_u32(buf,lev+2,off);
248 psiconv_debug(lev+2,off,"Offset: %08x",sto);
247 249
248 psiconv_progress(lev+2,header->section_table_offset, 250 psiconv_progress(lev+2,sto,
249 "Going to read the section table section"); 251 "Going to read the section table section");
250 res |= psiconv_parse_section_table_section(buf,lev+2, 252 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);
251 header->section_table_offset,
252 NULL,&table);
253 253
254 for (i = 0; i < psiconv_list_length(table); i ++) { 254 for (i = 0; i < psiconv_list_length(table); i ++) {
255 psiconv_progress(lev+2,header->section_table_offset, 255 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); 256 entry = psiconv_list_get(table,i);
258 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 257 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
259 applid_sec = entry->offset; 258 applid_sec = entry->offset;
260 psiconv_debug(lev+3,header->section_table_offset, 259 psiconv_debug(lev+3,sto,
261 "Found the Application ID section at %08x",applid_sec); 260 "Found the Application ID section at %08x",applid_sec);
262 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 261 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
263 page_sec = entry->offset; 262 page_sec = entry->offset;
264 psiconv_debug(lev+3,header->section_table_offset, 263 psiconv_debug(lev+3,sto,
265 "Found the Page Layout section at %08x",page_sec); 264 "Found the Page Layout section at %08x",page_sec);
266 } else if (entry->id == PSICONV_ID_TEXT_SECTION) { 265 } else if (entry->id == PSICONV_ID_TEXT_SECTION) {
267 text_sec = entry->offset; 266 text_sec = entry->offset;
268 psiconv_debug(lev+3,header->section_table_offset, 267 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) { 268 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
271 pwd_sec = entry->offset; 269 pwd_sec = entry->offset;
272 psiconv_debug(lev+3,header->section_table_offset, 270 psiconv_debug(lev+3,sto,
273 "Found the Password section at %08x",pwd_sec); 271 "Found the Password section at %08x",pwd_sec);
274 psiconv_warn(lev+3,header->section_table_offset, 272 psiconv_warn(lev+3,sto,
275 "Password section found - can't read encrypted data"); 273 "Password section found - can't read encrypted data");
276 res = -1; 274 res = -1;
277 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 275 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
278 status_sec = entry->offset; 276 status_sec = entry->offset;
279 psiconv_debug(lev+3,header->section_table_offset, 277 psiconv_debug(lev+3,sto,
280 "Found the Word Status section at %08x",status_sec); 278 "Found the Word Status section at %08x",status_sec);
281 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 279 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
282 styles_sec = entry->offset; 280 styles_sec = entry->offset;
283 psiconv_debug(lev+3,header->section_table_offset, 281 psiconv_debug(lev+3,sto,
284 "Found the Word Styles section at %08x",styles_sec); 282 "Found the Word Styles section at %08x",styles_sec);
285 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) { 283 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) {
286 layout_sec = entry->offset; 284 layout_sec = entry->offset;
287 psiconv_debug(lev+3,header->section_table_offset, 285 psiconv_debug(lev+3,sto,
288 "Found the Layout section at %08x",layout_sec); 286 "Found the Layout section at %08x",layout_sec);
289 } else { 287 } else {
290 psiconv_warn(lev+3,header->section_table_offset, 288 psiconv_warn(lev+3,sto,
291 "Found unknown section in the Section Table"); 289 "Found unknown section in the Section Table");
292 psiconv_debug(lev+3,header->section_table_offset, 290 psiconv_debug(lev+3,sto,
293 "Section ID %08x, offset %08x",entry->id,entry->offset); 291 "Section ID %08x, offset %08x",entry->id,entry->offset);
294 res = -1; 292 res = -1;
295 } 293 }
296 } 294 }
297 295
298 296
299 psiconv_progress(lev+2,header->section_table_offset, 297 psiconv_progress(lev+2,sto,
300 "Looking for the Status section"); 298 "Looking for the Status section");
301 if (!status_sec) { 299 if (!status_sec) {
302 psiconv_warn(lev+2,header->section_table_offset,
303 "Status section not found in the section table"); 300 psiconv_warn(lev+2,sto, "Status section not found in the section table");
304 res = -1; 301 res = -1;
305 } else { 302 } else {
306 psiconv_debug(lev+2,header->section_table_offset, 303 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, 304 res |= psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL,
309 &((*result)->status_sec)); 305 &((*result)->status_sec));
310 } 306 }
311 307
312 psiconv_progress(lev+2,header->section_table_offset, 308 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
313 "Looking for the Application ID section");
314 if (! applid_sec) { 309 if (! applid_sec) {
315 psiconv_warn(lev+2,header->section_table_offset, 310 psiconv_warn(lev+2,sto,
316 "Application ID section not found in the section table"); 311 "Application ID section not found in the section table");
317 res = -1; 312 res = -1;
318 } else { 313 } else {
319 psiconv_debug(lev+2,header->section_table_offset, 314 psiconv_debug(lev+2,sto,
320 "Application ID section at offset %08x",applid_sec); 315 "Application ID section at offset %08x",applid_sec);
321 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 316 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
322 &appl_id); 317 &appl_id);
323 } 318 }
324 if ((appl_id->id != PSICONV_ID_WORD) || 319 if ((appl_id->id != PSICONV_ID_WORD) ||
331 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 326 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
332 PSICONV_ID_WORD,temp_str); 327 PSICONV_ID_WORD,temp_str);
333 free(temp_str); 328 free(temp_str);
334 } 329 }
335 330
336 psiconv_progress(lev+2,header->section_table_offset, 331 psiconv_progress(lev+2,sto,
337 "Looking for the Page layout section"); 332 "Looking for the Page layout section");
338 if (! page_sec) { 333 if (! page_sec) {
339 psiconv_warn(lev+2,header->section_table_offset, 334 psiconv_warn(lev+2,sto,
340 "Page layout section not found in the section table"); 335 "Page layout section not found in the section table");
341 (*result)->page_sec = NULL; 336 (*result)->page_sec = NULL;
342 res = -1; 337 res = -1;
343 } else { 338 } else {
344 psiconv_debug(lev+2,header->section_table_offset, 339 psiconv_debug(lev+2,sto,
345 "Page layout section at offset %08x",page_sec); 340 "Page layout section at offset %08x",page_sec);
346 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 341 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
347 &(*result)->page_sec); 342 &(*result)->page_sec);
348 } 343 }
349 344
350 psiconv_progress(lev+2,header->section_table_offset, 345 psiconv_progress(lev+2,sto,
351 "Looking for the Word Style section"); 346 "Looking for the Word Style section");
352 if (!styles_sec) { 347 if (!styles_sec) {
353 psiconv_warn(lev+2,header->section_table_offset, 348 psiconv_warn(lev+2,sto,
354 "Word styles section not found in the section table"); 349 "Word styles section not found in the section table");
355 (*result)->styles_sec = NULL; 350 (*result)->styles_sec = NULL;
356 res = -1; 351 res = -1;
357 } else { 352 } else {
358 psiconv_debug(lev+2,header->section_table_offset, 353 psiconv_debug(lev+2,sto,
359 "Word styles section at offset %08x",styles_sec); 354 "Word styles section at offset %08x",styles_sec);
360 res |= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL, 355 res |= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL,
361 &(*result)->styles_sec); 356 &(*result)->styles_sec);
362 } 357 }
363 358
364 psiconv_progress(lev+2,header->section_table_offset, 359 psiconv_progress(lev+2,sto,
365 "Looking for the Text section"); 360 "Looking for the Text section");
366 if (!text_sec) { 361 if (!text_sec) {
367 psiconv_warn(lev+2,header->section_table_offset, 362 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; 363 (*result)->paragraphs = NULL;
370 res = -1; 364 res = -1;
371 } else { 365 } else {
372 psiconv_debug(lev+2,header->section_table_offset, 366 psiconv_debug(lev+2,sto,
373 "Text section at offset %08x",text_sec); 367 "Text section at offset %08x",text_sec);
374 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL, 368 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL,
375 &(*result)->paragraphs); 369 &(*result)->paragraphs);
376 } 370 }
377 371
378 if (((*result)->paragraphs) && ((*result)->styles_sec)) { 372 if (((*result)->paragraphs) && ((*result)->styles_sec)) {
379 psiconv_progress(lev+2,header->section_table_offset, 373 psiconv_progress(lev+2,sto,
380 "Looking for the Layout section"); 374 "Looking for the Layout section");
381 if (!layout_sec) { 375 if (!layout_sec) {
382 psiconv_debug(lev+2,header->section_table_offset, 376 psiconv_debug(lev+2,sto,
383 "Layout section not found in the section table"); 377 "Layout section not found in the section table");
384 res = -1; 378 res = -1;
385 } else { 379 } else {
386 psiconv_debug(lev+2,header->section_table_offset, 380 psiconv_debug(lev+2,sto,
387 "Layout section at offset %08x",layout_sec); 381 "Layout section at offset %08x",layout_sec);
388 res |= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL, 382 res |= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL,
389 (*result)->paragraphs, 383 (*result)->paragraphs,
390 (*result)->styles_sec); 384 (*result)->styles_sec);
391 } 385 }
392 } else 386 } else
393 psiconv_debug(lev+2,header->section_table_offset, 387 psiconv_debug(lev+2,sto,
394 "Skipping search for Layout section, as either the " 388 "Skipping search for Layout section, as either the "
395 "text or the word styles section was not found"); 389 "text or the word styles section was not found");
396 390
397 psiconv_free_application_id_section(appl_id); 391 psiconv_free_application_id_section(appl_id);
398 psiconv_free_header_section(header);
399 psiconv_free_section_table_section(table); 392 psiconv_free_section_table_section(table);
400 393
401 psiconv_progress(lev+1,off,"End of word file"); 394 psiconv_progress(lev+1,off,"End of word file");
402 return res; 395 return res;
403} 396}

Legend:
Removed from v.13  
changed lines
  Added in v.18

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26