/[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 142 Revision 244
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);
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_error(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_error(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_error(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_error(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_error(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;
267 277
268 psiconv_u32 text_len; 278 psiconv_u32 text_len;
269 psiconv_paragraph para; 279 psiconv_paragraph para;
280 psiconv_ucs2 temp;
281 psiconv_list line;
282 psiconv_ucs2 *nextcharptr;
270 283
271 int nr; 284 int nr;
272 int i,j,start,leng,temp; 285 int i,j,leng;
273 char *str_copy; 286 char *str_copy;
274 287
275 psiconv_progress(lev+1,off,"Going to parse the text section"); 288 psiconv_progress(config,lev+1,off,"Going to parse the text section");
276 psiconv_progress(lev+2,off,"Reading the text length");
277 289
278 if(!(*result = psiconv_list_new(sizeof(*para)))) 290 if(!(*result = psiconv_list_new(sizeof(*para))))
279 goto ERROR1; 291 goto ERROR1;
280 if (!(para = malloc(sizeof(*para)))) 292 if (!(para = malloc(sizeof(*para))))
281 goto ERROR2; 293 goto ERROR2;
282 294
295 psiconv_progress(config,lev+2,off,"Reading the text length");
283 text_len = psiconv_read_X(buf,lev+2,off,&leng,&res); 296 text_len = psiconv_read_X(config,buf,lev+2,off,&leng,&res);
284 if (res) 297 if (res)
285 goto ERROR3; 298 goto ERROR3;
286 psiconv_debug(lev+2,off,"Length: %08x",text_len); 299 psiconv_debug(config,lev+2,off,"Length: %08x",text_len);
287 len += leng; 300 len += leng;
288 301
289 psiconv_progress(lev+2,off+len,"Going to read all paragraph text"); 302 if (!(line = psiconv_list_new(sizeof(psiconv_ucs2))))
303 goto ERROR3;
304
305 i = 0;
290 nr = 0; 306 nr = 0;
291 start = 0; 307 while (i < text_len) {
292 for (i = 0; i < text_len; i++) {
293 temp = psiconv_read_u8(buf,lev+2,off+len+i,&res); 308 temp = psiconv_unicode_read_char(config,buf,lev+2,off+len+i,&leng,&res);
294 if (res) 309 if (res)
295 goto ERROR3; 310 goto ERROR4;
296 if (temp == 0x06) { 311 if (i + leng > text_len) {
297 if (!(para->text = malloc(i - start + 1))) 312 psiconv_error(config,lev+2,off+len+i,"Malformed text section");
313 res = PSICONV_E_PARSE;
314 goto ERROR4;
315 }
316 if ((temp == 0x06) || (i + leng == text_len)) {
317 if (!(para->text = psiconv_unicode_from_list(line)))
318 goto ERROR4;
319
320 if (!(str_copy = psiconv_make_printable(config,para->text)))
298 goto ERROR3; 321 goto ERROR5;
299 for (j = 0; j < i - start; j++) { 322 psiconv_debug(config,lev+2,off+i+len,"Line %d: %d characters",nr,
300 temp = psiconv_read_u8(buf,lev+1,off + len + start + j,&res); 323 strlen(str_copy) +1);
301 if (res) 324 psiconv_debug(config,lev+2,off+i+len,"Line %d: `%s'",nr,str_copy);
302 goto ERROR4; 325 free(str_copy);
303 para->text[j] = temp; 326 i += leng;
304 } 327
305 para->text[j] = 0; 328 if (!(para->in_lines = psiconv_list_new(sizeof(
306 329 struct psiconv_in_line_layout_s))))
330 goto ERROR5;
331 if (!(para->replacements = psiconv_list_new(sizeof(
332 struct psiconv_replacement_s))))
333 goto ERROR6;
334 if (!(para->base_character = psiconv_basic_character_layout()))
335 goto ERROR7;
336 if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
337 goto ERROR8;
338 para->base_style = 0;
339
307 if ((res = psiconv_list_add(*result,para))) 340 if ((res = psiconv_list_add(*result,para)))
308 goto ERROR4; 341 goto ERROR9;
309 342 psiconv_progress(config,lev+2,off+len+i,"Starting a new line");
310 if (!(str_copy = psiconv_make_printable(para->text))) 343 psiconv_list_empty(line);
311 goto ERROR3;
312 psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr,
313 strlen(str_copy) +1);
314 psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy);
315 free(str_copy);
316
317 start = i + 1;
318 nr ++; 344 nr ++;
345 } else {
346 if ((res = psiconv_list_add(line,&temp)))
347 goto ERROR4;
348 i += leng;
319 } 349 }
320 } 350 }
321 351
322 if (start != text_len) { 352 psiconv_list_free(line);
323 psiconv_warn(lev+2,off+start+len,
324 "Last line does not end on EOL (%d characters left)", len - start);
325 if (!(para->text = malloc(text_len - start + 1)))
326 goto ERROR3;
327 for (j = 0; j < text_len - start; j++) {
328 temp = psiconv_read_u8(buf,lev+2,off + start + j + len, &res);
329 if (res)
330 goto ERROR4;
331 para->text[j] = temp;
332 }
333 para->text[text_len - start] = 0;
334 if ((res = psiconv_list_add(*result,para)))
335 goto ERROR4;
336 if (!(str_copy = psiconv_make_printable(para->text)))
337 goto ERROR3;
338 psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr,
339 strlen(str_copy)+1);
340 psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy);
341 free(str_copy);
342 }
343
344 free(para); 353 free(para);
345 354
346 /* Initialize the remaining parts of each paragraph */
347 for (i = 0; i < psiconv_list_length(*result); i ++) {
348 if (!(para = psiconv_list_get(*result,i))) {
349 psiconv_warn(lev+2,off+len,"Massive memory corruption");
350 goto ERROR2_0;
351 }
352 if (!(para->in_lines = psiconv_list_new(sizeof(
353 struct psiconv_in_line_layout_s))))
354 goto ERROR2_0;
355 if (!(para->replacements = psiconv_list_new(sizeof(
356 struct psiconv_replacement_s))))
357 goto ERROR2_1;
358 if (!(para->base_character = psiconv_basic_character_layout()))
359 goto ERROR2_2;
360 if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
361 goto ERROR2_3;
362 para->base_style = 0;
363 }
364
365
366 len += text_len; 355 len += text_len;
367 356
368 if (length) 357 if (length)
369 *length = len; 358 *length = len;
370 359
371 psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x", 360 psiconv_progress(config,lev+1,off+len-1,
372 len); 361 "End of text section (total length: %08x", len);
373 362
374 return res; 363 return res;
375 364
376ERROR2_3: 365ERROR9:
366 psiconv_free_paragraph_layout(para->base_paragraph);
367ERROR8:
377 psiconv_free_character_layout(para->base_character); 368 psiconv_free_character_layout(para->base_character);
378ERROR2_2: 369ERROR7:
379 psiconv_list_free(para->replacements); 370 psiconv_list_free(para->replacements);
380ERROR2_1: 371ERROR6:
381 psiconv_list_free(para->in_lines); 372 psiconv_list_free(para->in_lines);
382ERROR2_0: 373ERROR5:
383 for (j = 0; j < i; j++) { 374 free(para->text);
384 if (!(para = psiconv_list_get(*result,j))) {
385 psiconv_warn(lev+1,off,"Massive memory corruption...");
386 break;
387 }
388 psiconv_list_free(para->in_lines);
389 psiconv_list_free(para->replacements);
390 psiconv_free_character_layout(para->base_character);
391 psiconv_free_paragraph_layout(para->base_paragraph);
392 }
393 goto ERROR2;
394
395ERROR4: 375ERROR4:
396 free(para->text); 376 psiconv_list_free(line);
397ERROR3: 377ERROR3:
398 free(para); 378 free(para);
399ERROR2: 379ERROR2:
400 for (i = 0; i < psiconv_list_length(*result);i++) { 380 psiconv_free_text_and_layout(*result);
401 if (!(para = psiconv_list_get(*result,i))) {
402 psiconv_warn(lev+1,off,"Massive memory corruption...");
403 break;
404 }
405 free(para->text);
406 }
407 psiconv_list_free(*result);
408ERROR1: 381ERROR1:
409 psiconv_warn(lev+1,off,"Reading of Text Section failed"); 382 psiconv_error(config,lev+1,off,"Reading of Text Section failed");
410 if (length) 383 if (length)
411 *length = 0; 384 *length = 0;
412 if (!res) 385 if (!res)
413 return -PSICONV_E_NOMEM; 386 return -PSICONV_E_NOMEM;
414 else 387 else
415 return res; 388 return res;
416} 389}
417 390
418/* First do a parse_text_section, or you will get into trouble here */ 391/* First do a parse_text_section, or you will get into trouble here */
419int psiconv_parse_layout_section(const psiconv_buffer buf, 392int psiconv_parse_layout_section(const psiconv_config config,
393 const psiconv_buffer buf,
420 int lev,psiconv_u32 off, 394 int lev,psiconv_u32 off,
421 int *length, 395 int *length,
422 psiconv_text_and_layout result, 396 psiconv_text_and_layout result,
423 psiconv_word_styles_section styles, 397 psiconv_word_styles_section styles,
424 int with_styles) 398 int with_styles)
… …
449 struct psiconv_in_line_layout_s in_line; 423 struct psiconv_in_line_layout_s in_line;
450 424
451 int *inline_count; 425 int *inline_count;
452 426
453 427
454 psiconv_progress(lev+1,off,"Going to read the layout section"); 428 psiconv_progress(config,lev+1,off,"Going to read the layout section");
455 429
456 psiconv_progress(lev+2,off,"Going to read the section type"); 430 psiconv_progress(config,lev+2,off,"Going to read the section type");
457 temp = psiconv_read_u16(buf,lev+2,off+len,&res); 431 temp = psiconv_read_u16(config,buf,lev+2,off+len,&res);
458 if (res) 432 if (res)
459 goto ERROR1; 433 goto ERROR1;
460 psiconv_debug(lev+2,off+len,"Type: %02x",temp); 434 psiconv_debug(config,lev+2,off+len,"Type: %02x",temp);
461 parse_styles = with_styles; 435 parse_styles = with_styles;
462 if ((temp == 0x0001) && !with_styles) { 436 if ((temp == 0x0001) && !with_styles) {
463 psiconv_warn(lev+2,off+len,"Styleless layout section expected, " 437 psiconv_warn(config,lev+2,off+len,"Styleless layout section expected, "
464 "but styled section found!"); 438 "but styled section found!");
465 parse_styles = 1; 439 parse_styles = 1;
466 } else if ((temp == 0x0000) && (with_styles)) { 440 } else if ((temp == 0x0000) && (with_styles)) {
467 psiconv_warn(lev+2,off+len,"Styled layout section expected, " 441 psiconv_warn(config,lev+2,off+len,"Styled layout section expected, "
468 "but styleless section found!"); 442 "but styleless section found!");
469 parse_styles = 0; 443 parse_styles = 0;
470 } else if ((temp != 0x0000) && (temp != 0x0001)) { 444 } else if ((temp != 0x0000) && (temp != 0x0001)) {
471 psiconv_warn(lev+2,off+len, 445 psiconv_warn(config,lev+2,off+len,
472 "Layout section type indicator has unknown value!"); 446 "Layout section type indicator has unknown value!");
473 } 447 }
474 len += 0x02; 448 len += 0x02;
475 449
476 psiconv_progress(lev+2,off+len,"Going to read paragraph type list"); 450 psiconv_progress(config,lev+2,off+len,"Going to read paragraph type list");
477 if (!(anon_styles = psiconv_list_new(sizeof(anon)))) 451 if (!(anon_styles = psiconv_list_new(sizeof(anon))))
478 goto ERROR1; 452 goto ERROR1;
479 psiconv_progress(lev+3,off+len,"Going to read paragraph type list length"); 453 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); 454 nr = psiconv_read_u8(config,buf,lev+3,off+len,&res);
481 if (res) 455 if (res)
482 goto ERROR2; 456 goto ERROR2;
483 psiconv_debug(lev+3,off+len,"Length: %02x",nr); 457 psiconv_debug(config,lev+3,off+len,"Length: %02x",nr);
484 len ++; 458 len ++;
485 459
486 psiconv_progress(lev+3,off+len, 460 psiconv_progress(config,lev+3,off+len,
487 "Going to read the paragraph type list elements"); 461 "Going to read the paragraph type list elements");
488 for (i = 0; i < nr; i ++) { 462 for (i = 0; i < nr; i ++) {
489 psiconv_progress(lev+3,off+len,"Element %d",i); 463 psiconv_progress(config,lev+3,off+len,"Element %d",i);
490 anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res); 464 anon.nr = psiconv_read_u32(config,buf,lev+4,off+len,&res);
491 if (res) 465 if (res)
492 goto ERROR3; 466 goto ERROR3;
493 psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr); 467 psiconv_debug(config,lev+4,off+len,"Number: %08x",anon.nr);
494 len += 0x04; 468 len += 0x04;
495 469
496 psiconv_progress(lev+4,off,"Going to determine the base style"); 470 psiconv_progress(config,lev+4,off,"Going to determine the base style");
497 if (parse_styles) { 471 if (parse_styles) {
498 temp = psiconv_read_u32(buf,lev+4, off+len,&res); 472 temp = psiconv_read_u32(config,buf,lev+4, off+len,&res);
499 if (res) 473 if (res)
500 goto ERROR3; 474 goto ERROR3;
501 anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res); 475 anon.base_style = psiconv_read_u8(config,buf,lev+3, off+len+4+temp,&res);
502 if (res) 476 if (res)
503 goto ERROR3; 477 goto ERROR3;
504 psiconv_debug(lev+4,off+len+temp, 478 psiconv_debug(config,lev+4,off+len+temp,
505 "Style indicator: %02x",anon.base_style); 479 "Style indicator: %02x",anon.base_style);
506 } else 480 } else
507 anon.base_style = 0; 481 anon.base_style = 0;
508 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { 482 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
509 psiconv_warn(lev+4,off,"Unknown Style referenced"); 483 psiconv_warn(config,lev+4,off,"Unknown Style referenced");
510 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { 484 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
511 psiconv_warn(lev+4,off,"Base style unknown"); 485 psiconv_warn(config,lev+4,off,"Base style unknown");
512 goto ERROR3; 486 goto ERROR3;
513 } 487 }
514 } 488 }
515 if (!(anon.paragraph = psiconv_clone_paragraph_layout 489 if (!(anon.paragraph = psiconv_clone_paragraph_layout
516 (temp_style->paragraph))) 490 (temp_style->paragraph)))
517 goto ERROR3; 491 goto ERROR3;
518 if (!(anon.character = psiconv_clone_character_layout 492 if (!(anon.character = psiconv_clone_character_layout
519 (temp_style->character))) 493 (temp_style->character)))
520 goto ERROR3_1; 494 goto ERROR3_1;
521 495
522 psiconv_progress(lev+4,off+len,"Going to read the paragraph layout"); 496 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, 497 if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng,
524 anon.paragraph))) 498 anon.paragraph)))
525 goto ERROR3_2; 499 goto ERROR3_2;
526 len += leng; 500 len += leng;
527 if (parse_styles) 501 if (parse_styles)
528 len ++; 502 len ++;
529 503
530 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 504 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, 505 if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng,
532 anon.character))) 506 anon.character)))
533 goto ERROR3_2; 507 goto ERROR3_2;
534 len += leng; 508 len += leng;
535 if ((res = psiconv_list_add(anon_styles,&anon))) 509 if ((res = psiconv_list_add(anon_styles,&anon)))
536 goto ERROR3_2; 510 goto ERROR3_2;
537 } 511 }
538 512
539 psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list"); 513 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"); 514 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); 515 nr = psiconv_read_u32(config,buf,lev+3,off+len,&res);
542 if (res) 516 if (res)
543 goto ERROR3; 517 goto ERROR3;
544 if (nr != psiconv_list_length(result)) { 518 if (nr != psiconv_list_length(result)) {
545 psiconv_warn(lev+3,off+len, 519 psiconv_warn(config,lev+3,off+len,
546 "Number of text paragraphs and paragraph elements does not match"); 520 "Number of text paragraphs and paragraph elements does not match");
547 psiconv_debug(lev+3,off+len, 521 psiconv_debug(config,lev+3,off+len,
548 "%d text paragraphs, %d paragraph elements", 522 "%d text paragraphs, %d paragraph elements",
549 psiconv_list_length(result),nr); 523 psiconv_list_length(result),nr);
550 } 524 }
551 psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr); 525 psiconv_debug(config,lev+3,off+len,"Number of paragraphs: %d",nr);
552 len += 4; 526 len += 4;
553 if (!(inline_count = malloc(nr * sizeof(*inline_count)))) 527 if (!(inline_count = malloc(nr * sizeof(*inline_count))))
554 goto ERROR3; 528 goto ERROR3;
555 529
556 psiconv_progress(lev+3,off+len,"Going to read the paragraph elements"); 530 psiconv_progress(config,lev+3,off+len,"Going to read the paragraph elements");
557 for (i = 0; i < nr; i ++) { 531 for (i = 0; i < nr; i ++) {
558 psiconv_progress(lev+3,off+len,"Element %d",i); 532 psiconv_progress(config,lev+3,off+len,"Element %d",i);
559 if (i >= psiconv_list_length(result)) { 533 if (i >= psiconv_list_length(result)) {
560 psiconv_debug(lev+4,off+len,"Going to allocate a new element"); 534 psiconv_debug(config,lev+4,off+len,"Going to allocate a new element");
561 if (!(para = malloc(sizeof(*para)))) 535 if (!(para = malloc(sizeof(*para))))
562 goto ERROR4; 536 goto ERROR4;
563 if (!(para->in_lines = psiconv_list_new(sizeof( 537 if (!(para->in_lines = psiconv_list_new(sizeof(
564 struct psiconv_in_line_layout_s)))) 538 struct psiconv_in_line_layout_s))))
565 goto ERROR4_1; 539 goto ERROR4_1;
… …
573 free(para); 547 free(para);
574 } 548 }
575 if (!(para = psiconv_list_get(result,i))) 549 if (!(para = psiconv_list_get(result,i)))
576 goto ERROR4; 550 goto ERROR4;
577 551
578 psiconv_progress(lev+4,off+len,"Going to read the paragraph length"); 552 psiconv_progress(config,lev+4,off+len,"Going to read the paragraph length");
579 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 553 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
580 if (res) 554 if (res)
581 goto ERROR4; 555 goto ERROR4;
582 if (temp != strlen(para->text)+1) { 556 if (temp != psiconv_unicode_strlen(para->text)+1) {
583 psiconv_warn(lev+4,off+len, 557 psiconv_warn(config,lev+4,off+len,
584 "Disagreement of the length of paragraph in layout section"); 558 "Disagreement of the length of paragraph in layout section");
585 psiconv_debug(lev+4,off+len, 559 psiconv_debug(config,lev+4,off+len,
586 "Paragraph length: layout section says %d, counted %d", 560 "Paragraph length: layout section says %d, counted %d",
587 temp,strlen(para->text)+1); 561 temp,psiconv_unicode_strlen(para->text)+1);
588 } else 562 } else
589 psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp); 563 psiconv_debug(config,lev+4,off+len,"Paragraph length: %d",temp);
590 len += 4; 564 len += 4;
591 565
592 psiconv_progress(lev+4,off+len,"Going to read the paragraph type"); 566 psiconv_progress(config,lev+4,off+len,"Going to read the paragraph type");
593 temp = psiconv_read_u8(buf,lev+4,off+len,&res); 567 temp = psiconv_read_u8(config,buf,lev+4,off+len,&res);
594 if (res) 568 if (res)
595 goto ERROR4; 569 goto ERROR4;
596 if (temp != 0x00) { 570 if (temp != 0x00) {
597 psiconv_debug(lev+4,off+len,"Type: %02x",temp); 571 psiconv_debug(config,lev+4,off+len,"Type: %02x",temp);
598 for (j = 0; j < psiconv_list_length(anon_styles); j++) { 572 for (j = 0; j < psiconv_list_length(anon_styles); j++) {
599 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) { 573 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) {
600 psiconv_warn(lev+4,off+len,"Massive memory curruption"); 574 psiconv_error(config,lev+4,off+len,"Data structure corruption");
601 goto ERROR4; 575 goto ERROR4;
602 } 576 }
603 if (temp == anon_ptr->nr) 577 if (temp == anon_ptr->nr)
604 break; 578 break;
605 } 579 }
606 if (j == psiconv_list_length(anon_styles)) { 580 if (j == psiconv_list_length(anon_styles)) {
607 psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown"); 581 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"); 582 psiconv_debug(config,lev+4,off+len,"Unknown type - using base styles instead");
609 para->base_style = 0; 583 para->base_style = 0;
610 if (!(temp_style = psiconv_get_style(styles,0))) { 584 if (!(temp_style = psiconv_get_style(styles,0))) {
611 psiconv_warn(lev+4,off,"Base style unknown"); 585 psiconv_error(config,lev+4,off,"Base style unknown");
612 goto ERROR4; 586 goto ERROR4;
613 } 587 }
614 if (!(temp_para = psiconv_clone_paragraph_layout 588 if (!(temp_para = psiconv_clone_paragraph_layout
615 (temp_style->paragraph))) 589 (temp_style->paragraph)))
616 goto ERROR4; 590 goto ERROR4;
… …
635 para->base_character = temp_char; 609 para->base_character = temp_char;
636 } 610 }
637 inline_count[i] = 0; 611 inline_count[i] = 0;
638 len += 0x01; 612 len += 0x01;
639 } else { 613 } else {
640 psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)" 614 psiconv_debug(config,lev+4,off+len,"Type: %02x (not based on a paragraph type)"
641 ,temp); 615 ,temp);
642 len += 0x01; 616 len += 0x01;
643 if (parse_styles) { 617 if (parse_styles) {
644 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 618 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
645 if (res) 619 if (res)
646 goto ERROR4; 620 goto ERROR4;
647 psiconv_progress(lev+4,off+len+temp+4, 621 psiconv_progress(config,lev+4,off+len+temp+4,
648 "Going to read the paragraph element base style"); 622 "Going to read the paragraph element base style");
649 temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res); 623 temp = psiconv_read_u8(config,buf,lev+4, off+len+temp+4,&res);
650 if (res) 624 if (res)
651 goto ERROR4; 625 goto ERROR4;
652 psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp); 626 psiconv_debug(config,lev+4,off+len+temp+4, "Style: %02x",temp);
653 } else 627 } else
654 temp = 0x00; 628 temp = 0x00;
655 629
656 if (!(temp_style = psiconv_get_style (styles,temp))) { 630 if (!(temp_style = psiconv_get_style (styles,temp))) {
657 psiconv_warn(lev+4,off,"Unknown Style referenced"); 631 psiconv_warn(config,lev+4,off,"Unknown Style referenced");
658 if (!(temp_style = psiconv_get_style(styles,0))) { 632 if (!(temp_style = psiconv_get_style(styles,0))) {
659 psiconv_warn(lev+4,off,"Base style unknown"); 633 psiconv_error(config,lev+4,off,"Base style unknown");
660 goto ERROR4; 634 goto ERROR4;
661 } 635 }
662 } 636 }
663 637
664 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph))) 638 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph)))
… …
670 goto ERROR4; 644 goto ERROR4;
671 psiconv_free_character_layout(para->base_character); 645 psiconv_free_character_layout(para->base_character);
672 para->base_character = temp_char; 646 para->base_character = temp_char;
673 647
674 para->base_style = temp; 648 para->base_style = temp;
675 psiconv_progress(lev+4,off+len,"Going to read paragraph layout"); 649 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, 650 if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng,
677 para->base_paragraph))) 651 para->base_paragraph)))
678 goto ERROR4; 652 goto ERROR4;
679 len += leng; 653 len += leng;
680 if (parse_styles) 654 if (parse_styles)
681 len += 1; 655 len += 1;
682 psiconv_progress(lev+4,off+len,"Going to read number of in-line " 656 psiconv_progress(config,lev+4,off+len,"Going to read number of in-line "
683 "layout elements"); 657 "layout elements");
684 inline_count[i] = psiconv_read_u32(buf,lev+4,off+len,&res); 658 inline_count[i] = psiconv_read_u32(config,buf,lev+4,off+len,&res);
685 if (res) 659 if (res)
686 goto ERROR4; 660 goto ERROR4;
687 psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]); 661 psiconv_debug(config,lev+4,off+len,"Nr: %08x",inline_count[i]);
688 len += 4; 662 len += 4;
689 } 663 }
690 } 664 }
691 665
692 psiconv_progress(lev+2,off+len,"Going to read the text layout inline list"); 666 psiconv_progress(config,lev+2,off+len,"Going to read the text layout inline list");
693 667
694 psiconv_progress(lev+3,off+len,"Going to read the number of elements"); 668 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); 669 nr = psiconv_read_u32(config,buf,lev+3,off+len,&res);
696 if (res) 670 if (res)
697 goto ERROR4; 671 goto ERROR4;
698 psiconv_debug(lev+3,off+len,"Elements: %08x",nr); 672 psiconv_debug(config,lev+3,off+len,"Elements: %08x",nr);
699 len += 0x04; 673 len += 0x04;
700 674
701 psiconv_progress(lev+3,off+len, 675 psiconv_progress(config,lev+3,off+len,
702 "Going to read the text layout inline elements"); 676 "Going to read the text layout inline elements");
703 total = 0; 677 total = 0;
704 for (i = 0; i < psiconv_list_length(result); i++) { 678 for (i = 0; i < psiconv_list_length(result); i++) {
705 if (!(para = psiconv_list_get(result,i))) { 679 if (!(para = psiconv_list_get(result,i))) {
706 psiconv_warn(lev+3,off+len,"Massive memory corruption"); 680 psiconv_error(config,lev+3,off+len,"Data structure corruption");
707 goto ERROR4; 681 goto ERROR4;
708 } 682 }
709 line_length = -1; 683 line_length = -1;
710 for (j = 0; j < inline_count[i]; j++) { 684 for (j = 0; j < inline_count[i]; j++) {
711 psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d", 685 psiconv_progress(config,lev+3,off+len,"Element %d: Paragraph %d, element %d",
712 total,i,j); 686 total,i,j);
713 if (total >= nr) { 687 if (total >= nr) {
714 psiconv_warn(lev+3,off+len, 688 psiconv_warn(config,lev+3,off+len,
715 "Layout section inlines: not enough element"); 689 "Layout section inlines: not enough element");
716 psiconv_debug(lev+3,off+len,"Can't read element!"); 690 psiconv_debug(config,lev+3,off+len,"Can't read element!");
717 } else { 691 } else {
718 total ++; 692 total ++;
693 in_line.object = NULL;
694 in_line.layout = NULL;
719 if (!(in_line.layout = psiconv_clone_character_layout 695 if (!(in_line.layout = psiconv_clone_character_layout
720 (para->base_character))) 696 (para->base_character)))
721 goto ERROR4; 697 goto ERROR4;
722 psiconv_progress(lev+4,off+len,"Going to read the element type"); 698 psiconv_progress(config,lev+4,off+len,"Going to read the element type");
723 temp = psiconv_read_u8(buf,lev+4,len+off,&res); 699 temp = psiconv_read_u8(config,buf,lev+4,len+off,&res);
724 if (res) 700 if (res)
725 goto ERROR4; 701 goto ERROR5;
726 len += 1; 702 len += 1;
727 psiconv_debug(lev+4,off+len,"Type: %02x",temp); 703 psiconv_debug(config,lev+4,off+len,"Type: %02x",temp);
728 psiconv_progress(lev+4,off+len, 704 psiconv_progress(config,lev+4,off+len,
729 "Going to read the number of characters it applies to"); 705 "Going to read the number of characters it applies to");
730 in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res); 706 in_line.length = psiconv_read_u32(config,buf,lev+4,len+off,&res);
731 if (res) 707 if (res)
732 goto ERROR4; 708 goto ERROR5;
733 psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); 709 psiconv_debug(config,lev+4,off+len,"Length: %02x",in_line.length);
734 len += 4; 710 len += 4;
735 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 711 psiconv_progress(config,lev+4,off+len,"Going to read the character layout");
736 if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, 712 if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng,
737 in_line.layout))) 713 in_line.layout)))
738 goto ERROR4; 714 goto ERROR5;
739 len += leng; 715 len += leng;
740 716
741 if (temp == 0x01) { 717 if (temp == 0x01) {
742 psiconv_debug(lev+4,off+len,"Skipping object data"); 718 psiconv_debug(config,lev+4,off+len,"Found an embedded object");
743 len += 0x10; 719 psiconv_progress(config,lev+4,off+len,"Going to read the object marker "
720 "(0x%08x expected)",PSICONV_ID_OBJECT);
721 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
722 if (res)
723 goto ERROR5;
724 if (temp != PSICONV_ID_OBJECT) {
725 psiconv_warn(config,lev+4,off+len,"Unknown id marks embedded object");
726 psiconv_debug(config,lev+4,off+len,"Marker: read %08x, expected %08x",
727 temp,PSICONV_ID_OBJECT);
728 }
729 len += 4;
730 psiconv_progress(config,lev+4,off+len,
731 "Going to read the Embedded Object Section offset");
732 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
733 if (res)
734 goto ERROR5;
735 psiconv_debug(config,lev+4,off+len, "Offset: %08x",temp);
736 len += 4;
737 psiconv_progress(config,lev+4,off+len,
738 "Going to parse the Embedded Object Section");
739 if ((res = psiconv_parse_embedded_object_section(config,buf,lev+4,temp,
740 NULL,&(in_line.object))))
741 goto ERROR5;
742 psiconv_progress(config,lev+4,off+len,
743 "Going to read the object width");
744 in_line.object_width = psiconv_read_length(config,buf,lev+4,off+len,
745 &leng,&res);
746 if (res)
747 goto ERROR5;
748 psiconv_debug(config,lev+4,off+len,"Object width: %f cm",
749 in_line.object_width);
750 len += leng;
751 psiconv_progress(config,lev+4,off+len,
752 "Going to read the object height");
753 in_line.object_height = psiconv_read_length(config,buf,lev+4,off+len,&leng,
754 &res);
755 if (res)
756 goto ERROR5;
757 psiconv_debug(config,lev+4,off+len,"Object height: %f cm",
758 in_line.object_height);
759 len += leng;
744 } else if (temp != 0x00) { 760 } else if (temp != 0x00) {
745 psiconv_warn(lev+4,off+len,"Layout section unknown inline type"); 761 psiconv_warn(config,lev+4,off+len,"Layout section unknown inline type");
746 } 762 }
747 if (line_length + in_line.length > strlen(para->text)) { 763 if (line_length + in_line.length > psiconv_unicode_strlen(para->text)) {
748 psiconv_warn(lev+4,off+len, 764 psiconv_warn(config,lev+4,off+len,
749 "Layout section inlines: line length mismatch"); 765 "Layout section inlines: line length mismatch");
750 res = -1; 766 res = -1;
751 in_line.length = strlen(para->text) - line_length; 767 in_line.length = psiconv_unicode_strlen(para->text) - line_length;
752 } 768 }
753 line_length += in_line.length; 769 line_length += in_line.length;
754 if ((res = psiconv_list_add(para->in_lines,&in_line))) 770 if ((res = psiconv_list_add(para->in_lines,&in_line)))
755 goto ERROR4; 771 goto ERROR5;
756 } 772 }
757 } 773 }
758 } 774 }
759 775
760 if (total != nr) { 776 if (total != nr) {
761 psiconv_warn(lev+4,off+len, 777 psiconv_warn(config,lev+4,off+len,
762 "Layout section too many inlines, skipping remaining"); 778 "Layout section too many inlines, skipping remaining");
763 } 779 }
764 780
765 free(inline_count); 781 free(inline_count);
766 782
767 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { 783 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {
768 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { 784 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
769 psiconv_warn(lev+4,off+len,"Massive memory corruption"); 785 psiconv_error(config,lev+4,off+len,"Data structure corruption");
770 goto ERROR2; 786 goto ERROR2;
771 } 787 }
772 psiconv_free_character_layout(anon_ptr->character); 788 psiconv_free_character_layout(anon_ptr->character);
773 psiconv_free_paragraph_layout(anon_ptr->paragraph); 789 psiconv_free_paragraph_layout(anon_ptr->paragraph);
774 } 790 }
775 psiconv_list_free(anon_styles); 791 psiconv_list_free(anon_styles);
776 792
777 if (length) 793 if (length)
778 *length = len; 794 *length = len;
779 795
780 psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x)", 796 psiconv_progress(config,lev+1,off+len-1,"End of layout section (total length: %08x)",
781 len); 797 len);
782 798
783 return 0; 799 return 0;
784 800
785ERROR4_4: 801ERROR4_4:
… …
796 psiconv_free_character_layout(anon.character); 812 psiconv_free_character_layout(anon.character);
797ERROR3_1: 813ERROR3_1:
798 psiconv_free_paragraph_layout(anon.paragraph); 814 psiconv_free_paragraph_layout(anon.paragraph);
799 goto ERROR3; 815 goto ERROR3;
800 816
817ERROR5:
818 if (in_line.layout)
819 psiconv_free_character_layout(in_line.layout);
820 if (in_line.object)
821 psiconv_free_embedded_object_section(in_line.object);
801ERROR4: 822ERROR4:
802 free(inline_count); 823 free(inline_count);
803ERROR3: 824ERROR3:
804 for (i = 0; i < psiconv_list_length(anon_styles); i++) { 825 for (i = 0; i < psiconv_list_length(anon_styles); i++) {
805 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { 826 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
806 psiconv_warn(lev+1,off,"Massive memory corruption"); 827 psiconv_error(config,lev+1,off,"Data structure corruption");
807 break; 828 break;
808 } 829 }
809 psiconv_free_paragraph_layout(anon_ptr->paragraph); 830 psiconv_free_paragraph_layout(anon_ptr->paragraph);
810 psiconv_free_character_layout(anon_ptr->character); 831 psiconv_free_character_layout(anon_ptr->character);
811 } 832 }
812 833
813ERROR2: 834ERROR2:
814 psiconv_list_free(anon_styles); 835 psiconv_list_free(anon_styles);
815ERROR1: 836ERROR1:
816 psiconv_warn(lev+1,off,"Reading of Layout Section failed"); 837 psiconv_error(config,lev+1,off,"Reading of Layout Section failed");
817 if (length) 838 if (length)
818 *length = 0; 839 *length = 0;
819 if (!res) 840 if (!res)
820 return -PSICONV_E_NOMEM; 841 return -PSICONV_E_NOMEM;
821 else 842 else
822 return res; 843 return res;
823} 844}
824 845
825int psiconv_parse_styled_layout_section(const psiconv_buffer buf, 846int psiconv_parse_styled_layout_section(const psiconv_config config,
847 const psiconv_buffer buf,
826 int lev,psiconv_u32 off, 848 int lev,psiconv_u32 off,
827 int *length, 849 int *length,
828 psiconv_text_and_layout result, 850 psiconv_text_and_layout result,
829 psiconv_word_styles_section styles) 851 psiconv_word_styles_section styles)
830{ 852{
831 return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); 853 return psiconv_parse_layout_section(config,buf,lev,off,length,result,styles,1);
832} 854}
833 855
834int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, 856int psiconv_parse_styleless_layout_section(const psiconv_config config,
857 const psiconv_buffer buf,
835 int lev,psiconv_u32 off, 858 int lev,psiconv_u32 off,
836 int *length, 859 int *length,
837 psiconv_text_and_layout result, 860 psiconv_text_and_layout result,
838 const psiconv_character_layout base_char, 861 const psiconv_character_layout base_char,
839 const psiconv_paragraph_layout base_para) 862 const psiconv_paragraph_layout base_para)
… …
850 goto ERROR3; 873 goto ERROR3;
851 if (!(styles_section->normal->paragraph = 874 if (!(styles_section->normal->paragraph =
852 psiconv_clone_paragraph_layout(base_para))) 875 psiconv_clone_paragraph_layout(base_para)))
853 goto ERROR4; 876 goto ERROR4;
854 styles_section->normal->hotkey = 0; 877 styles_section->normal->hotkey = 0;
878
855 if (!(styles_section->normal->name = strdup(""))) 879 if (!(styles_section->normal->name = psiconv_unicode_empty_string()))
856 goto ERROR5; 880 goto ERROR5;
857 if (!(styles_section->styles = psiconv_list_new(sizeof( 881 if (!(styles_section->styles = psiconv_list_new(sizeof(
858 struct psiconv_word_style_s)))) 882 struct psiconv_word_style_s))))
859 goto ERROR6; 883 goto ERROR6;
860 884
861 res = psiconv_parse_layout_section(buf,lev,off,length,result, 885 res = psiconv_parse_layout_section(config,buf,lev,off,length,result,
862 styles_section,0); 886 styles_section,0);
863 887
864 psiconv_free_word_styles_section(styles_section); 888 psiconv_free_word_styles_section(styles_section);
865 return res; 889 return res;
866 890
… …
873ERROR3: 897ERROR3:
874 free(styles_section->normal); 898 free(styles_section->normal);
875ERROR2: 899ERROR2:
876 free(styles_section); 900 free(styles_section);
877ERROR1: 901ERROR1:
878 psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed"); 902 psiconv_error(config,lev+1,off,"Reading of Styleless Layout Section failed");
879 if (length) 903 if (length)
880 *length = 0; 904 *length = 0;
881 if (!res) 905 if (!res)
882 return -PSICONV_E_NOMEM; 906 return -PSICONV_E_NOMEM;
883 else 907 else
884 return res; 908 return res;
885} 909}
886 910
911int psiconv_parse_embedded_object_section(const psiconv_config config,
912 const psiconv_buffer buf, int lev,
913 psiconv_u32 off, int *length,
914 psiconv_embedded_object_section *result)
915{
916 int res=0;
917 int len=0;
918 int leng,i;
919 psiconv_section_table_section table;
920 psiconv_section_table_entry entry;
921 psiconv_u32 icon_sec=0,display_sec=0,table_sec=0;
922 psiconv_buffer subbuf;
923
924 psiconv_progress(config,lev+1,off+len,"Going to read an Embedded Object");
925 if (!(*result = malloc(sizeof(**result))))
926 goto ERROR1;
927
928 psiconv_progress(config,lev+2,off+len,"Going to read the Embedded Object Section");
929 psiconv_parse_section_table_section(config,buf,lev+2,off+len,&leng,&table);
930 len += leng;
931
932 for (i = 0; i < psiconv_list_length(table); i++) {
933 psiconv_progress(config,lev+2,off+len,"Going to read entry %d",i);
934 if (!(entry = psiconv_list_get(table,i)))
935 goto ERROR2;
936 if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) {
937 display_sec = entry->offset;
938 psiconv_debug(config,lev+3,off+len,"Found the Object Display Section at %08x",
939 display_sec);
940 } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) {
941 icon_sec = entry->offset;
942 psiconv_debug(config,lev+3,off+len,"Found the Object Icon Section at %08x",
943 icon_sec);
944 } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) {
945 table_sec = entry->offset;
946 psiconv_debug(config,lev+3,off+len,"Found the Object Section Table Section at %08x",
947 table_sec);
948 } else {
949 psiconv_warn(config,lev+3,off+len,
950 "Found unknown section in the Object Display Section "
951 "(ignoring)");
952 psiconv_debug(config,lev+3,off+len,"Section ID %08x, offset %08x",
953 entry->id, entry->offset);
954 }
955 }
956
957 psiconv_progress(config,lev+2,off+len,"Looking for the Object Display Section");
958 if (!icon_sec) {
959 psiconv_warn(config,lev+2,off+len,"Object Display Section not found");
960 (*result)->display = NULL;
961 } else {
962 psiconv_debug(config,lev+2,off+len,"Object Display Section at offset %08x",
963 display_sec);
964 if ((res = psiconv_parse_object_display_section(config,buf,lev+2,display_sec,NULL,
965 &(*result)->display)))
966 goto ERROR2;
967 }
968
969 psiconv_progress(config,lev+2,off+len,"Looking for the Object Icon Section");
970 if (!icon_sec) {
971 psiconv_warn(config,lev+2,off+len,"Object Icon Section not found");
972 (*result)->icon = NULL;
973 } else {
974 psiconv_debug(config,lev+2,off+len,"Object Icon Section at offset %08x",icon_sec);
975 if ((res = psiconv_parse_object_icon_section(config,buf,lev+2,icon_sec,NULL,
976 &(*result)->icon)))
977 goto ERROR3;
978 }
979
980 psiconv_progress(config,lev+2,off+len,
981 "Looking for the Section Table Offset Section");
982 if (!table_sec) {
983 psiconv_warn(config,lev+2,off+len,
984 "Embedded Section Table Offset Section not found");
985 (*result)->object = NULL;
986 } else {
987 psiconv_progress(config,lev+2,off+len,
988 "Extracting object: add %08x to all following offsets",
989 table_sec);
990 /* We can't determine the length of the object, so we just take it all */
991 if ((res = psiconv_buffer_subbuffer(&subbuf,buf,table_sec,
992 psiconv_buffer_length(buf)-table_sec)))
993 goto ERROR4;
994
995 if (!((*result)->object = malloc(sizeof(*(*result)->object))))
996 goto ERROR5;
997
998 /* We need to find the file type, but we don't have a normal header */
999 /* So we try to find the Application ID Section and hope for the best */
1000 psiconv_progress(config,lev+3,0,"Trying to determine the file type");
1001 (*result)->object->type = psiconv_determine_embedded_object_type
1002 (config,subbuf,lev+3,&res);
1003 switch ((*result)->object->type) {
1004 case psiconv_word_file:
1005 if ((res = psiconv_parse_word_file(config,subbuf,lev+3,0,
1006 ((psiconv_word_f *) &(*result)->object->file))))
1007 goto ERROR6;
1008 break;
1009 case psiconv_texted_file:
1010 if ((res = psiconv_parse_texted_file(config,subbuf,lev+3,0,
1011 ((psiconv_texted_f *) &(*result)->object->file))))
1012 goto ERROR6;
1013 break;
1014 case psiconv_sheet_file:
1015 if ((res = psiconv_parse_sheet_file(config,subbuf,lev+3,0,
1016 ((psiconv_sheet_f *) &(*result)->object->file))))
1017 goto ERROR6;
1018 break;
1019 case psiconv_sketch_file:
1020 if ((res = psiconv_parse_sketch_file(config,subbuf,lev+3,0,
1021 ((psiconv_sketch_f *) &(*result)->object->file))))
1022 goto ERROR6;
1023 break;
1024 default:
1025 psiconv_warn(config,lev+3,0,"Can't parse embedded object (still continuing)");
1026 (*result)->object->file = NULL;
1027 }
1028 }
1029
1030 psiconv_buffer_free(subbuf);
1031 psiconv_free_section_table_section(table);
1032
1033 if (length)
1034 *length = len;
1035
1036 psiconv_progress(config,lev+1,off+len-1,"End of Embedded Object Section "
1037 "(total length: %08x)",len);
1038
1039 return res;
1040
1041
1042ERROR6:
1043 free((*result)->object);
1044ERROR5:
1045 psiconv_buffer_free(subbuf);
1046ERROR4:
1047 psiconv_free_object_icon_section((*result)->icon);
1048ERROR3:
1049 psiconv_free_object_display_section((*result)->display);
1050ERROR2:
1051 psiconv_free_section_table_section(table);
1052ERROR1:
1053 psiconv_error(config,lev+1,off,"Reading Embedded Object failed");
1054
1055 if (length)
1056 *length = 0;
1057
1058 if (res == 0)
1059 return -PSICONV_E_NOMEM;
1060 else
1061 return res;
1062}
1063
1064psiconv_file_type_t psiconv_determine_embedded_object_type
1065 (const psiconv_config config,
1066 const psiconv_buffer buf,int lev,
1067 int *status)
1068{
1069 psiconv_u32 off;
1070 psiconv_section_table_section table;
1071 int res,i;
1072 psiconv_file_type_t file_type = psiconv_unknown_file;
1073 psiconv_section_table_entry entry;
1074 psiconv_application_id_section applid;
1075
1076 psiconv_progress(config,lev+1,0,"Going to determine embedded object file type");
1077 psiconv_progress(config,lev+2,0,"Going to read the Section Table Offset Section");
1078 off = psiconv_read_u32(config,buf,lev,0,&res);
1079 if (res)
1080 goto ERROR1;
1081 psiconv_debug(config,lev+2,0,"Offset: %08x",off);
1082
1083 psiconv_progress(config,lev+2,off,"Going to read the Section Table Section");
1084 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,off,NULL,&table)))
1085 goto ERROR1;
1086
1087 psiconv_progress(config,lev+2,off,"Going to search the Section Table Section "
1088 "for the Application ID Section");
1089 for (i=0; i < psiconv_list_length(table); i++) {
1090 psiconv_progress(config,lev+3,off,"Going to read entry %d",i);
1091 if (!(entry = psiconv_list_get(table,i)))
1092 goto ERROR2;
1093 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
1094 psiconv_progress(config,lev+3,off,
1095 "Found the Application ID Section at offset %08x",
1096 entry->offset);
1097 off = entry->offset;
1098 break;
1099 }
1100 }
1101 if (i == psiconv_list_length(table)) {
1102 psiconv_error(config,lev+2,off,"No Application ID Section found");
1103 res = PSICONV_E_PARSE;
1104 goto ERROR2;
1105 }
1106
1107 psiconv_progress(config,lev+2,off,"Going to read the Application ID Section");
1108 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,off,NULL,&applid)))
1109 goto ERROR2;
1110
1111 switch (applid->id) {
1112 case PSICONV_ID_WORD: file_type = psiconv_word_file;
1113 psiconv_debug(config,lev+2,off,"Found a Word file");
1114 break;
1115 case PSICONV_ID_TEXTED: file_type = psiconv_texted_file;
1116 psiconv_debug(config,lev+2,off,"Found a TextEd file");
1117 break;
1118 case PSICONV_ID_SKETCH: file_type = psiconv_sketch_file;
1119 psiconv_debug(config,lev+2,off,"Found a Sketch file");
1120 break;
1121 case PSICONV_ID_SHEET: file_type = psiconv_sheet_file;
1122 psiconv_debug(config,lev+2,off,"Found a Sheet file");
1123 break;
1124 default: psiconv_warn(config,lev+2,off,"Found an unknown file type");
1125 psiconv_debug(config,lev+2,off,"Found ID %08x",applid->id);
1126 }
1127
1128ERROR2:
1129 psiconv_free_application_id_section(applid);
1130ERROR1:
1131 psiconv_free_section_table_section(table);
1132 if (status)
1133 *status = res;
1134 return file_type;
1135
1136}
1137
1138int psiconv_parse_object_display_section(const psiconv_config config,
1139 const psiconv_buffer buf,int lev,
1140 psiconv_u32 off, int *length,
1141 psiconv_object_display_section *result)
1142{
1143 int res = 0;
1144 int len = 0;
1145 int leng;
1146 psiconv_u32 temp;
1147
1148 psiconv_progress(config,lev+1,off,"Going to read the Object Display Section");
1149 if (!(*result = malloc(sizeof(**result))))
1150 goto ERROR1;
1151
1152 psiconv_progress(config,lev+2,off+len,"Going to read the display as icon flag "
1153 "(expecting 0x00 or 0x01)");
1154 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
1155 if (res)
1156 goto ERROR2;
1157 if (temp == 0x00) {
1158 (*result)->show_icon = psiconv_bool_true;
1159 psiconv_debug(config,lev+2,off+len,"Displayed as icon");
1160 } else if (temp == 0x01) {
1161 (*result)->show_icon = psiconv_bool_false;
1162 psiconv_debug(config,lev+2,off+len,"Displayed as full document");
1163 } else {
1164 psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section Icon Flag");
1165 psiconv_debug(config,lev+2,off+len,"Icon flag found: %02x",temp);
1166 /* Improvise */
1167 (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true);
1168 }
1169 len ++;
1170
1171 psiconv_progress(config,lev+2,off+len,"Going to read the display width");
1172 (*result)->width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1173 if (res)
1174 goto ERROR2;
1175 psiconv_debug(config,lev+2,off+len,"Display width: %f cm",(*result)->width);
1176 len += leng;
1177
1178 psiconv_progress(config,lev+2,off+len,"Going to read the display height");
1179 (*result)->height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1180 if (res)
1181 goto ERROR2;
1182 psiconv_debug(config,lev+2,off+len,"Display length: %f cm",(*result)->height);
1183 len += leng;
1184
1185 psiconv_progress(config,lev+2,off+len,"Going to read unknown long (%08x expected)",
1186 0);
1187 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
1188 if (temp != 0) {
1189 psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section final long");
1190 psiconv_debug(config,lev+2,off+len,"Long read: %08x",temp);
1191 }
1192 len += 4;
1193
1194 if (length)
1195 *length = len;
1196
1197 psiconv_progress(config,lev+1,off+len-1,"End of Object Display Section "
1198 "(total length: %08x",len);
1199 return res;
1200
1201ERROR2:
1202 free(*result);
1203ERROR1:
1204 psiconv_error(config,lev+1,off+len,"Reading of Object Display Section failed");
1205 if (length)
1206 *length=0;
1207 if (!res)
1208 return -PSICONV_E_NOMEM;
1209 else
1210 return res;
1211}
1212
1213int psiconv_parse_object_icon_section(const psiconv_config config,
1214 const psiconv_buffer buf,int lev,
1215 psiconv_u32 off, int *length,
1216 psiconv_object_icon_section *result)
1217{
1218 int res = 0;
1219 int len = 0;
1220 int leng;
1221
1222 psiconv_progress(config,lev+1,off,"Going to read the Object Icon Section");
1223 if (!(*result = malloc(sizeof(**result))))
1224 goto ERROR1;
1225
1226 psiconv_progress(config,lev+2,off+len,"Going to read the icon name");
1227 (*result)->icon_name = psiconv_read_string(config,buf,lev+2,off+len,&leng,&res);
1228 if (res)
1229 goto ERROR2;
1230 len += leng;
1231
1232 psiconv_progress(config,lev+2,off+len,"Going to read the icon width");
1233 (*result)->icon_width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1234 if (res)
1235 goto ERROR3;
1236 psiconv_debug(config,lev+2,off+len,"Icon width: %f cm",(*result)->icon_width);
1237 len += leng;
1238
1239 psiconv_progress(config,lev+2,off+len,"Going to read the icon height");
1240 (*result)->icon_height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
1241 if (res)
1242 goto ERROR3;
1243 psiconv_debug(config,lev+2,off+len,"Icon length: %f cm",(*result)->icon_height);
1244 len += leng;
1245
1246 if (length)
1247 *length = len;
1248
1249 psiconv_progress(config,lev+1,off+len-1,"End of Object Icon Section"
1250 "(total length: %08x",len);
1251 return res;
1252
1253ERROR3:
1254 free((*result)->icon_name);
1255ERROR2:
1256 free(*result);
1257ERROR1:
1258 psiconv_error(config,lev+1,off+len,"Reading of Object Icon Section failed");
1259 if (length)
1260 *length=0;
1261 if (!res)
1262 return -PSICONV_E_NOMEM;
1263 else
1264 return res;
1265}
Legend:
Removed from v.142  
changed lines
  Added in v.244
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26