/[public]/psiconv/trunk/lib/psiconv/parse_common.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_common.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 162 Revision 196
1/* 1/*
2 parse_common.c - Part of psiconv, a PSION 5 file formats converter 2 parse_common.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999-2004 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.
… …
28#ifdef DMALLOC 28#ifdef DMALLOC
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32 32
33static int psiconv_parse_layout_section(const psiconv_buffer buf, 33static int psiconv_parse_layout_section(const psiconv_config config,
34 const psiconv_buffer buf,
34 int lev,psiconv_u32 off, 35 int lev,psiconv_u32 off,
35 int *length, 36 int *length,
36 psiconv_text_and_layout result, 37 psiconv_text_and_layout result,
37 psiconv_word_styles_section styles, 38 psiconv_word_styles_section styles,
38 int with_styles); 39 int with_styles);
39static psiconv_file_type_t psiconv_determine_embedded_object_type 40static psiconv_file_type_t psiconv_determine_embedded_object_type
40 (const psiconv_buffer buf,int lev, 41 (const psiconv_config config,
42 const psiconv_buffer buf,int lev,
41 int *status); 43 int *status);
42 44
43int psiconv_parse_header_section(const psiconv_buffer buf,int lev, 45int psiconv_parse_header_section(const psiconv_config config,
46 const psiconv_buffer buf,int lev,
44 psiconv_u32 off, int *length, 47 psiconv_u32 off, int *length,
45 psiconv_header_section *result) 48 psiconv_header_section *result)
46{ 49{
47 int res=0; 50 int res=0;
48 int len=0; 51 int len=0;
49 psiconv_u32 temp; 52 psiconv_u32 temp;
50 53
51 psiconv_progress(lev+1,off+len,"Going to read the header section"); 54 psiconv_progress(config,lev+1,off+len,"Going to read the header section");
52 if (!((*result) = malloc(sizeof(**result)))) 55 if (!((*result) = malloc(sizeof(**result))))
53 goto ERROR1; 56 goto ERROR1;
54 57
55 psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3"); 58 psiconv_progress(config,lev+2,off+len,"Going to read UID1 to UID3");
56 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len,&res); 59 (*result)->uid1 = psiconv_read_u32(config,buf,lev+2,off+len,&res);
57 if (res) 60 if (res)
58 goto ERROR2; 61 goto ERROR2;
59 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1); 62 psiconv_debug(config,lev+2,off+len,"UID1: %08x",(*result)->uid1);
60 if ((*result)->uid1 == PSICONV_ID_CLIPART) { 63 if ((*result)->uid1 == PSICONV_ID_CLIPART) {
61 /* That's all folks... */ 64 /* That's all folks... */
62 (*result)->file = psiconv_clipart_file; 65 (*result)->file = psiconv_clipart_file;
63 (*result)->uid2 = 0; 66 (*result)->uid2 = 0;
64 (*result)->uid3 = 0; 67 (*result)->uid3 = 0;
65 (*result)->checksum = 0; 68 (*result)->checksum = 0;
66 len += 4; 69 len += 4;
67 psiconv_debug(lev+2,off+len,"File is a Clipart file"); 70 psiconv_debug(config,lev+2,off+len,"File is a Clipart file");
68 goto DONE; 71 goto DONE;
69 } 72 }
70 if ((*result)->uid1 != PSICONV_ID_PSION5) { 73 if ((*result)->uid1 != PSICONV_ID_PSION5) {
71 psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably " 74 psiconv_error(config,lev+2,off+len,
75 "UID1 has unknown value. This is probably "
72 "not a (parsable) Psion 5 file"); 76 "not a (parsable) Psion 5 file");
73 res = -PSICONV_E_PARSE; 77 res = -PSICONV_E_PARSE;
74 goto ERROR2; 78 goto ERROR2;
75 } 79 }
76 len += 4; 80 len += 4;
77 (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len,&res); 81 (*result)->uid2 = psiconv_read_u32(config,buf,lev+2,off+len,&res);
78 if (res) 82 if (res)
79 goto ERROR2; 83 goto ERROR2;
80 psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2); 84 psiconv_debug(config,lev+2,off+len,"UID2: %08x",(*result)->uid2);
81 len += 4; 85 len += 4;
82 (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len,&res); 86 (*result)->uid3 = psiconv_read_u32(config,buf,lev+2,off+len,&res);
83 if (res) 87 if (res)
84 goto ERROR2; 88 goto ERROR2;
85 psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3); 89 psiconv_debug(config,lev+2,off+len,"UID3: %08x",(*result)->uid3);
86 len += 4; 90 len += 4;
87 91
88 (*result)->file = psiconv_unknown_file; 92 (*result)->file = psiconv_unknown_file;
89 if ((*result)->uid1 == PSICONV_ID_PSION5) { 93 if ((*result)->uid1 == PSICONV_ID_PSION5) {
90 if ((*result)->uid2 == PSICONV_ID_DATA_FILE) { 94 if ((*result)->uid2 == PSICONV_ID_DATA_FILE) {
91 if ((*result)->uid3 == PSICONV_ID_WORD) { 95 if ((*result)->uid3 == PSICONV_ID_WORD) {
92 (*result)->file = psiconv_word_file; 96 (*result)->file = psiconv_word_file;
93 psiconv_debug(lev+2,off+len,"File is a Word file"); 97 psiconv_debug(config,lev+2,off+len,"File is a Word file");
94 } else if ((*result)->uid3 == PSICONV_ID_TEXTED) { 98 } else if ((*result)->uid3 == PSICONV_ID_TEXTED) {
95 (*result)->file = psiconv_texted_file; 99 (*result)->file = psiconv_texted_file;
96 psiconv_debug(lev+2,off+len,"File is a TextEd file"); 100 psiconv_debug(config,lev+2,off+len,"File is a TextEd file");
97 } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { 101 } else if ((*result)->uid3 == PSICONV_ID_SKETCH) {
98 (*result)->file = psiconv_sketch_file; 102 (*result)->file = psiconv_sketch_file;
99 psiconv_debug(lev+2,off+len,"File is a Sketch file"); 103 psiconv_debug(config,lev+2,off+len,"File is a Sketch file");
100 } else if ((*result)->uid3 == PSICONV_ID_SHEET) { 104 } else if ((*result)->uid3 == PSICONV_ID_SHEET) {
101 (*result)->file = psiconv_sheet_file; 105 (*result)->file = psiconv_sheet_file;
102 psiconv_debug(lev+2,off+len,"File is a Sheet file"); 106 psiconv_debug(config,lev+2,off+len,"File is a Sheet file");
103 } 107 }
104 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { 108 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {
105 (*result)->file = psiconv_mbm_file; 109 (*result)->file = psiconv_mbm_file;
106 if ((*result)->uid3 != 0x00) 110 if ((*result)->uid3 != 0x00)
107 psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); 111 psiconv_warn(config,lev+2,off+len,"UID3 set in MBM file?!?");
108 psiconv_debug(lev+2,off+len,"File is a MBM file"); 112 psiconv_debug(config,lev+2,off+len,"File is a MBM file");
109 } 113 }
110 } 114 }
111 if ((*result)->file == psiconv_unknown_file) { 115 if ((*result)->file == psiconv_unknown_file) {
112 psiconv_warn(lev+2,off+len,"Unknown file type"); 116 psiconv_warn(config,lev+2,off+len,"Unknown file type");
113 (*result)->file = psiconv_unknown_file; 117 (*result)->file = psiconv_unknown_file;
114 } 118 }
115 119
116 psiconv_progress(lev+2,off+len,"Checking UID4"); 120 psiconv_progress(config,lev+2,off+len,"Checking UID4");
117 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 121 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
118 if (res) 122 if (res)
119 goto ERROR2; 123 goto ERROR2;
120 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, 124 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2,
121 (*result)->uid3)) 125 (*result)->uid3))
122 psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp); 126 psiconv_debug(config,lev+2,off+len,"Checksum %08x is correct",temp);
123 else { 127 else {
124 psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!"); 128 psiconv_error(config,lev+2,off+len,"Checksum failed, file corrupted!");
125 psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x", 129 psiconv_debug(config,lev+2,off+len,"Expected checksum %08x, found %08x",
126 psiconv_checkuid((*result)->uid1,(*result)->uid2, 130 psiconv_checkuid((*result)->uid1,(*result)->uid2,
127 (*result)->uid3),temp); 131 (*result)->uid3),temp);
128 res = -PSICONV_E_PARSE; 132 res = -PSICONV_E_PARSE;
129 goto ERROR2; 133 goto ERROR2;
130 } 134 }
… …
132 136
133DONE: 137DONE:
134 if (length) 138 if (length)
135 *length = len; 139 *length = len;
136 140
137 psiconv_progress(lev+1,off+len-1, 141 psiconv_progress(config,lev+1,off+len-1,
138 "End of Header Section (total length: %08x)",len); 142 "End of Header Section (total length: %08x)",len);
139 143
140 return res; 144 return res;
141 145
142ERROR2: 146ERROR2:
143 free(*result); 147 free(*result);
144ERROR1: 148ERROR1:
145 psiconv_warn(lev+1,off,"Reading of Header Section failed"); 149 psiconv_error(config,lev+1,off,"Reading of Header Section failed");
146 if (length) 150 if (length)
147 *length = 0; 151 *length = 0;
148 if (res == 0) 152 if (res == 0)
149 return -PSICONV_E_NOMEM; 153 return -PSICONV_E_NOMEM;
150 else 154 else
151 return res; 155 return res;
152} 156}
153 157
154int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev, 158int psiconv_parse_section_table_section(const psiconv_config config,
159 const psiconv_buffer buf, int lev,
155 psiconv_u32 off, int *length, 160 psiconv_u32 off, int *length,
156 psiconv_section_table_section *result) 161 psiconv_section_table_section *result)
157{ 162{
158 int res=0; 163 int res=0;
159 int len=0; 164 int len=0;
160 psiconv_section_table_entry entry; 165 psiconv_section_table_entry entry;
161 166
162 int i; 167 int i;
163 psiconv_u8 nr; 168 psiconv_u8 nr;
164 169
165 psiconv_progress(lev+1,off+len,"Going to read the section table section"); 170 psiconv_progress(config,lev+1,off+len,"Going to read the section table section");
166 if (!(*result = psiconv_list_new(sizeof(*entry)))) 171 if (!(*result = psiconv_list_new(sizeof(*entry))))
167 goto ERROR1; 172 goto ERROR1;
168 173
169 psiconv_progress(lev+2,off+len,"Going to read the section table length"); 174 psiconv_progress(config,lev+2,off+len,"Going to read the section table length");
170 nr = psiconv_read_u8(buf,lev+2,off+len,&res); 175 nr = psiconv_read_u8(config,buf,lev+2,off+len,&res);
171 if (res) 176 if (res)
172 goto ERROR2; 177 goto ERROR2;
173 psiconv_debug(lev+2,off+len,"Length: %08x",nr); 178 psiconv_debug(config,lev+2,off+len,"Length: %08x",nr);
174 if (nr & 0x01) { 179 if (nr & 0x01) {
175 psiconv_warn(lev+2,off+len, 180 psiconv_warn(config,lev+2,off+len,
176 "Section table length odd - ignoring last entry"); 181 "Section table length odd - ignoring last entry");
177 } 182 }
178 len ++; 183 len ++;
179 184
180 psiconv_progress(lev+2,off+len,"Going to read the section table entries"); 185 psiconv_progress(config,lev+2,off+len,"Going to read the section table entries");
181 entry = malloc(sizeof(*entry)); 186 entry = malloc(sizeof(*entry));
182 for (i = 0; i < nr / 2; i++) { 187 for (i = 0; i < nr / 2; i++) {
183 entry->id = psiconv_read_u32(buf,lev+2,off + len,&res); 188 entry->id = psiconv_read_u32(config,buf,lev+2,off + len,&res);
184 if (res) 189 if (res)
185 goto ERROR3; 190 goto ERROR3;
186 psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id); 191 psiconv_debug(config,lev+2,off + len,"Entry %d: ID = %08x",i,entry->id);
187 len += 0x04; 192 len += 0x04;
188 entry->offset = psiconv_read_u32(buf,lev+2,off + len,&res); 193 entry->offset = psiconv_read_u32(config,buf,lev+2,off + len,&res);
189 if (res) 194 if (res)
190 goto ERROR3; 195 goto ERROR3;
191 psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset); 196 psiconv_debug(config,lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset);
192 len += 0x04; 197 len += 0x04;
193 if ((res=psiconv_list_add(*result,entry))) 198 if ((res=psiconv_list_add(*result,entry)))
194 goto ERROR3; 199 goto ERROR3;
195 } 200 }
196 201
197 free(entry); 202 free(entry);
198 203
199 if (length) 204 if (length)
200 *length = len; 205 *length = len;
201 206
202 psiconv_progress(lev+1,off+len-1,"End of section table section " 207 psiconv_progress(config,lev+1,off+len-1,"End of section table section "
203 "(total length: %08x)", len); 208 "(total length: %08x)", len);
204 209
205 return 0; 210 return 0;
206ERROR3: 211ERROR3:
207 free(entry); 212 free(entry);
208ERROR2: 213ERROR2:
209 psiconv_list_free(*result); 214 psiconv_list_free(*result);
210ERROR1: 215ERROR1:
211 psiconv_warn(lev+1,off,"Reading of Section Table Section failed"); 216 psiconv_error(config,lev+1,off,"Reading of Section Table Section failed");
212 if (length) 217 if (length)
213 *length = 0; 218 *length = 0;
214 if (res == 0) 219 if (res == 0)
215 return -PSICONV_E_NOMEM; 220 return -PSICONV_E_NOMEM;
216 else 221 else
217 return res; 222 return res;
218} 223}
219 224
220int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev, 225int psiconv_parse_application_id_section(const psiconv_config config,
226 const psiconv_buffer buf, int lev,
221 psiconv_u32 off, int *length, 227 psiconv_u32 off, int *length,
222 psiconv_application_id_section *result) 228 psiconv_application_id_section *result)
223{ 229{
224 int res=0; 230 int res=0;
225 int len=0; 231 int len=0;
226 int leng; 232 int leng;
227 233
228 psiconv_progress(lev+1,off,"Going to read the application id section"); 234 psiconv_progress(config,lev+1,off,"Going to read the application id section");
229 if (!(*result = malloc(sizeof(**result)))) 235 if (!(*result = malloc(sizeof(**result))))
230 goto ERROR1; 236 goto ERROR1;
231 237
232 psiconv_progress(lev+2,off+len,"Going to read the type identifier"); 238 psiconv_progress(config,lev+2,off+len,"Going to read the type identifier");
233 (*result)->id = psiconv_read_u32(buf,lev+2,off+len,&res); 239 (*result)->id = psiconv_read_u32(config,buf,lev+2,off+len,&res);
234 if (res) 240 if (res)
235 goto ERROR2; 241 goto ERROR2;
236 psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id); 242 psiconv_debug(config,lev+2,off+len,"Identifier: %08x",(*result)->id);
237 len += 4; 243 len += 4;
238 244
239 psiconv_progress(lev+2,off+len,"Going to read the application id string"); 245 psiconv_progress(config,lev+2,off+len,"Going to read the application id string");
240 (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res); 246 (*result)->name = psiconv_read_string(config,buf,lev+2,off+len,&leng,&res);
241 if (res) 247 if (res)
242 goto ERROR2; 248 goto ERROR2;
243 len += leng; 249 len += leng;
244 250
245 if (length) 251 if (length)
246 *length = len; 252 *length = len;
247 253
248 psiconv_progress(lev+1,off+len-1,"End of application id section " 254 psiconv_progress(config,lev+1,off+len-1,"End of application id section "
249 "(total length: %08x", len); 255 "(total length: %08x", len);
250 256
251 return res; 257 return res;
252ERROR2: 258ERROR2:
253 free(*result); 259 free(*result);
254ERROR1: 260ERROR1:
255 psiconv_warn(lev+1,off,"Reading of Application ID Section failed"); 261 psiconv_error(config,lev+1,off,"Reading of Application ID Section failed");
256 if (length) 262 if (length)
257 *length = 0; 263 *length = 0;
258 if (res == 0) 264 if (res == 0)
259 return -PSICONV_E_NOMEM; 265 return -PSICONV_E_NOMEM;
260 else 266 else
261 return res; 267 return res;
262} 268}
263 269
264int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off, 270int psiconv_parse_text_section(const psiconv_config config,
271 const psiconv_buffer buf,int lev,psiconv_u32 off,
265 int *length,psiconv_text_and_layout *result) 272 int *length,psiconv_text_and_layout *result)
266{ 273{
267 274
268 int res = 0; 275 int res = 0;
269 int len=0; 276 int len=0;
270 277
271 psiconv_u32 text_len; 278 psiconv_u32 text_len;
272 psiconv_paragraph para; 279 psiconv_paragraph para;
280 psiconv_u8 temp;
273 281
274 int nr; 282 int nr;
275 int i,j,start,leng,temp; 283 int i,j,start,leng;
276 char *str_copy; 284 char *str_copy;
277 285
278 psiconv_progress(lev+1,off,"Going to parse the text section"); 286 psiconv_progress(config,lev+1,off,"Going to parse the text section");
279 psiconv_progress(lev+2,off,"Reading the text length"); 287 psiconv_progress(config,lev+2,off,"Reading the text length");
280 288
281 if(!(*result = psiconv_list_new(sizeof(*para)))) 289 if(!(*result = psiconv_list_new(sizeof(*para))))
282 goto ERROR1; 290 goto ERROR1;
283 if (!(para = malloc(sizeof(*para)))) 291 if (!(para = malloc(sizeof(*para))))
284 goto ERROR2; 292 goto ERROR2;
285 293
286 text_len = psiconv_read_X(buf,lev+2,off,&leng,&res); 294 text_len = psiconv_read_X(config,buf,lev+2,off,&leng,&res);
287 if (res) 295 if (res)
288 goto ERROR3; 296 goto ERROR3;
289 psiconv_debug(lev+2,off,"Length: %08x",text_len); 297 psiconv_debug(config,lev+2,off,"Length: %08x",text_len);
290 len += leng; 298 len += leng;
291 299
292 psiconv_progress(lev+2,off+len,"Going to read all paragraph text"); 300 psiconv_progress(config,lev+2,off+len,"Going to read all paragraph text");
293 nr = 0; 301 nr = 0;
294 start = 0; 302 start = 0;
295 for (i = 0; i < text_len; i++) { 303 for (i = 0; i < text_len; i++) {
296 temp = psiconv_read_u8(buf,lev+2,off+len+i,&res); 304 temp = psiconv_read_u8(config,buf,lev+2,off+len+i,&res);
297 if (res) 305 if (res)
298 goto ERROR3; 306 goto ERROR3;
299 if (temp == 0x06) { 307 if (temp == 0x06) {
300 if (!(para->text = malloc(i - start + 1))) 308 if (!(para->text = malloc((sizeof((*(para->text))) * (i - start + 1)))))
301 goto ERROR3; 309 goto ERROR3;
302 for (j = 0; j < i - start; j++) { 310 for (j = 0; j < i - start; j++) {
303 temp = psiconv_read_u8(buf,lev+1,off + len + start + j,&res); 311 temp = psiconv_read_u8(config,buf,lev+1,off + len + start + j,&res);
304 if (res) 312 if (res)
305 goto ERROR4; 313 goto ERROR4;
306 para->text[j] = temp; 314 para->text[j] = psiconv_unicode_from_char(config,temp);
307 } 315 }
308 para->text[j] = 0; 316 para->text[j] = 0;
309 317
310 if ((res = psiconv_list_add(*result,para))) 318 if ((res = psiconv_list_add(*result,para)))
311 goto ERROR4; 319 goto ERROR4;
312 320
313 if (!(str_copy = psiconv_make_printable(para->text))) 321 if (!(str_copy = psiconv_make_printable(config,para->text)))
314 goto ERROR3; 322 goto ERROR3;
315 psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr, 323 psiconv_debug(config,lev+2,off+i+len,"Line %d: %d characters",nr,
316 strlen(str_copy) +1); 324 strlen(str_copy) +1);
317 psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy); 325 psiconv_debug(config,lev+2,off+i+len,"Line %d: `%s'",nr,str_copy);
318 free(str_copy); 326 free(str_copy);
319 327
320 start = i + 1; 328 start = i + 1;
321 nr ++; 329 nr ++;
322 } 330 }
323 } 331 }
324 332
325 if (start != text_len) { 333 if (start != text_len) {
326 psiconv_warn(lev+2,off+start+len, 334 psiconv_warn(config,lev+2,off+start+len,
327 "Last line does not end on EOL (%d characters left)", len - start); 335 "Last line does not end on EOL (%d characters left)", len - start);
328 if (!(para->text = malloc(text_len - start + 1))) 336 if (!(para->text = malloc(text_len - start + 1)))
329 goto ERROR3; 337 goto ERROR3;
330 for (j = 0; j < text_len - start; j++) { 338 for (j = 0; j < text_len - start; j++) {
331 temp = psiconv_read_u8(buf,lev+2,off + start + j + len, &res); 339 temp = psiconv_read_u8(config,buf,lev+2,off + start + j + len, &res);
332 if (res) 340 if (res)
333 goto ERROR4; 341 goto ERROR4;
334 para->text[j] = temp; 342 para->text[j] = psiconv_unicode_from_char(config,temp);
335 } 343 }
336 para->text[text_len - start] = 0; 344 para->text[text_len - start] = 0;
337 if ((res = psiconv_list_add(*result,para))) 345 if ((res = psiconv_list_add(*result,para)))
338 goto ERROR4; 346 goto ERROR4;
339 if (!(str_copy = psiconv_make_printable(para->text))) 347 if (!(str_copy = psiconv_make_printable(config,para->text)))
340 goto ERROR3; 348 goto ERROR3;
341 psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr, 349 psiconv_debug(config,lev+2,off+start+len,"Last line: %d characters",nr,
342 strlen(str_copy)+1); 350 strlen(str_copy)+1);
343 psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy); 351 psiconv_debug(config,lev+2,off+start+len,"Last line: `%s'",str_copy);
344 free(str_copy); 352 free(str_copy);
345 } 353 }
346 354
347 free(para); 355 free(para);
348 356
349 /* Initialize the remaining parts of each paragraph */ 357 /* Initialize the remaining parts of each paragraph */
350 for (i = 0; i < psiconv_list_length(*result); i ++) { 358 for (i = 0; i < psiconv_list_length(*result); i ++) {
351 if (!(para = psiconv_list_get(*result,i))) { 359 if (!(para = psiconv_list_get(*result,i))) {
352 psiconv_warn(lev+2,off+len,"Massive memory corruption"); 360 psiconv_error(config,lev+2,off+len,"Massive memory corruption");
353 goto ERROR2_0; 361 goto ERROR2_0;
354 } 362 }
355 if (!(para->in_lines = psiconv_list_new(sizeof( 363 if (!(para->in_lines = psiconv_list_new(sizeof(
356 struct psiconv_in_line_layout_s)))) 364 struct psiconv_in_line_layout_s))))
357 goto ERROR2_0; 365 goto ERROR2_0;
… …
369 len += text_len; 377 len += text_len;
370 378
371 if (length) 379 if (length)
372 *length = len; 380 *length = len;
373 381
374 psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x", 382 psiconv_progress(config,lev+1,off+len-1,"End of text section (total length: %08x",
375 len); 383 len);
376 384
377 return res; 385 return res;
378 386
379ERROR2_3: 387ERROR2_3:
… …
383ERROR2_1: 391ERROR2_1:
384 psiconv_list_free(para->in_lines); 392 psiconv_list_free(para->in_lines);
385ERROR2_0: 393ERROR2_0:
386 for (j = 0; j < i; j++) { 394 for (j = 0; j < i; j++) {
387 if (!(para = psiconv_list_get(*result,j))) { 395 if (!(para = psiconv_list_get(*result,j))) {
388 psiconv_warn(lev+1,off,"Massive memory corruption..."); 396 psiconv_error(config,lev+1,off,"Massive memory corruption...");
389 break; 397 break;
390 } 398 }
391 psiconv_list_free(para->in_lines); 399 psiconv_list_free(para->in_lines);
392 psiconv_list_free(para->replacements); 400 psiconv_list_free(para->replacements);
393 psiconv_free_character_layout(para->base_character); 401 psiconv_free_character_layout(para->base_character);
… …
400ERROR3: 408ERROR3:
401 free(para); 409 free(para);
402ERROR2: 410ERROR2:
403 for (i = 0; i < psiconv_list_length(*result);i++) { 411 for (i = 0; i < psiconv_list_length(*result);i++) {
404 if (!(para = psiconv_list_get(*result,i))) { 412 if (!(para = psiconv_list_get(*result,i))) {
405 psiconv_warn(lev+1,off,"Massive memory corruption..."); 413 psiconv_error(config,lev+1,off,"Massive memory corruption...");
406 break; 414 break;
407 } 415 }
408 free(para->text); 416 free(para->text);
409 } 417 }
410 psiconv_list_free(*result); 418 psiconv_list_free(*result);
411ERROR1: 419ERROR1:
412 psiconv_warn(lev+1,off,"Reading of Text Section failed"); 420 psiconv_error(config,lev+1,off,"Reading of Text Section failed");
413 if (length) 421 if (length)
414 *length = 0; 422 *length = 0;
415 if (!res) 423 if (!res)
416 return -PSICONV_E_NOMEM; 424 return -PSICONV_E_NOMEM;
417 else 425 else
418 return res; 426 return res;
419} 427}
420 428
421/* First do a parse_text_section, or you will get into trouble here */ 429/* First do a parse_text_section, or you will get into trouble here */
422int psiconv_parse_layout_section(const psiconv_buffer buf, 430int psiconv_parse_layout_section(const psiconv_config config,
431 const psiconv_buffer buf,
423 int lev,psiconv_u32 off, 432 int lev,psiconv_u32 off,
424 int *length, 433 int *length,
425 psiconv_text_and_layout result, 434 psiconv_text_and_layout result,
426 psiconv_word_styles_section styles, 435 psiconv_word_styles_section styles,
427 int with_styles) 436 int with_styles)
… …
452 struct psiconv_in_line_layout_s in_line; 461 struct psiconv_in_line_layout_s in_line;
453 462
454 int *inline_count; 463 int *inline_count;
455 464
456 465
457 psiconv_progress(lev+1,off,"Going to read the layout section"); 466 psiconv_progress(config,lev+1,off,"Going to read the layout section");
458 467
459 psiconv_progress(lev+2,off,"Going to read the section type"); 468 psiconv_progress(config,lev+2,off,"Going to read the section type");
460 temp = psiconv_read_u16(buf,lev+2,off+len,&res); 469 temp = psiconv_read_u16(config,buf,lev+2,off+len,&res);
461 if (res) 470 if (res)
462 goto ERROR1; 471 goto ERROR1;
463 psiconv_debug(lev+2,off+len,"Type: %02x",temp); 472 psiconv_debug(config,lev+2,off+len,"Type: %02x",temp);
464 parse_styles = with_styles; 473 parse_styles = with_styles;
465 if ((temp == 0x0001) && !with_styles) { 474 if ((temp == 0x0001) && !with_styles) {
466 psiconv_warn(lev+2,off+len,"Styleless layout section expected, " 475 psiconv_warn(config,lev+2,off+len,"Styleless layout section expected, "
467 "but styled section found!"); 476 "but styled section found!");
468 parse_styles = 1; 477 parse_styles = 1;
469 } else if ((temp == 0x0000) && (with_styles)) { 478 } else if ((temp == 0x0000) && (with_styles)) {
470 psiconv_warn(lev+2,off+len,"Styled layout section expected, " 479 psiconv_warn(config,lev+2,off+len,"Styled layout section expected, "
471 "but styleless section found!"); 480 "but styleless section found!");
472 parse_styles = 0; 481 parse_styles = 0;
473 } else if ((temp != 0x0000) && (temp != 0x0001)) { 482 } else if ((temp != 0x0000) && (temp != 0x0001)) {
474 psiconv_warn(lev+2,off+len, 483 psiconv_warn(config,lev+2,off+len,
475 "Layout section type indicator has unknown value!"); 484 "Layout section type indicator has unknown value!");
476 } 485 }
477 len += 0x02; 486 len += 0x02;
478 487
479 psiconv_progress(lev+2,off+len,"Going to read paragraph type list"); 488 psiconv_progress(config,lev+2,off+len,"Going to read paragraph type list");
480 if (!(anon_styles = psiconv_list_new(sizeof(anon)))) 489 if (!(anon_styles = psiconv_list_new(sizeof(anon))))
481 goto ERROR1; 490 goto ERROR1;
482 psiconv_progress(lev+3,off+len,"Going to read paragraph type list length"); 491 psiconv_progress(config,lev+3,off+len,"Going to read paragraph type list length");
483 nr = psiconv_read_u8(buf,lev+3,off+len,&res); 492 nr = psiconv_read_u8(config,buf,lev+3,off+len,&res);
484 if (res) 493 if (res)
485 goto ERROR2; 494 goto ERROR2;
486 psiconv_debug(lev+3,off+len,"Length: %02x",nr); 495 psiconv_debug(config,lev+3,off+len,"Length: %02x",nr);
487 len ++; 496 len ++;
488 497
489 psiconv_progress(lev+3,off+len, 498 psiconv_progress(config,lev+3,off+len,
490 "Going to read the paragraph type list elements"); 499 "Going to read the paragraph type list elements");
491 for (i = 0; i < nr; i ++) { 500 for (i = 0; i < nr; i ++) {
492 psiconv_progress(lev+3,off+len,"Element %d",i); 501 psiconv_progress(config,lev+3,off+len,"Element %d",i);
493 anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res); 502 anon.nr = psiconv_read_u32(config,buf,lev+4,off+len,&res);
494 if (res) 503 if (res)
495 goto ERROR3; 504 goto ERROR3;
496 psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr); 505 psiconv_debug(config,lev+4,off+len,"Number: %08x",anon.nr);
497 len += 0x04; 506 len += 0x04;
498 507
499 psiconv_progress(lev+4,off,"Going to determine the base style"); 508 psiconv_progress(config,lev+4,off,"Going to determine the base style");
500 if (parse_styles) { 509 if (parse_styles) {
501 temp = psiconv_read_u32(buf,lev+4, off+len,&res); 510 temp = psiconv_read_u32(config,buf,lev+4, off+len,&res);
502 if (res) 511 if (res)
503 goto ERROR3; 512 goto ERROR3;
504 anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res); 513 anon.base_style = psiconv_read_u8(config,buf,lev+3, off+len+4+temp,&res);
505 if (res) 514 if (res)
506 goto ERROR3; 515 goto ERROR3;
507 psiconv_debug(lev+4,off+len+temp, 516 psiconv_debug(config,lev+4,off+len+temp,
508 "Style indicator: %02x",anon.base_style); 517 "Style indicator: %02x",anon.base_style);
509 } else 518 } else
510 anon.base_style = 0; 519 anon.base_style = 0;
511 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { 520 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
512 psiconv_warn(lev+4,off,"Unknown Style referenced"); 521 psiconv_warn(config,lev+4,off,"Unknown Style referenced");
513 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { 522 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
514 psiconv_warn(lev+4,off,"Base style unknown"); 523 psiconv_warn(config,lev+4,off,"Base style unknown");
515 goto ERROR3; 524 goto ERROR3;
516 } 525 }
517 } 526 }
518 if (!(anon.paragraph = psiconv_clone_paragraph_layout 527 if (!(anon.paragraph = psiconv_clone_paragraph_layout
519 (temp_style->paragraph))) 528 (temp_style->paragraph)))
520 goto ERROR3; 529 goto ERROR3;
521 if (!(anon.character = psiconv_clone_character_layout 530 if (!(anon.character = psiconv_clone_character_layout
522 (temp_style->character))) 531 (temp_style->character)))
523 goto ERROR3_1; 532 goto ERROR3_1;
524 533
525 psiconv_progress(lev+4,off+len,"Going to read the paragraph layout"); 534 psiconv_progress(config,lev+4,off+len,"Going to read the paragraph layout");
526 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, 535 if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng,
527 anon.paragraph))) 536 anon.paragraph)))
528 goto ERROR3_2; 537 goto ERROR3_2;
529 len += leng; 538 len += leng;
530 if (parse_styles) 539 if (parse_styles)
531 len ++; 540 len ++;
532 541
533 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 542 psiconv_progress(config,lev+4,off+len,"Going to read the character layout");
534 if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, 543 if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng,
535 anon.character))) 544 anon.character)))
536 goto ERROR3_2; 545 goto ERROR3_2;
537 len += leng; 546 len += leng;
538 if ((res = psiconv_list_add(anon_styles,&anon))) 547 if ((res = psiconv_list_add(anon_styles,&anon)))
539 goto ERROR3_2; 548 goto ERROR3_2;
540 } 549 }
541 550
542 psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list"); 551 psiconv_progress(config,lev+2,off+len,"Going to parse the paragraph element list");
543 psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs"); 552 psiconv_progress(config,lev+3,off+len,"Going to read the number of paragraphs");
544 nr = psiconv_read_u32(buf,lev+3,off+len,&res); 553 nr = psiconv_read_u32(config,buf,lev+3,off+len,&res);
545 if (res) 554 if (res)
546 goto ERROR3; 555 goto ERROR3;
547 if (nr != psiconv_list_length(result)) { 556 if (nr != psiconv_list_length(result)) {
548 psiconv_warn(lev+3,off+len, 557 psiconv_warn(config,lev+3,off+len,
549 "Number of text paragraphs and paragraph elements does not match"); 558 "Number of text paragraphs and paragraph elements does not match");
550 psiconv_debug(lev+3,off+len, 559 psiconv_debug(config,lev+3,off+len,
551 "%d text paragraphs, %d paragraph elements", 560 "%d text paragraphs, %d paragraph elements",
552 psiconv_list_length(result),nr); 561 psiconv_list_length(result),nr);
553 } 562 }
554 psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr); 563 psiconv_debug(config,lev+3,off+len,"Number of paragraphs: %d",nr);
555 len += 4; 564 len += 4;
556 if (!(inline_count = malloc(nr * sizeof(*inline_count)))) 565 if (!(inline_count = malloc(nr * sizeof(*inline_count))))
557 goto ERROR3; 566 goto ERROR3;
558 567
559 psiconv_progress(lev+3,off+len,"Going to read the paragraph elements"); 568 psiconv_progress(config,lev+3,off+len,"Going to read the paragraph elements");
560 for (i = 0; i < nr; i ++) { 569 for (i = 0; i < nr; i ++) {
561 psiconv_progress(lev+3,off+len,"Element %d",i); 570 psiconv_progress(config,lev+3,off+len,"Element %d",i);
562 if (i >= psiconv_list_length(result)) { 571 if (i >= psiconv_list_length(result)) {
563 psiconv_debug(lev+4,off+len,"Going to allocate a new element"); 572 psiconv_debug(config,lev+4,off+len,"Going to allocate a new element");
564 if (!(para = malloc(sizeof(*para)))) 573 if (!(para = malloc(sizeof(*para))))
565 goto ERROR4; 574 goto ERROR4;
566 if (!(para->in_lines = psiconv_list_new(sizeof( 575 if (!(para->in_lines = psiconv_list_new(sizeof(
567 struct psiconv_in_line_layout_s)))) 576 struct psiconv_in_line_layout_s))))
568 goto ERROR4_1; 577 goto ERROR4_1;
… …
576 free(para); 585 free(para);
577 } 586 }
578 if (!(para = psiconv_list_get(result,i))) 587 if (!(para = psiconv_list_get(result,i)))
579 goto ERROR4; 588 goto ERROR4;
580 589
581 psiconv_progress(lev+4,off+len,"Going to read the paragraph length"); 590 psiconv_progress(config,lev+4,off+len,"Going to read the paragraph length");
582 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 591 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
583 if (res) 592 if (res)
584 goto ERROR4; 593 goto ERROR4;
585 if (temp != strlen(para->text)+1) { 594 if (temp != psiconv_unicode_strlen(para->text)+1) {
586 psiconv_warn(lev+4,off+len, 595 psiconv_warn(config,lev+4,off+len,
587 "Disagreement of the length of paragraph in layout section"); 596 "Disagreement of the length of paragraph in layout section");
588 psiconv_debug(lev+4,off+len, 597 psiconv_debug(config,lev+4,off+len,
589 "Paragraph length: layout section says %d, counted %d", 598 "Paragraph length: layout section says %d, counted %d",
590 temp,strlen(para->text)+1); 599 temp,psiconv_unicode_strlen(para->text)+1);
591 } else 600 } else
592 psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp); 601 psiconv_debug(config,lev+4,off+len,"Paragraph length: %d",temp);
593 len += 4; 602 len += 4;
594 603
595 psiconv_progress(lev+4,off+len,"Going to read the paragraph type"); 604 psiconv_progress(config,lev+4,off+len,"Going to read the paragraph type");
596 temp = psiconv_read_u8(buf,lev+4,off+len,&res); 605 temp = psiconv_read_u8(config,buf,lev+4,off+len,&res);
597 if (res) 606 if (res)
598 goto ERROR4; 607 goto ERROR4;
599 if (temp != 0x00) { 608 if (temp != 0x00) {
600 psiconv_debug(lev+4,off+len,"Type: %02x",temp); 609 psiconv_debug(config,lev+4,off+len,"Type: %02x",temp);
601 for (j = 0; j < psiconv_list_length(anon_styles); j++) { 610 for (j = 0; j < psiconv_list_length(anon_styles); j++) {
602 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) { 611 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) {
603 psiconv_warn(lev+4,off+len,"Massive memory curruption"); 612 psiconv_error(config,lev+4,off+len,"Massive memory curruption");
604 goto ERROR4; 613 goto ERROR4;
605 } 614 }
606 if (temp == anon_ptr->nr) 615 if (temp == anon_ptr->nr)
607 break; 616 break;
608 } 617 }
609 if (j == psiconv_list_length(anon_styles)) { 618 if (j == psiconv_list_length(anon_styles)) {
610 psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown"); 619 psiconv_warn(config,lev+4,off+len,"Layout section paragraph type unknown");
611 psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead"); 620 psiconv_debug(config,lev+4,off+len,"Unknown type - using base styles instead");
612 para->base_style = 0; 621 para->base_style = 0;
613 if (!(temp_style = psiconv_get_style(styles,0))) { 622 if (!(temp_style = psiconv_get_style(styles,0))) {
614 psiconv_warn(lev+4,off,"Base style unknown"); 623 psiconv_error(config,lev+4,off,"Base style unknown");
615 goto ERROR4; 624 goto ERROR4;
616 } 625 }
617 if (!(temp_para = psiconv_clone_paragraph_layout 626 if (!(temp_para = psiconv_clone_paragraph_layout
618 (temp_style->paragraph))) 627 (temp_style->paragraph)))
619 goto ERROR4; 628 goto ERROR4;
… …
638 para->base_character = temp_char; 647 para->base_character = temp_char;
639 } 648 }
640 inline_count[i] = 0; 649 inline_count[i] = 0;
641 len += 0x01; 650 len += 0x01;
642 } else { 651 } else {
643 psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)" 652 psiconv_debug(config,lev+4,off+len,"Type: %02x (not based on a paragraph type)"
644 ,temp); 653 ,temp);
645 len += 0x01; 654 len += 0x01;
646 if (parse_styles) { 655 if (parse_styles) {
647 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 656 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
648 if (res) 657 if (res)
649 goto ERROR4; 658 goto ERROR4;
650 psiconv_progress(lev+4,off+len+temp+4, 659 psiconv_progress(config,lev+4,off+len+temp+4,
651 "Going to read the paragraph element base style"); 660 "Going to read the paragraph element base style");
652 temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res); 661 temp = psiconv_read_u8(config,buf,lev+4, off+len+temp+4,&res);
653 if (res) 662 if (res)
654 goto ERROR4; 663 goto ERROR4;
655 psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp); 664 psiconv_debug(config,lev+4,off+len+temp+4, "Style: %02x",temp);
656 } else 665 } else
657 temp = 0x00; 666 temp = 0x00;
658 667
659 if (!(temp_style = psiconv_get_style (styles,temp))) { 668 if (!(temp_style = psiconv_get_style (styles,temp))) {
660 psiconv_warn(lev+4,off,"Unknown Style referenced"); 669 psiconv_warn(config,lev+4,off,"Unknown Style referenced");
661 if (!(temp_style = psiconv_get_style(styles,0))) { 670 if (!(temp_style = psiconv_get_style(styles,0))) {
662 psiconv_warn(lev+4,off,"Base style unknown"); 671 psiconv_error(config,lev+4,off,"Base style unknown");
663 goto ERROR4; 672 goto ERROR4;
664 } 673 }
665 } 674 }
666 675
667 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph))) 676 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph)))
… …
673 goto ERROR4; 682 goto ERROR4;
674 psiconv_free_character_layout(para->base_character); 683 psiconv_free_character_layout(para->base_character);
675 para->base_character = temp_char; 684 para->base_character = temp_char;
676 685
677 para->base_style = temp; 686 para->base_style = temp;
678 psiconv_progress(lev+4,off+len,"Going to read paragraph layout"); 687 psiconv_progress(config,lev+4,off+len,"Going to read paragraph layout");
679 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, 688 if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng,
680 para->base_paragraph))) 689 para->base_paragraph)))
681 goto ERROR4; 690 goto ERROR4;
682 len += leng; 691 len += leng;
683 if (parse_styles) 692 if (parse_styles)
684 len += 1; 693 len += 1;
685 psiconv_progress(lev+4,off+len,"Going to read number of in-line " 694 psiconv_progress(config,lev+4,off+len,"Going to read number of in-line "
686 "layout elements"); 695 "layout elements");
687 inline_count[i] = psiconv_read_u32(buf,lev+4,off+len,&res); 696 inline_count[i] = psiconv_read_u32(config,buf,lev+4,off+len,&res);
688 if (res) 697 if (res)
689 goto ERROR4; 698 goto ERROR4;
690 psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]); 699 psiconv_debug(config,lev+4,off+len,"Nr: %08x",inline_count[i]);
691 len += 4; 700 len += 4;
692 } 701 }
693 } 702 }
694 703
695 psiconv_progress(lev+2,off+len,"Going to read the text layout inline list"); 704 psiconv_progress(config,lev+2,off+len,"Going to read the text layout inline list");
696 705
697 psiconv_progress(lev+3,off+len,"Going to read the number of elements"); 706 psiconv_progress(config,lev+3,off+len,"Going to read the number of elements");
698 nr = psiconv_read_u32(buf,lev+3,off+len,&res); 707 nr = psiconv_read_u32(config,buf,lev+3,off+len,&res);
699 if (res) 708 if (res)
700 goto ERROR4; 709 goto ERROR4;
701 psiconv_debug(lev+3,off+len,"Elements: %08x",nr); 710 psiconv_debug(config,lev+3,off+len,"Elements: %08x",nr);
702 len += 0x04; 711 len += 0x04;
703 712
704 psiconv_progress(lev+3,off+len, 713 psiconv_progress(config,lev+3,off+len,
705 "Going to read the text layout inline elements"); 714 "Going to read the text layout inline elements");
706 total = 0; 715 total = 0;
707 for (i = 0; i < psiconv_list_length(result); i++) { 716 for (i = 0; i < psiconv_list_length(result); i++) {
708 if (!(para = psiconv_list_get(result,i))) { 717 if (!(para = psiconv_list_get(result,i))) {
709 psiconv_warn(lev+3,off+len,"Massive memory corruption"); 718 psiconv_error(config,lev+3,off+len,"Massive memory corruption");
710 goto ERROR4; 719 goto ERROR4;
711 } 720 }
712 line_length = -1; 721 line_length = -1;
713 for (j = 0; j < inline_count[i]; j++) { 722 for (j = 0; j < inline_count[i]; j++) {
714 psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d", 723 psiconv_progress(config,lev+3,off+len,"Element %d: Paragraph %d, element %d",
715 total,i,j); 724 total,i,j);
716 if (total >= nr) { 725 if (total >= nr) {
717 psiconv_warn(lev+3,off+len, 726 psiconv_warn(config,lev+3,off+len,
718 "Layout section inlines: not enough element"); 727 "Layout section inlines: not enough element");
719 psiconv_debug(lev+3,off+len,"Can't read element!"); 728 psiconv_debug(config,lev+3,off+len,"Can't read element!");
720 } else { 729 } else {
721 total ++; 730 total ++;
722 in_line.object = NULL; 731 in_line.object = NULL;
723 in_line.layout = NULL; 732 in_line.layout = NULL;
724 if (!(in_line.layout = psiconv_clone_character_layout 733 if (!(in_line.layout = psiconv_clone_character_layout
725 (para->base_character))) 734 (para->base_character)))
726 goto ERROR4; 735 goto ERROR4;
727 psiconv_progress(lev+4,off+len,"Going to read the element type"); 736 psiconv_progress(config,lev+4,off+len,"Going to read the element type");
728 temp = psiconv_read_u8(buf,lev+4,len+off,&res); 737 temp = psiconv_read_u8(config,buf,lev+4,len+off,&res);
729 if (res) 738 if (res)
730 goto ERROR5; 739 goto ERROR5;
731 len += 1; 740 len += 1;
732 psiconv_debug(lev+4,off+len,"Type: %02x",temp); 741 psiconv_debug(config,lev+4,off+len,"Type: %02x",temp);
733 psiconv_progress(lev+4,off+len, 742 psiconv_progress(config,lev+4,off+len,
734 "Going to read the number of characters it applies to"); 743 "Going to read the number of characters it applies to");
735 in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res); 744 in_line.length = psiconv_read_u32(config,buf,lev+4,len+off,&res);
736 if (res) 745 if (res)
737 goto ERROR5; 746 goto ERROR5;
738 psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); 747 psiconv_debug(config,lev+4,off+len,"Length: %02x",in_line.length);
739 len += 4; 748 len += 4;
740 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 749 psiconv_progress(config,lev+4,off+len,"Going to read the character layout");
741 if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, 750 if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng,
742 in_line.layout))) 751 in_line.layout)))
743 goto ERROR5; 752 goto ERROR5;
744 len += leng; 753 len += leng;
745 754
746 if (temp == 0x01) { 755 if (temp == 0x01) {
747 psiconv_debug(lev+4,off+len,"Found an embedded object"); 756 psiconv_debug(config,lev+4,off+len,"Found an embedded object");
748 psiconv_progress(lev+4,off+len,"Going to read the object marker " 757 psiconv_progress(config,lev+4,off+len,"Going to read the object marker "
749 "(0x%08x expected)",PSICONV_ID_OBJECT); 758 "(0x%08x expected)",PSICONV_ID_OBJECT);
750 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 759 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
751 if (res) 760 if (res)
752 goto ERROR5; 761 goto ERROR5;
753 if (temp != PSICONV_ID_OBJECT) { 762 if (temp != PSICONV_ID_OBJECT) {
754 psiconv_warn(lev+4,off+len,"Unknown id marks embedded object"); 763 psiconv_warn(config,lev+4,off+len,"Unknown id marks embedded object");
755 psiconv_debug(lev+4,off+len,"Marker: read %08x, expected %08x", 764 psiconv_debug(config,lev+4,off+len,"Marker: read %08x, expected %08x",
756 temp,PSICONV_ID_OBJECT); 765 temp,PSICONV_ID_OBJECT);
757 } 766 }
758 len += 4; 767 len += 4;
759 psiconv_progress(lev+4,off+len, 768 psiconv_progress(config,lev+4,off+len,
760 "Going to read the Embedded Object Section offset"); 769 "Going to read the Embedded Object Section offset");
761 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 770 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
762 if (res) 771 if (res)
763 goto ERROR5; 772 goto ERROR5;
764 psiconv_debug(lev+4,off+len, "Offset: %08x",temp); 773 psiconv_debug(config,lev+4,off+len, "Offset: %08x",temp);
765 len += 4; 774 len += 4;
766 psiconv_progress(lev+4,off+len, 775 psiconv_progress(config,lev+4,off+len,
767 "Going to parse the Embedded Object"); 776 "Going to parse the Embedded Object Section");
768 if ((res = psiconv_parse_embedded_object(buf,lev+4,temp, 777 if ((res = psiconv_parse_embedded_object_section(config,buf,lev+4,temp,
769 NULL,&(in_line.object)))) 778 NULL,&(in_line.object))))
770 goto ERROR5; 779 goto ERROR5;
771 psiconv_progress(lev+4,off+len, 780 psiconv_progress(config,lev+4,off+len,
772 "Going to read the object width"); 781 "Going to read the object width");
773 in_line.object_width = psiconv_read_length(buf,lev+4,off+len, 782 in_line.object_width = psiconv_read_length(config,buf,lev+4,off+len,
774 &leng,&res); 783 &leng,&res);
775 if (res) 784 if (res)
776 goto ERROR5; 785 goto ERROR5;
777 psiconv_debug(lev+4,off+len,"Object width: %f cm", 786 psiconv_debug(config,lev+4,off+len,"Object width: %f cm",
778 in_line.object_width); 787 in_line.object_width);
779 len += leng; 788 len += leng;
780 psiconv_progress(lev+4,off+len, 789 psiconv_progress(config,lev+4,off+len,
781 "Going to read the object height"); 790 "Going to read the object height");
782 in_line.object_height = psiconv_read_length(buf,lev+4,off+len,&leng, 791 in_line.object_height = psiconv_read_length(config,buf,lev+4,off+len,&leng,
783 &res); 792 &res);
784 if (res) 793 if (res)
785 goto ERROR5; 794 goto ERROR5;
786 psiconv_debug(lev+4,off+len,"Object height: %f cm", 795 psiconv_debug(config,lev+4,off+len,"Object height: %f cm",
787 in_line.object_height); 796 in_line.object_height);
788 len += leng; 797 len += leng;
789 } else if (temp != 0x00) { 798 } else if (temp != 0x00) {
790 psiconv_warn(lev+4,off+len,"Layout section unknown inline type"); 799 psiconv_warn(config,lev+4,off+len,"Layout section unknown inline type");
791 } 800 }
792 if (line_length + in_line.length > strlen(para->text)) { 801 if (line_length + in_line.length > psiconv_unicode_strlen(para->text)) {
793 psiconv_warn(lev+4,off+len, 802 psiconv_warn(config,lev+4,off+len,
794 "Layout section inlines: line length mismatch"); 803 "Layout section inlines: line length mismatch");
795 res = -1; 804 res = -1;
796 in_line.length = strlen(para->text) - line_length; 805 in_line.length = psiconv_unicode_strlen(para->text) - line_length;
797 } 806 }
798 line_length += in_line.length; 807 line_length += in_line.length;
799 if ((res = psiconv_list_add(para->in_lines,&in_line))) 808 if ((res = psiconv_list_add(para->in_lines,&in_line)))
800 goto ERROR5; 809 goto ERROR5;
801 } 810 }
802 } 811 }
803 } 812 }
804 813
805 if (total != nr) { 814 if (total != nr) {
806 psiconv_warn(lev+4,off+len, 815 psiconv_warn(config,lev+4,off+len,
807 "Layout section too many inlines, skipping remaining"); 816 "Layout section too many inlines, skipping remaining");
808 } 817 }
809 818
810 free(inline_count); 819 free(inline_count);
811 820
812 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { 821 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {
813 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { 822 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
814 psiconv_warn(lev+4,off+len,"Massive memory corruption"); 823 psiconv_error(config,lev+4,off+len,"Massive memory corruption");
815 goto ERROR2; 824 goto ERROR2;
816 } 825 }
817 psiconv_free_character_layout(anon_ptr->character); 826 psiconv_free_character_layout(anon_ptr->character);
818 psiconv_free_paragraph_layout(anon_ptr->paragraph); 827 psiconv_free_paragraph_layout(anon_ptr->paragraph);
819 } 828 }
820 psiconv_list_free(anon_styles); 829 psiconv_list_free(anon_styles);
821 830
822 if (length) 831 if (length)
823 *length = len; 832 *length = len;
824 833
825 psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x)", 834 psiconv_progress(config,lev+1,off+len-1,"End of layout section (total length: %08x)",
826 len); 835 len);
827 836
828 return 0; 837 return 0;
829 838
830ERROR4_4: 839ERROR4_4:
… …
845 854
846ERROR5: 855ERROR5:
847 if (in_line.layout) 856 if (in_line.layout)
848 psiconv_free_character_layout(in_line.layout); 857 psiconv_free_character_layout(in_line.layout);
849 if (in_line.object) 858 if (in_line.object)
850 psiconv_free_object(in_line.object); 859 psiconv_free_embedded_object_section(in_line.object);
851ERROR4: 860ERROR4:
852 free(inline_count); 861 free(inline_count);
853ERROR3: 862ERROR3:
854 for (i = 0; i < psiconv_list_length(anon_styles); i++) { 863 for (i = 0; i < psiconv_list_length(anon_styles); i++) {
855 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { 864 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
856 psiconv_warn(lev+1,off,"Massive memory corruption"); 865 psiconv_error(config,lev+1,off,"Massive memory corruption");
857 break; 866 break;
858 } 867 }
859 psiconv_free_paragraph_layout(anon_ptr->paragraph); 868 psiconv_free_paragraph_layout(anon_ptr->paragraph);
860 psiconv_free_character_layout(anon_ptr->character); 869 psiconv_free_character_layout(anon_ptr->character);
861 } 870 }
862 871
863ERROR2: 872ERROR2:
864 psiconv_list_free(anon_styles); 873 psiconv_list_free(anon_styles);
865ERROR1: 874ERROR1:
866 psiconv_warn(lev+1,off,"Reading of Layout Section failed"); 875 psiconv_error(config,lev+1,off,"Reading of Layout Section failed");
867 if (length) 876 if (length)
868 *length = 0; 877 *length = 0;
869 if (!res) 878 if (!res)
870 return -PSICONV_E_NOMEM; 879 return -PSICONV_E_NOMEM;
871 else 880 else
872 return res; 881 return res;
873} 882}
874 883
875int psiconv_parse_styled_layout_section(const psiconv_buffer buf, 884int psiconv_parse_styled_layout_section(const psiconv_config config,
885 const psiconv_buffer buf,
876 int lev,psiconv_u32 off, 886 int lev,psiconv_u32 off,
877 int *length, 887 int *length,
878 psiconv_text_and_layout result, 888 psiconv_text_and_layout result,
879 psiconv_word_styles_section styles) 889 psiconv_word_styles_section styles)
880{ 890{
881 return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); 891 return psiconv_parse_layout_section(config,buf,lev,off,length,result,styles,1);
882} 892}
883 893
884int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, 894int psiconv_parse_styleless_layout_section(const psiconv_config config,
895 const psiconv_buffer buf,
885 int lev,psiconv_u32 off, 896 int lev,psiconv_u32 off,
886 int *length, 897 int *length,
887 psiconv_text_and_layout result, 898 psiconv_text_and_layout result,
888 const psiconv_character_layout base_char, 899 const psiconv_character_layout base_char,
889 const psiconv_paragraph_layout base_para) 900 const psiconv_paragraph_layout base_para)
… …
900 goto ERROR3; 911 goto ERROR3;
901 if (!(styles_section->normal->paragraph = 912 if (!(styles_section->normal->paragraph =
902 psiconv_clone_paragraph_layout(base_para))) 913 psiconv_clone_paragraph_layout(base_para)))
903 goto ERROR4; 914 goto ERROR4;
904 styles_section->normal->hotkey = 0; 915 styles_section->normal->hotkey = 0;
905 if (!(styles_section->normal->name = strdup(""))) 916 if (( res = psiconv_unicode_from_chars(config,(psiconv_u8 *) "",
917 &styles_section->normal->name)))
906 goto ERROR5; 918 goto ERROR5;
907 if (!(styles_section->styles = psiconv_list_new(sizeof( 919 if (!(styles_section->styles = psiconv_list_new(sizeof(
908 struct psiconv_word_style_s)))) 920 struct psiconv_word_style_s))))
909 goto ERROR6; 921 goto ERROR6;
910 922
911 res = psiconv_parse_layout_section(buf,lev,off,length,result, 923 res = psiconv_parse_layout_section(config,buf,lev,off,length,result,
912 styles_section,0); 924 styles_section,0);
913 925
914 psiconv_free_word_styles_section(styles_section); 926 psiconv_free_word_styles_section(styles_section);
915 return res; 927 return res;
916 928
… …
923ERROR3: 935ERROR3:
924 free(styles_section->normal); 936 free(styles_section->normal);
925ERROR2: 937ERROR2:
926 free(styles_section); 938 free(styles_section);
927ERROR1: 939ERROR1:
928 psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed"); 940 psiconv_error(config,lev+1,off,"Reading of Styleless Layout Section failed");
929 if (length) 941 if (length)
930 *length = 0; 942 *length = 0;
931 if (!res) 943 if (!res)
932 return -PSICONV_E_NOMEM; 944 return -PSICONV_E_NOMEM;
933 else 945 else
934 return res; 946 return res;
935} 947}
936 948
937int psiconv_parse_embedded_object(const psiconv_buffer buf, int lev, 949int psiconv_parse_embedded_object_section(const psiconv_config config,
950 const psiconv_buffer buf, int lev,
938 psiconv_u32 off, int *length, 951 psiconv_u32 off, int *length,
939 psiconv_object *result) 952 psiconv_embedded_object_section *result)
940{ 953{
941 int res=0; 954 int res=0;
942 int len=0; 955 int len=0;
943 int leng,i; 956 int leng,i;
944 psiconv_section_table_section table; 957 psiconv_section_table_section table;
945 psiconv_section_table_entry entry; 958 psiconv_section_table_entry entry;
946 psiconv_u32 icon_sec=0,display_sec=0,table_sec=0; 959 psiconv_u32 icon_sec=0,display_sec=0,table_sec=0;
947 psiconv_buffer subbuf; 960 psiconv_buffer subbuf;
948 961
949 psiconv_progress(lev+1,off+len,"Going to read an Embedded Object"); 962 psiconv_progress(config,lev+1,off+len,"Going to read an Embedded Object");
950 if (!(*result = malloc(sizeof(**result)))) 963 if (!(*result = malloc(sizeof(**result))))
951 goto ERROR1; 964 goto ERROR1;
952 965
953 psiconv_progress(lev+2,off+len,"Going to read the Embedded Object Section"); 966 psiconv_progress(config,lev+2,off+len,"Going to read the Embedded Object Section");
954 psiconv_parse_section_table_section(buf,lev+2,off+len,&leng,&table); 967 psiconv_parse_section_table_section(config,buf,lev+2,off+len,&leng,&table);
955 len += leng; 968 len += leng;
956 969
957 for (i = 0; i < psiconv_list_length(table); i++) { 970 for (i = 0; i < psiconv_list_length(table); i++) {
958 psiconv_progress(lev+2,off+len,"Going to read entry %d",i); 971 psiconv_progress(config,lev+2,off+len,"Going to read entry %d",i);
959 if (!(entry = psiconv_list_get(table,i))) 972 if (!(entry = psiconv_list_get(table,i)))
960 goto ERROR2; 973 goto ERROR2;
961 if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) { 974 if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) {
962 display_sec = entry->offset; 975 display_sec = entry->offset;
963 psiconv_debug(lev+3,off+len,"Found the Object Display Section at %08x", 976 psiconv_debug(config,lev+3,off+len,"Found the Object Display Section at %08x",
964 display_sec); 977 display_sec);
965 } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) { 978 } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) {
966 icon_sec = entry->offset; 979 icon_sec = entry->offset;
967 psiconv_debug(lev+3,off+len,"Found the Object Icon Section at %08x", 980 psiconv_debug(config,lev+3,off+len,"Found the Object Icon Section at %08x",
968 icon_sec); 981 icon_sec);
969 } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) { 982 } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) {
970 table_sec = entry->offset; 983 table_sec = entry->offset;
971 psiconv_debug(lev+3,off+len,"Found the Object Section Table Section at %08x", 984 psiconv_debug(config,lev+3,off+len,"Found the Object Section Table Section at %08x",
972 table_sec); 985 table_sec);
973 } else { 986 } else {
974 psiconv_warn(lev+3,off+len, 987 psiconv_warn(config,lev+3,off+len,
975 "Found unknown section in the Object Display Section " 988 "Found unknown section in the Object Display Section "
976 "(ignoring)"); 989 "(ignoring)");
977 psiconv_debug(lev+3,off+len,"Section ID %08x, offset %08x", 990 psiconv_debug(config,lev+3,off+len,"Section ID %08x, offset %08x",
978 entry->id, entry->offset); 991 entry->id, entry->offset);
979 } 992 }
980 } 993 }
981 994
982 psiconv_progress(lev+2,off+len,"Looking for the Object Display Section"); 995 psiconv_progress(config,lev+2,off+len,"Looking for the Object Display Section");
983 if (!icon_sec) { 996 if (!icon_sec) {
984 psiconv_warn(lev+2,off+len,"Object Display Section not found"); 997 psiconv_warn(config,lev+2,off+len,"Object Display Section not found");
985 (*result)->display = NULL; 998 (*result)->display = NULL;
986 } else { 999 } else {
987 psiconv_debug(lev+2,off+len,"Object Display Section at offset %08x", 1000 psiconv_debug(config,lev+2,off+len,"Object Display Section at offset %08x",
988 display_sec); 1001 display_sec);
989 if ((res = psiconv_parse_object_display_section(buf,lev+2,display_sec,NULL, 1002 if ((res = psiconv_parse_object_display_section(config,buf,lev+2,display_sec,NULL,
990 &(*result)->display))) 1003 &(*result)->display)))
991 goto ERROR2; 1004 goto ERROR2;
992 } 1005 }
993 1006
994 psiconv_progress(lev+2,off+len,"Looking for the Object Icon Section"); 1007 psiconv_progress(config,lev+2,off+len,"Looking for the Object Icon Section");
995 if (!icon_sec) { 1008 if (!icon_sec) {
996 psiconv_warn(lev+2,off+len,"Object Icon Section not found"); 1009 psiconv_warn(config,lev+2,off+len,"Object Icon Section not found");
997 (*result)->icon = NULL; 1010 (*result)->icon = NULL;
998 } else { 1011 } else {
999 psiconv_debug(lev+2,off+len,"Object Icon Section at offset %08x",icon_sec); 1012 psiconv_debug(config,lev+2,off+len,"Object Icon Section at offset %08x",icon_sec);
1000 if ((res = psiconv_parse_object_icon_section(buf,lev+2,icon_sec,NULL, 1013 if ((res = psiconv_parse_object_icon_section(config,buf,lev+2,icon_sec,NULL,
1001 &(*result)->icon))) 1014 &(*result)->icon)))
1002 goto ERROR3; 1015 goto ERROR3;
1003 } 1016 }
1004 1017
1005 psiconv_progress(lev+2,off+len, 1018 psiconv_progress(config,lev+2,off+len,
1006 "Looking for the Section Table Offset Section"); 1019 "Looking for the Section Table Offset Section");
1007 if (!table_sec) { 1020 if (!table_sec) {
1008 psiconv_warn(lev+2,off+len, 1021 psiconv_warn(config,lev+2,off+len,
1009 "Embedded Section Table Offset Section not found"); 1022 "Embedded Section Table Offset Section not found");
1010 (*result)->object = NULL; 1023 (*result)->object = NULL;
1011 } else { 1024 } else {
1012 psiconv_progress(lev+2,off+len, 1025 psiconv_progress(config,lev+2,off+len,
1013 "Extracting object: add %08x to all following offsets", 1026 "Extracting object: add %08x to all following offsets",
1014 table_sec); 1027 table_sec);
1015 /* We can't determine the length of the object, so we just take it all */ 1028 /* We can't determine the length of the object, so we just take it all */
1016 if ((res = psiconv_buffer_subbuffer(&subbuf,buf,table_sec, 1029 if ((res = psiconv_buffer_subbuffer(&subbuf,buf,table_sec,
1017 psiconv_buffer_length(buf)-table_sec))) 1030 psiconv_buffer_length(buf)-table_sec)))
… …
1020 if (!((*result)->object = malloc(sizeof(*(*result)->object)))) 1033 if (!((*result)->object = malloc(sizeof(*(*result)->object))))
1021 goto ERROR5; 1034 goto ERROR5;
1022 1035
1023 /* We need to find the file type, but we don't have a normal header */ 1036 /* We need to find the file type, but we don't have a normal header */
1024 /* So we try to find the Application ID Section and hope for the best */ 1037 /* So we try to find the Application ID Section and hope for the best */
1025 psiconv_progress(lev+3,0,"Trying to determine the file type"); 1038 psiconv_progress(config,lev+3,0,"Trying to determine the file type");
1026 (*result)->object->type = psiconv_determine_embedded_object_type 1039 (*result)->object->type = psiconv_determine_embedded_object_type
1027 (subbuf,lev+3,&res); 1040 (config,subbuf,lev+3,&res);
1028 switch ((*result)->object->type) { 1041 switch ((*result)->object->type) {
1029 case psiconv_word_file: 1042 case psiconv_word_file:
1030 if ((res = psiconv_parse_word_file(subbuf,lev+3,0, 1043 if ((res = psiconv_parse_word_file(config,subbuf,lev+3,0,
1031 ((psiconv_word_f *) &(*result)->object->file)))) 1044 ((psiconv_word_f *) &(*result)->object->file))))
1032 goto ERROR6; 1045 goto ERROR6;
1033 break; 1046 break;
1034 case psiconv_texted_file: 1047 case psiconv_texted_file:
1035 if ((res = psiconv_parse_texted_file(subbuf,lev+3,0, 1048 if ((res = psiconv_parse_texted_file(config,subbuf,lev+3,0,
1036 ((psiconv_texted_f *) &(*result)->object->file)))) 1049 ((psiconv_texted_f *) &(*result)->object->file))))
1037 goto ERROR6; 1050 goto ERROR6;
1038 break; 1051 break;
1039 case psiconv_sheet_file: 1052 case psiconv_sheet_file:
1040 if ((res = psiconv_parse_sheet_file(subbuf,lev+3,0, 1053 if ((res = psiconv_parse_sheet_file(config,subbuf,lev+3,0,
1041 ((psiconv_sheet_f *) &(*result)->object->file)))) 1054 ((psiconv_sheet_f *) &(*result)->object->file))))
1042 goto ERROR6; 1055 goto ERROR6;
1043 break; 1056 break;
1044 case psiconv_sketch_file: 1057 case psiconv_sketch_file:
1045 if ((res = psiconv_parse_sketch_file(subbuf,lev+3,0, 1058 if ((res = psiconv_parse_sketch_file(config,subbuf,lev+3,0,
1046 ((psiconv_sketch_f *) &(*result)->object->file)))) 1059 ((psiconv_sketch_f *) &(*result)->object->file))))
1047 goto ERROR6; 1060 goto ERROR6;
1048 break; 1061 break;
1049 default: 1062 default:
1050 psiconv_warn(lev+3,0,"Can't parse embedded object (still continuing)"); 1063 psiconv_warn(config,lev+3,0,"Can't parse embedded object (still continuing)");
1051 (*result)->object->file = NULL; 1064 (*result)->object->file = NULL;
1052 } 1065 }
1053 } 1066 }
1054 1067
1055 if (length) 1068 if (length)
1056 *length = len; 1069 *length = len;
1057 1070
1058 psiconv_progress(lev+1,off+len-1,"End of Embedded Object Section " 1071 psiconv_progress(config,lev+1,off+len-1,"End of Embedded Object Section "
1059 "(total length: %08x)",len); 1072 "(total length: %08x)",len);
1060 1073
1061 return res; 1074 return res;
1062 1075
1063 1076
… …
1070ERROR3: 1083ERROR3:
1071 psiconv_free_object_display_section((*result)->display); 1084 psiconv_free_object_display_section((*result)->display);
1072ERROR2: 1085ERROR2:
1073 psiconv_free_section_table_section(table); 1086 psiconv_free_section_table_section(table);
1074ERROR1: 1087ERROR1:
1075 psiconv_warn(lev+1,off,"Reading Embedded Object failed"); 1088 psiconv_error(config,lev+1,off,"Reading Embedded Object failed");
1076 1089
1077 if (length) 1090 if (length)
1078 *length = 0; 1091 *length = 0;
1079 1092
1080 if (res == 0) 1093 if (res == 0)
… …
1082 else 1095 else
1083 return res; 1096 return res;
1084} 1097}
1085 1098
1086psiconv_file_type_t psiconv_determine_embedded_object_type 1099psiconv_file_type_t psiconv_determine_embedded_object_type
1087 (const psiconv_buffer buf,int lev, 1100 (const psiconv_config config,
1101 const psiconv_buffer buf,int lev,
1088 int *status) 1102 int *status)
1089{ 1103{
1090 psiconv_u32 off; 1104 psiconv_u32 off;
1091 psiconv_section_table_section table; 1105 psiconv_section_table_section table;
1092 int res,i; 1106 int res,i;
1093 psiconv_file_type_t file_type = psiconv_unknown_file; 1107 psiconv_file_type_t file_type = psiconv_unknown_file;
1094 psiconv_section_table_entry entry; 1108 psiconv_section_table_entry entry;
1095 psiconv_application_id_section applid; 1109 psiconv_application_id_section applid;
1096 1110
1097 psiconv_progress(lev+1,0,"Going to determine embedded object file type"); 1111 psiconv_progress(config,lev+1,0,"Going to determine embedded object file type");
1098 psiconv_progress(lev+2,0,"Going to read the Section Table Offset Section"); 1112 psiconv_progress(config,lev+2,0,"Going to read the Section Table Offset Section");
1099 off = psiconv_read_u32(buf,lev,0,&res); 1113 off = psiconv_read_u32(config,buf,lev,0,&res);
1100 if (res) 1114 if (res)
1101 goto ERROR1; 1115 goto ERROR1;
1102 psiconv_debug(lev+2,0,"Offset: %08x",off); 1116 psiconv_debug(config,lev+2,0,"Offset: %08x",off);
1103 1117
1104 psiconv_progress(lev+2,off,"Going to read the Section Table Section"); 1118 psiconv_progress(config,lev+2,off,"Going to read the Section Table Section");
1105 if ((res = psiconv_parse_section_table_section(buf,lev+2,off,NULL,&table))) 1119 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,off,NULL,&table)))
1106 goto ERROR1; 1120 goto ERROR1;
1107 1121
1108 psiconv_progress(lev+2,off,"Going to search the Section Table Section " 1122 psiconv_progress(config,lev+2,off,"Going to search the Section Table Section "
1109 "for the Application ID Section"); 1123 "for the Application ID Section");
1110 for (i=0; i < psiconv_list_length(table); i++) { 1124 for (i=0; i < psiconv_list_length(table); i++) {
1111 psiconv_progress(lev+3,off,"Going to read entry %d",i); 1125 psiconv_progress(config,lev+3,off,"Going to read entry %d",i);
1112 if (!(entry = psiconv_list_get(table,i))) 1126 if (!(entry = psiconv_list_get(table,i)))
1113 goto ERROR2; 1127 goto ERROR2;
1114 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 1128 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
1115 psiconv_progress(lev+3,off, 1129 psiconv_progress(config,lev+3,off,
1116 "Found the Application ID Section at offset %08x", 1130 "Found the Application ID Section at offset %08x",
1117 entry->offset); 1131 entry->offset);
1118 off = entry->offset; 1132 off = entry->offset;
1119 break; 1133 break;
1120 } 1134 }
1121 } 1135 }
1122 if (i == psiconv_list_length(table)) { 1136 if (i == psiconv_list_length(table)) {
1123 psiconv_warn(lev+2,off,"No Application ID Section found"); 1137 psiconv_error(config,lev+2,off,"No Application ID Section found");
1124 res = PSICONV_E_PARSE; 1138 res = PSICONV_E_PARSE;
1125 goto ERROR2; 1139 goto ERROR2;
1126 } 1140 }
1127 1141
1128 psiconv_progress(lev+2,off,"Going to read the Application ID Section"); 1142 psiconv_progress(config,lev+2,off,"Going to read the Application ID Section");
1129 if ((res = psiconv_parse_application_id_section(buf,lev+2,off,NULL,&applid))) 1143 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,off,NULL,&applid)))
1130 goto ERROR2; 1144 goto ERROR2;
1131 1145
1132 switch (applid->id) { 1146 switch (applid->id) {
1133 case PSICONV_ID_WORD: file_type = psiconv_word_file; 1147 case PSICONV_ID_WORD: file_type = psiconv_word_file;
1134 psiconv_debug(lev+2,off,"Found a Word file"); 1148 psiconv_debug(config,lev+2,off,"Found a Word file");
1135 break; 1149 break;
1136 case PSICONV_ID_TEXTED: file_type = psiconv_texted_file; 1150 case PSICONV_ID_TEXTED: file_type = psiconv_texted_file;
1137 psiconv_debug(lev+2,off,"Found a TextEd file"); 1151 psiconv_debug(config,lev+2,off,"Found a TextEd file");
1138 break; 1152 break;
1139 case PSICONV_ID_SKETCH: file_type = psiconv_sketch_file; 1153 case PSICONV_ID_SKETCH: file_type = psiconv_sketch_file;
1140 psiconv_debug(lev+2,off,"Found a Sketch file"); 1154 psiconv_debug(config,lev+2,off,"Found a Sketch file");
1141 break; 1155 break;
1142 case PSICONV_ID_SHEET: file_type = psiconv_sheet_file; 1156 case PSICONV_ID_SHEET: file_type = psiconv_sheet_file;
1143 psiconv_debug(lev+2,off,"Found a Sheet file"); 1157 psiconv_debug(config,lev+2,off,"Found a Sheet file");
1144 break; 1158 break;
1145 default: psiconv_warn(lev+2,off,"Found an unknown file type"); 1159 default: psiconv_warn(config,lev+2,off,"Found an unknown file type");
1146 psiconv_debug(lev+2,off,"Found ID %08x",applid->id); 1160 psiconv_debug(config,lev+2,off,"Found ID %08x",applid->id);
1147 } 1161 }
1148 1162
1149ERROR2: 1163ERROR2:
1150 psiconv_free_application_id_section(applid); 1164 psiconv_free_application_id_section(applid);
1151ERROR1: 1165ERROR1:
… …
1154 *status = res; 1168 *status = res;
1155 return file_type; 1169 return file_type;
1156 1170
1157} 1171}
1158 1172
1159int psiconv_parse_object_display_section(const psiconv_buffer buf,int lev, 1173int psiconv_parse_object_display_section(const psiconv_config config,
1174 const psiconv_buffer buf,int lev,
1160 psiconv_u32 off, int *length, 1175 psiconv_u32 off, int *length,
1161 psiconv_object_display_section *result) 1176 psiconv_object_display_section *result)
1162{ 1177{
1163 int res = 0; 1178 int res = 0;
1164 int len = 0; 1179 int len = 0;
1165 int leng; 1180 int leng;
1166 psiconv_u32 temp; 1181 psiconv_u32 temp;
1167 1182
1168 psiconv_progress(lev+1,off,"Going to read the Object Display Section"); 1183 psiconv_progress(config,lev+1,off,"Going to read the Object Display Section");
1169 if (!(*result = malloc(sizeof(**result)))) 1184 if (!(*result = malloc(sizeof(**result))))
1170 goto ERROR1; 1185 goto ERROR1;
1171 1186
1172 psiconv_progress(lev+2,off+len,"Going to read the display as icon flag " 1187 psiconv_progress(config,lev+2,off+len,"Going to read the display as icon flag "
1173 "(expecting 0x00 or 0x01)"); 1188 "(expecting 0x00 or 0x01)");
1174 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 1189 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
1175 if (res) 1190 if (res)
1176 goto ERROR2; 1191 goto ERROR2;
1177 if (temp == 0x00) { 1192 if (temp == 0x00) {
1178 (*result)->show_icon = psiconv_bool_true; 1193 (*result)->show_icon = psiconv_bool_true;
1179 psiconv_debug(lev+2,off+len,"Displayed as icon"); 1194 psiconv_debug(config,lev+2,off+len,"Displayed as icon");
1180 } else if (temp == 0x01) { 1195 } else if (temp == 0x01) {
1181 (*result)->show_icon = psiconv_bool_false; 1196 (*result)->show_icon = psiconv_bool_false;
1182 psiconv_debug(lev+2,off+len,"Displayed as full document"); 1197 psiconv_debug(config,lev+2,off+len,"Displayed as full document");
1183 } else { 1198 } else {
1184 psiconv_warn(lev+2,off+len,"Unknown Object Display Section Icon Flag"); 1199 psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section Icon Flag");
1185 psiconv_debug(lev+2,off+len,"Icon flag found: %02x",temp); 1200 psiconv_debug(config,lev+2,off+len,"Icon flag found: %02x",temp);
1186 /* Improvise */ 1201 /* Improvise */
1187 (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true); 1202 (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true);
1188 } 1203 }
1189 len ++; 1204 len ++;
1190 1205
1191 psiconv_progress(lev+2,off+len,"Going to read the display width"); 1206 psiconv_progress(config,lev+2,off+len,"Going to read the display width");
1192 (*result)->width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 1207 (*result)->width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1193 if (res) 1208 if (res)
1194 goto ERROR2; 1209 goto ERROR2;
1195 psiconv_debug(lev+2,off+len,"Display width: %f cm",(*result)->width); 1210 psiconv_debug(config,lev+2,off+len,"Display width: %f cm",(*result)->width);
1196 len += leng; 1211 len += leng;
1197 1212
1198 psiconv_progress(lev+2,off+len,"Going to read the display height"); 1213 psiconv_progress(config,lev+2,off+len,"Going to read the display height");
1199 (*result)->height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 1214 (*result)->height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1200 if (res) 1215 if (res)
1201 goto ERROR2; 1216 goto ERROR2;
1202 psiconv_debug(lev+2,off+len,"Display length: %f cm",(*result)->height); 1217 psiconv_debug(config,lev+2,off+len,"Display length: %f cm",(*result)->height);
1203 len += leng; 1218 len += leng;
1204 1219
1205 psiconv_progress(lev+2,off+len,"Going to read unknown long (%08x expected)", 1220 psiconv_progress(config,lev+2,off+len,"Going to read unknown long (%08x expected)",
1206 0); 1221 0);
1207 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 1222 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
1208 if (temp != 0) { 1223 if (temp != 0) {
1209 psiconv_warn(lev+2,off+len,"Unknown Object Display Section final long"); 1224 psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section final long");
1210 psiconv_debug(lev+2,off+len,"Long read: %08x",temp); 1225 psiconv_debug(config,lev+2,off+len,"Long read: %08x",temp);
1211 } 1226 }
1212 len += 4; 1227 len += 4;
1213 1228
1214 if (length) 1229 if (length)
1215 *length = len; 1230 *length = len;
1216 1231
1217 psiconv_progress(lev+1,off+len-1,"End of Object Display Section " 1232 psiconv_progress(config,lev+1,off+len-1,"End of Object Display Section "
1218 "(total length: %08x",len); 1233 "(total length: %08x",len);
1219 return res; 1234 return res;
1220 1235
1221ERROR2: 1236ERROR2:
1222 free(*result); 1237 free(*result);
1223ERROR1: 1238ERROR1:
1224 psiconv_warn(lev+1,off+len,"Reading of Object Display Section failed"); 1239 psiconv_error(config,lev+1,off+len,"Reading of Object Display Section failed");
1225 if (length) 1240 if (length)
1226 *length=0; 1241 *length=0;
1227 if (!res) 1242 if (!res)
1228 return -PSICONV_E_NOMEM; 1243 return -PSICONV_E_NOMEM;
1229 else 1244 else
1230 return res; 1245 return res;
1231} 1246}
1232 1247
1233int psiconv_parse_object_icon_section(const psiconv_buffer buf,int lev, 1248int psiconv_parse_object_icon_section(const psiconv_config config,
1249 const psiconv_buffer buf,int lev,
1234 psiconv_u32 off, int *length, 1250 psiconv_u32 off, int *length,
1235 psiconv_object_icon_section *result) 1251 psiconv_object_icon_section *result)
1236{ 1252{
1237 int res = 0; 1253 int res = 0;
1238 int len = 0; 1254 int len = 0;
1239 int leng; 1255 int leng;
1240 1256
1241 psiconv_progress(lev+1,off,"Going to read the Object Icon Section"); 1257 psiconv_progress(config,lev+1,off,"Going to read the Object Icon Section");
1242 if (!(*result = malloc(sizeof(**result)))) 1258 if (!(*result = malloc(sizeof(**result))))
1243 goto ERROR1; 1259 goto ERROR1;
1244 1260
1245 psiconv_progress(lev+2,off+len,"Going to read the icon name"); 1261 psiconv_progress(config,lev+2,off+len,"Going to read the icon name");
1246 (*result)->icon_name = psiconv_read_string(buf,lev+2,off+len,&leng,&res); 1262 (*result)->icon_name = psiconv_read_string(config,buf,lev+2,off+len,&leng,&res);
1247 if (res) 1263 if (res)
1248 goto ERROR2; 1264 goto ERROR2;
1249 psiconv_debug(lev+2,off+len,"Icon name: %s",(*result)->icon_name); 1265 psiconv_debug(config,lev+2,off+len,"Icon name: %s",(*result)->icon_name);
1250 len += leng; 1266 len += leng;
1251 1267
1252 psiconv_progress(lev+2,off+len,"Going to read the icon width"); 1268 psiconv_progress(config,lev+2,off+len,"Going to read the icon width");
1253 (*result)->icon_width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 1269 (*result)->icon_width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1254 if (res) 1270 if (res)
1255 goto ERROR3; 1271 goto ERROR3;
1256 psiconv_debug(lev+2,off+len,"Icon width: %f cm",(*result)->icon_width); 1272 psiconv_debug(config,lev+2,off+len,"Icon width: %f cm",(*result)->icon_width);
1257 len += leng; 1273 len += leng;
1258 1274
1259 psiconv_progress(lev+2,off+len,"Going to read the icon height"); 1275 psiconv_progress(config,lev+2,off+len,"Going to read the icon height");
1260 (*result)->icon_height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 1276 (*result)->icon_height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1261 if (res) 1277 if (res)
1262 goto ERROR3; 1278 goto ERROR3;
1263 psiconv_debug(lev+2,off+len,"Icon length: %f cm",(*result)->icon_height); 1279 psiconv_debug(config,lev+2,off+len,"Icon length: %f cm",(*result)->icon_height);
1264 len += leng; 1280 len += leng;
1265 1281
1266 if (length) 1282 if (length)
1267 *length = len; 1283 *length = len;
1268 1284
1269 psiconv_progress(lev+1,off+len-1,"End of Object Icon Section" 1285 psiconv_progress(config,lev+1,off+len-1,"End of Object Icon Section"
1270 "(total length: %08x",len); 1286 "(total length: %08x",len);
1271 return res; 1287 return res;
1272 1288
1273ERROR3: 1289ERROR3:
1274 free((*result)->icon_name); 1290 free((*result)->icon_name);
1275ERROR2: 1291ERROR2:
1276 free(*result); 1292 free(*result);
1277ERROR1: 1293ERROR1:
1278 psiconv_warn(lev+1,off+len,"Reading of Object Icon Section failed"); 1294 psiconv_error(config,lev+1,off+len,"Reading of Object Icon Section failed");
1279 if (length) 1295 if (length)
1280 *length=0; 1296 *length=0;
1281 if (!res) 1297 if (!res)
1282 return -PSICONV_E_NOMEM; 1298 return -PSICONV_E_NOMEM;
1283 else 1299 else
Legend:
Removed from v.162  
changed lines
  Added in v.196
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26