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