/[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 65 Revision 168
… …
20#include "config.h" 20#include "config.h"
21#include "compat.h" 21#include "compat.h"
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24 24
25#include "data.h"
26#include "parse_routines.h" 25#include "parse_routines.h"
26#include "error.h"
27 27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
31
32
28static int psiconv_parse_layout_section(const psiconv_buffer buf, 33static int psiconv_parse_layout_section(const psiconv_config config,
34 const psiconv_buffer buf,
29 int lev,psiconv_u32 off, 35 int lev,psiconv_u32 off,
30 int *length, 36 int *length,
31 psiconv_text_and_layout result, 37 psiconv_text_and_layout result,
32 psiconv_word_styles_section styles, 38 psiconv_word_styles_section styles,
33 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);
34 44
35int 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,
36 psiconv_u32 off, int *length, 47 psiconv_u32 off, int *length,
37 psiconv_header_section *result) 48 psiconv_header_section *result)
38{ 49{
39 int res=0; 50 int res=0;
40 int len=0; 51 int len=0;
41 psiconv_u32 temp; 52 psiconv_u32 temp;
42 53
43 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");
44 if (!((*result) = malloc(sizeof(**result)))) 55 if (!((*result) = malloc(sizeof(**result))))
45 goto ERROR1; 56 goto ERROR1;
46 57
47 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");
48 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len,&res); 59 (*result)->uid1 = psiconv_read_u32(config,buf,lev+2,off+len,&res);
49 if (res) 60 if (res)
50 goto ERROR2; 61 goto ERROR2;
51 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1); 62 psiconv_debug(config,lev+2,off+len,"UID1: %08x",(*result)->uid1);
52 if ((*result)->uid1 == PSICONV_ID_CLIPART) { 63 if ((*result)->uid1 == PSICONV_ID_CLIPART) {
53 /* That's all folks... */ 64 /* That's all folks... */
54 (*result)->file = psiconv_clipart_file; 65 (*result)->file = psiconv_clipart_file;
55 (*result)->uid2 = 0; 66 (*result)->uid2 = 0;
56 (*result)->uid3 = 0; 67 (*result)->uid3 = 0;
57 (*result)->checksum = 0; 68 (*result)->checksum = 0;
58 len += 4; 69 len += 4;
59 psiconv_debug(lev+2,off+len,"File is a Clipart file"); 70 psiconv_debug(config,lev+2,off+len,"File is a Clipart file");
60 goto DONE; 71 goto DONE;
61 } 72 }
62 if ((*result)->uid1 != PSICONV_ID_PSION5) { 73 if ((*result)->uid1 != PSICONV_ID_PSION5) {
63 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 "
64 "not a (parsable) Psion 5 file"); 76 "not a (parsable) Psion 5 file");
65 res = -PSICONV_E_PARSE; 77 res = -PSICONV_E_PARSE;
66 goto ERROR2; 78 goto ERROR2;
67 } 79 }
68 len += 4; 80 len += 4;
69 (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len,&res); 81 (*result)->uid2 = psiconv_read_u32(config,buf,lev+2,off+len,&res);
70 if (res) 82 if (res)
71 goto ERROR2; 83 goto ERROR2;
72 psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2); 84 psiconv_debug(config,lev+2,off+len,"UID2: %08x",(*result)->uid2);
73 len += 4; 85 len += 4;
74 (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len,&res); 86 (*result)->uid3 = psiconv_read_u32(config,buf,lev+2,off+len,&res);
75 if (res) 87 if (res)
76 goto ERROR2; 88 goto ERROR2;
77 psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3); 89 psiconv_debug(config,lev+2,off+len,"UID3: %08x",(*result)->uid3);
78 len += 4; 90 len += 4;
79 91
80 (*result)->file = psiconv_unknown_file; 92 (*result)->file = psiconv_unknown_file;
81 if ((*result)->uid1 == PSICONV_ID_PSION5) { 93 if ((*result)->uid1 == PSICONV_ID_PSION5) {
82 if ((*result)->uid2 == PSICONV_ID_DATA_FILE) { 94 if ((*result)->uid2 == PSICONV_ID_DATA_FILE) {
83 if ((*result)->uid3 == PSICONV_ID_WORD) { 95 if ((*result)->uid3 == PSICONV_ID_WORD) {
84 (*result)->file = psiconv_word_file; 96 (*result)->file = psiconv_word_file;
85 psiconv_debug(lev+2,off+len,"File is a Word file"); 97 psiconv_debug(config,lev+2,off+len,"File is a Word file");
86 } else if ((*result)->uid3 == PSICONV_ID_TEXTED) { 98 } else if ((*result)->uid3 == PSICONV_ID_TEXTED) {
87 (*result)->file = psiconv_texted_file; 99 (*result)->file = psiconv_texted_file;
88 psiconv_debug(lev+2,off+len,"File is a TextEd file"); 100 psiconv_debug(config,lev+2,off+len,"File is a TextEd file");
89 } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { 101 } else if ((*result)->uid3 == PSICONV_ID_SKETCH) {
90 (*result)->file = psiconv_sketch_file; 102 (*result)->file = psiconv_sketch_file;
91 psiconv_debug(lev+2,off+len,"File is a Sketch file"); 103 psiconv_debug(config,lev+2,off+len,"File is a Sketch file");
104 } else if ((*result)->uid3 == PSICONV_ID_SHEET) {
105 (*result)->file = psiconv_sheet_file;
106 psiconv_debug(config,lev+2,off+len,"File is a Sheet file");
92 } 107 }
93 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { 108 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {
94 (*result)->file = psiconv_mbm_file; 109 (*result)->file = psiconv_mbm_file;
95 if ((*result)->uid3 != 0x00) 110 if ((*result)->uid3 != 0x00)
96 psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); 111 psiconv_warn(config,lev+2,off+len,"UID3 set in MBM file?!?");
97 psiconv_debug(lev+2,off+len,"File is a MBM file"); 112 psiconv_debug(config,lev+2,off+len,"File is a MBM file");
98 } 113 }
99 } 114 }
100 if ((*result)->file == psiconv_unknown_file) { 115 if ((*result)->file == psiconv_unknown_file) {
101 psiconv_warn(lev+2,off+len,"Unknown file type"); 116 psiconv_warn(config,lev+2,off+len,"Unknown file type");
102 (*result)->file = psiconv_unknown_file; 117 (*result)->file = psiconv_unknown_file;
103 } 118 }
104 119
105 psiconv_progress(lev+2,off+len,"Checking UID4"); 120 psiconv_progress(config,lev+2,off+len,"Checking UID4");
106 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 121 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
107 if (res) 122 if (res)
108 goto ERROR2; 123 goto ERROR2;
109 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, 124 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2,
110 (*result)->uid3)) 125 (*result)->uid3))
111 psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp); 126 psiconv_debug(config,lev+2,off+len,"Checksum %08x is correct",temp);
112 else { 127 else {
113 psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!"); 128 psiconv_warn(config,lev+2,off+len,"Checksum failed, file corrupted!");
114 psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x", 129 psiconv_debug(config,lev+2,off+len,"Expected checksum %08x, found %08x",
115 psiconv_checkuid((*result)->uid1,(*result)->uid2, 130 psiconv_checkuid((*result)->uid1,(*result)->uid2,
116 (*result)->uid3),temp); 131 (*result)->uid3),temp);
117 res = -PSICONV_E_PARSE; 132 res = -PSICONV_E_PARSE;
118 goto ERROR2; 133 goto ERROR2;
119 } 134 }
… …
121 136
122DONE: 137DONE:
123 if (length) 138 if (length)
124 *length = len; 139 *length = len;
125 140
126 psiconv_progress(lev+1,off+len-1, 141 psiconv_progress(config,lev+1,off+len-1,
127 "End of Header Section (total length: %08x)",len); 142 "End of Header Section (total length: %08x)",len);
128 143
129 return res; 144 return res;
130 145
131ERROR2: 146ERROR2:
132 free(*result); 147 free(*result);
133ERROR1: 148ERROR1:
134 psiconv_warn(lev+1,off,"Reading of Header Section failed"); 149 psiconv_warn(config,lev+1,off,"Reading of Header Section failed");
135 if (length) 150 if (length)
136 *length = 0; 151 *length = 0;
137 if (res == 0) 152 if (res == 0)
138 return -PSICONV_E_NOMEM; 153 return -PSICONV_E_NOMEM;
139 else 154 else
140 return res; 155 return res;
141} 156}
142 157
143int 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,
144 psiconv_u32 off, int *length, 160 psiconv_u32 off, int *length,
145 psiconv_section_table_section *result) 161 psiconv_section_table_section *result)
146{ 162{
147 int res=0; 163 int res=0;
148 int len=0; 164 int len=0;
149 psiconv_section_table_entry entry; 165 psiconv_section_table_entry entry;
150 166
151 int i; 167 int i;
152 psiconv_u8 nr; 168 psiconv_u8 nr;
153 169
154 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");
155 if (!(*result = psiconv_list_new(sizeof(*entry)))) 171 if (!(*result = psiconv_list_new(sizeof(*entry))))
156 goto ERROR1; 172 goto ERROR1;
157 173
158 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");
159 nr = psiconv_read_u8(buf,lev+2,off+len,&res); 175 nr = psiconv_read_u8(config,buf,lev+2,off+len,&res);
160 if (res) 176 if (res)
161 goto ERROR2; 177 goto ERROR2;
162 psiconv_debug(lev+2,off+len,"Length: %08x",nr); 178 psiconv_debug(config,lev+2,off+len,"Length: %08x",nr);
163 if (nr & 0x01) { 179 if (nr & 0x01) {
164 psiconv_warn(lev+2,off+len, 180 psiconv_warn(config,lev+2,off+len,
165 "Section table length odd - ignoring last entry"); 181 "Section table length odd - ignoring last entry");
166 } 182 }
167 len ++; 183 len ++;
168 184
169 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");
170 entry = malloc(sizeof(*entry)); 186 entry = malloc(sizeof(*entry));
171 for (i = 0; i < nr / 2; i++) { 187 for (i = 0; i < nr / 2; i++) {
172 entry->id = psiconv_read_u32(buf,lev+2,off + len,&res); 188 entry->id = psiconv_read_u32(config,buf,lev+2,off + len,&res);
173 if (res) 189 if (res)
174 goto ERROR3; 190 goto ERROR3;
175 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);
176 len += 0x04; 192 len += 0x04;
177 entry->offset = psiconv_read_u32(buf,lev+2,off + len,&res); 193 entry->offset = psiconv_read_u32(config,buf,lev+2,off + len,&res);
178 if (res) 194 if (res)
179 goto ERROR3; 195 goto ERROR3;
180 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);
181 len += 0x04; 197 len += 0x04;
182 if ((res=psiconv_list_add(*result,entry))) 198 if ((res=psiconv_list_add(*result,entry)))
183 goto ERROR3; 199 goto ERROR3;
184 } 200 }
185 201
186 free(entry); 202 free(entry);
187 203
188 if (length) 204 if (length)
189 *length = len; 205 *length = len;
190 206
191 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 "
192 "(total length: %08x)", len); 208 "(total length: %08x)", len);
193 209
194 return 0; 210 return 0;
195ERROR3: 211ERROR3:
196 free(entry); 212 free(entry);
197ERROR2: 213ERROR2:
198 psiconv_list_free(*result); 214 psiconv_list_free(*result);
199ERROR1: 215ERROR1:
200 psiconv_warn(lev+1,off,"Reading of Section Table Section failed"); 216 psiconv_warn(config,lev+1,off,"Reading of Section Table Section failed");
201 if (length) 217 if (length)
202 *length = 0; 218 *length = 0;
203 if (res == 0) 219 if (res == 0)
204 return -PSICONV_E_NOMEM; 220 return -PSICONV_E_NOMEM;
205 else 221 else
206 return res; 222 return res;
207} 223}
208 224
209int 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,
210 psiconv_u32 off, int *length, 227 psiconv_u32 off, int *length,
211 psiconv_application_id_section *result) 228 psiconv_application_id_section *result)
212{ 229{
213 int res=0; 230 int res=0;
214 int len=0; 231 int len=0;
215 int leng; 232 int leng;
216 233
217 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");
218 if (!(*result = malloc(sizeof(**result)))) 235 if (!(*result = malloc(sizeof(**result))))
219 goto ERROR1; 236 goto ERROR1;
220 237
221 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");
222 (*result)->id = psiconv_read_u32(buf,lev+2,off+len,&res); 239 (*result)->id = psiconv_read_u32(config,buf,lev+2,off+len,&res);
223 if (res) 240 if (res)
224 goto ERROR2; 241 goto ERROR2;
225 psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id); 242 psiconv_debug(config,lev+2,off+len,"Identifier: %08x",(*result)->id);
226 len += 4; 243 len += 4;
227 244
228 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");
229 (*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);
230 if (res) 247 if (res)
231 goto ERROR2; 248 goto ERROR2;
232 len += leng; 249 len += leng;
233 250
234 if (length) 251 if (length)
235 *length = len; 252 *length = len;
236 253
237 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 "
238 "(total length: %08x", len); 255 "(total length: %08x", len);
239 256
240 return res; 257 return res;
241ERROR2: 258ERROR2:
242 free(*result); 259 free(*result);
243ERROR1: 260ERROR1:
244 psiconv_warn(lev+1,off,"Reading of Application ID Section failed"); 261 psiconv_warn(config,lev+1,off,"Reading of Application ID Section failed");
245 if (length) 262 if (length)
246 *length = 0; 263 *length = 0;
247 if (res == 0) 264 if (res == 0)
248 return -PSICONV_E_NOMEM; 265 return -PSICONV_E_NOMEM;
249 else 266 else
250 return res; 267 return res;
251} 268}
252 269
253int 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,
254 int *length,psiconv_text_and_layout *result) 272 int *length,psiconv_text_and_layout *result)
255{ 273{
256 274
257 int res = 0; 275 int res = 0;
258 int len=0; 276 int len=0;
… …
262 280
263 int nr; 281 int nr;
264 int i,j,start,leng,temp; 282 int i,j,start,leng,temp;
265 char *str_copy; 283 char *str_copy;
266 284
267 psiconv_progress(lev+1,off,"Going to parse the text section"); 285 psiconv_progress(config,lev+1,off,"Going to parse the text section");
268 psiconv_progress(lev+2,off,"Reading the text length"); 286 psiconv_progress(config,lev+2,off,"Reading the text length");
269 287
270 if(!(*result = psiconv_list_new(sizeof(*para)))) 288 if(!(*result = psiconv_list_new(sizeof(*para))))
271 goto ERROR1; 289 goto ERROR1;
272 if (!(para = malloc(sizeof(*para)))) 290 if (!(para = malloc(sizeof(*para))))
273 goto ERROR2; 291 goto ERROR2;
274 292
275 text_len = psiconv_read_X(buf,lev+2,off,&leng,&res); 293 text_len = psiconv_read_X(config,buf,lev+2,off,&leng,&res);
276 if (res) 294 if (res)
277 goto ERROR3; 295 goto ERROR3;
278 psiconv_debug(lev+2,off,"Length: %08x",text_len); 296 psiconv_debug(config,lev+2,off,"Length: %08x",text_len);
279 len += leng; 297 len += leng;
280 298
281 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");
282 nr = 0; 300 nr = 0;
283 start = 0; 301 start = 0;
284 for (i = 0; i < text_len; i++) { 302 for (i = 0; i < text_len; i++) {
285 temp = psiconv_read_u8(buf,lev+2,off+len+i,&res); 303 temp = psiconv_read_u8(config,buf,lev+2,off+len+i,&res);
286 if (res) 304 if (res)
287 goto ERROR3; 305 goto ERROR3;
288 if (temp == 0x06) { 306 if (temp == 0x06) {
289 if (!(para->text = malloc(i - start + 1))) 307 if (!(para->text = malloc(i - start + 1)))
290 goto ERROR3; 308 goto ERROR3;
291 for (j = 0; j < i - start; j++) { 309 for (j = 0; j < i - start; j++) {
292 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);
293 if (res) 311 if (res)
294 goto ERROR4; 312 goto ERROR4;
295 para->text[j] = temp; 313 para->text[j] = temp;
296 } 314 }
297 para->text[j] = 0; 315 para->text[j] = 0;
… …
299 if ((res = psiconv_list_add(*result,para))) 317 if ((res = psiconv_list_add(*result,para)))
300 goto ERROR4; 318 goto ERROR4;
301 319
302 if (!(str_copy = psiconv_make_printable(para->text))) 320 if (!(str_copy = psiconv_make_printable(para->text)))
303 goto ERROR3; 321 goto ERROR3;
304 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,
305 strlen(str_copy) +1); 323 strlen(str_copy) +1);
306 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);
307 free(str_copy); 325 free(str_copy);
308 326
309 start = i + 1; 327 start = i + 1;
310 nr ++; 328 nr ++;
311 } 329 }
312 } 330 }
313 331
314 if (start != text_len) { 332 if (start != text_len) {
315 psiconv_warn(lev+2,off+start+len, 333 psiconv_warn(config,lev+2,off+start+len,
316 "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);
317 if (!(para->text = malloc(text_len - start + 1))) 335 if (!(para->text = malloc(text_len - start + 1)))
318 goto ERROR3; 336 goto ERROR3;
319 for (j = 0; j < text_len - start; j++) { 337 for (j = 0; j < text_len - start; j++) {
320 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);
321 if (res) 339 if (res)
322 goto ERROR4; 340 goto ERROR4;
323 para->text[j] = temp; 341 para->text[j] = temp;
324 } 342 }
325 para->text[text_len - start] = 0; 343 para->text[text_len - start] = 0;
326 if ((res = psiconv_list_add(*result,para))) 344 if ((res = psiconv_list_add(*result,para)))
327 goto ERROR4; 345 goto ERROR4;
328 if (!(str_copy = psiconv_make_printable(para->text))) 346 if (!(str_copy = psiconv_make_printable(para->text)))
329 goto ERROR3; 347 goto ERROR3;
330 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,
331 strlen(str_copy)+1); 349 strlen(str_copy)+1);
332 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);
333 free(str_copy); 351 free(str_copy);
334 } 352 }
335 353
336 free(para); 354 free(para);
337 355
338 /* Initialize the remaining parts of each paragraph */ 356 /* Initialize the remaining parts of each paragraph */
339 for (i = 0; i < psiconv_list_length(*result); i ++) { 357 for (i = 0; i < psiconv_list_length(*result); i ++) {
340 if (!(para = psiconv_list_get(*result,i))) { 358 if (!(para = psiconv_list_get(*result,i))) {
341 psiconv_warn(lev+2,off+len,"Massive memory corruption"); 359 psiconv_warn(config,lev+2,off+len,"Massive memory corruption");
342 goto ERROR2_0; 360 goto ERROR2_0;
343 } 361 }
344 if (!(para->in_lines = psiconv_list_new(sizeof( 362 if (!(para->in_lines = psiconv_list_new(sizeof(
345 struct psiconv_in_line_layout_s)))) 363 struct psiconv_in_line_layout_s))))
346 goto ERROR2_0; 364 goto ERROR2_0;
… …
358 len += text_len; 376 len += text_len;
359 377
360 if (length) 378 if (length)
361 *length = len; 379 *length = len;
362 380
363 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",
364 len); 382 len);
365 383
366 return res; 384 return res;
367 385
368ERROR2_3: 386ERROR2_3:
… …
372ERROR2_1: 390ERROR2_1:
373 psiconv_list_free(para->in_lines); 391 psiconv_list_free(para->in_lines);
374ERROR2_0: 392ERROR2_0:
375 for (j = 0; j < i; j++) { 393 for (j = 0; j < i; j++) {
376 if (!(para = psiconv_list_get(*result,j))) { 394 if (!(para = psiconv_list_get(*result,j))) {
377 psiconv_warn(lev+1,off,"Massive memory corruption..."); 395 psiconv_warn(config,lev+1,off,"Massive memory corruption...");
378 break; 396 break;
379 } 397 }
380 psiconv_list_free(para->in_lines); 398 psiconv_list_free(para->in_lines);
381 psiconv_list_free(para->replacements); 399 psiconv_list_free(para->replacements);
382 psiconv_free_character_layout(para->base_character); 400 psiconv_free_character_layout(para->base_character);
… …
389ERROR3: 407ERROR3:
390 free(para); 408 free(para);
391ERROR2: 409ERROR2:
392 for (i = 0; i < psiconv_list_length(*result);i++) { 410 for (i = 0; i < psiconv_list_length(*result);i++) {
393 if (!(para = psiconv_list_get(*result,i))) { 411 if (!(para = psiconv_list_get(*result,i))) {
394 psiconv_warn(lev+1,off,"Massive memory corruption..."); 412 psiconv_warn(config,lev+1,off,"Massive memory corruption...");
395 break; 413 break;
396 } 414 }
397 free(para->text); 415 free(para->text);
398 } 416 }
399 psiconv_list_free(*result); 417 psiconv_list_free(*result);
400ERROR1: 418ERROR1:
401 psiconv_warn(lev+1,off,"Reading of Text Section failed"); 419 psiconv_warn(config,lev+1,off,"Reading of Text Section failed");
402 if (length) 420 if (length)
403 *length = 0; 421 *length = 0;
404 if (!res) 422 if (!res)
405 return -PSICONV_E_NOMEM; 423 return -PSICONV_E_NOMEM;
406 else 424 else
407 return res; 425 return res;
408} 426}
409 427
410/* 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 */
411int psiconv_parse_layout_section(const psiconv_buffer buf, 429int psiconv_parse_layout_section(const psiconv_config config,
430 const psiconv_buffer buf,
412 int lev,psiconv_u32 off, 431 int lev,psiconv_u32 off,
413 int *length, 432 int *length,
414 psiconv_text_and_layout result, 433 psiconv_text_and_layout result,
415 psiconv_word_styles_section styles, 434 psiconv_word_styles_section styles,
416 int with_styles) 435 int with_styles)
… …
441 struct psiconv_in_line_layout_s in_line; 460 struct psiconv_in_line_layout_s in_line;
442 461
443 int *inline_count; 462 int *inline_count;
444 463
445 464
446 psiconv_progress(lev+1,off,"Going to read the layout section"); 465 psiconv_progress(config,lev+1,off,"Going to read the layout section");
447 466
448 psiconv_progress(lev+2,off,"Going to read the section type"); 467 psiconv_progress(config,lev+2,off,"Going to read the section type");
449 temp = psiconv_read_u16(buf,lev+2,off+len,&res); 468 temp = psiconv_read_u16(config,buf,lev+2,off+len,&res);
450 if (res) 469 if (res)
451 goto ERROR1; 470 goto ERROR1;
452 psiconv_debug(lev+2,off+len,"Type: %02x",temp); 471 psiconv_debug(config,lev+2,off+len,"Type: %02x",temp);
453 parse_styles = with_styles; 472 parse_styles = with_styles;
454 if ((temp == 0x0001) && !with_styles) { 473 if ((temp == 0x0001) && !with_styles) {
455 psiconv_warn(lev+2,off+len,"Styleless layout section expected, " 474 psiconv_warn(config,lev+2,off+len,"Styleless layout section expected, "
456 "but styled section found!"); 475 "but styled section found!");
457 parse_styles = 1; 476 parse_styles = 1;
458 } else if ((temp == 0x0000) && (with_styles)) { 477 } else if ((temp == 0x0000) && (with_styles)) {
459 psiconv_warn(lev+2,off+len,"Styled layout section expected, " 478 psiconv_warn(config,lev+2,off+len,"Styled layout section expected, "
460 "but styleless section found!"); 479 "but styleless section found!");
461 parse_styles = 0; 480 parse_styles = 0;
462 } else if ((temp != 0x0000) && (temp != 0x0001)) { 481 } else if ((temp != 0x0000) && (temp != 0x0001)) {
463 psiconv_warn(lev+2,off+len, 482 psiconv_warn(config,lev+2,off+len,
464 "Layout section type indicator has unknown value!"); 483 "Layout section type indicator has unknown value!");
465 } 484 }
466 len += 0x02; 485 len += 0x02;
467 486
468 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");
469 if (!(anon_styles = psiconv_list_new(sizeof(anon)))) 488 if (!(anon_styles = psiconv_list_new(sizeof(anon))))
470 goto ERROR1; 489 goto ERROR1;
471 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");
472 nr = psiconv_read_u8(buf,lev+3,off+len,&res); 491 nr = psiconv_read_u8(config,buf,lev+3,off+len,&res);
473 if (res) 492 if (res)
474 goto ERROR2; 493 goto ERROR2;
475 psiconv_debug(lev+3,off+len,"Length: %02x",nr); 494 psiconv_debug(config,lev+3,off+len,"Length: %02x",nr);
476 len ++; 495 len ++;
477 496
478 psiconv_progress(lev+3,off+len, 497 psiconv_progress(config,lev+3,off+len,
479 "Going to read the paragraph type list elements"); 498 "Going to read the paragraph type list elements");
480 for (i = 0; i < nr; i ++) { 499 for (i = 0; i < nr; i ++) {
481 psiconv_progress(lev+3,off+len,"Element %d",i); 500 psiconv_progress(config,lev+3,off+len,"Element %d",i);
482 anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res); 501 anon.nr = psiconv_read_u32(config,buf,lev+4,off+len,&res);
483 if (res) 502 if (res)
484 goto ERROR3; 503 goto ERROR3;
485 psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr); 504 psiconv_debug(config,lev+4,off+len,"Number: %08x",anon.nr);
486 len += 0x04; 505 len += 0x04;
487 506
488 psiconv_progress(lev+4,off,"Going to determine the base style"); 507 psiconv_progress(config,lev+4,off,"Going to determine the base style");
489 if (parse_styles) { 508 if (parse_styles) {
490 temp = psiconv_read_u32(buf,lev+4, off+len,&res); 509 temp = psiconv_read_u32(config,buf,lev+4, off+len,&res);
491 if (res) 510 if (res)
492 goto ERROR3; 511 goto ERROR3;
493 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);
494 if (res) 513 if (res)
495 goto ERROR3; 514 goto ERROR3;
496 psiconv_debug(lev+4,off+len+temp, 515 psiconv_debug(config,lev+4,off+len+temp,
497 "Style indicator: %02x",anon.base_style); 516 "Style indicator: %02x",anon.base_style);
498 } else 517 } else
499 anon.base_style = 0; 518 anon.base_style = 0;
500 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { 519 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
501 psiconv_warn(lev+4,off,"Unknown Style referenced"); 520 psiconv_warn(config,lev+4,off,"Unknown Style referenced");
502 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { 521 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
503 psiconv_warn(lev+4,off,"Base style unknown"); 522 psiconv_warn(config,lev+4,off,"Base style unknown");
504 goto ERROR3; 523 goto ERROR3;
505 } 524 }
506 } 525 }
507 if (!(anon.paragraph = psiconv_clone_paragraph_layout 526 if (!(anon.paragraph = psiconv_clone_paragraph_layout
508 (temp_style->paragraph))) 527 (temp_style->paragraph)))
509 goto ERROR3; 528 goto ERROR3;
510 if (!(anon.character = psiconv_clone_character_layout 529 if (!(anon.character = psiconv_clone_character_layout
511 (temp_style->character))) 530 (temp_style->character)))
512 goto ERROR3_1; 531 goto ERROR3_1;
513 532
514 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");
515 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,
516 anon.paragraph))) 535 anon.paragraph)))
517 goto ERROR3_2; 536 goto ERROR3_2;
518 len += leng; 537 len += leng;
519 if (parse_styles) 538 if (parse_styles)
520 len ++; 539 len ++;
521 540
522 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");
523 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,
524 anon.character))) 543 anon.character)))
525 goto ERROR3_2; 544 goto ERROR3_2;
526 len += leng; 545 len += leng;
527 if ((res = psiconv_list_add(anon_styles,&anon))) 546 if ((res = psiconv_list_add(anon_styles,&anon)))
528 goto ERROR3_2; 547 goto ERROR3_2;
529 } 548 }
530 549
531 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");
532 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");
533 nr = psiconv_read_u32(buf,lev+3,off+len,&res); 552 nr = psiconv_read_u32(config,buf,lev+3,off+len,&res);
534 if (res) 553 if (res)
535 goto ERROR3; 554 goto ERROR3;
536 if (nr != psiconv_list_length(result)) { 555 if (nr != psiconv_list_length(result)) {
537 psiconv_warn(lev+3,off+len, 556 psiconv_warn(config,lev+3,off+len,
538 "Number of text paragraphs and paragraph elements does not match"); 557 "Number of text paragraphs and paragraph elements does not match");
539 psiconv_debug(lev+3,off+len, 558 psiconv_debug(config,lev+3,off+len,
540 "%d text paragraphs, %d paragraph elements", 559 "%d text paragraphs, %d paragraph elements",
541 psiconv_list_length(result),nr); 560 psiconv_list_length(result),nr);
542 } 561 }
543 psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr); 562 psiconv_debug(config,lev+3,off+len,"Number of paragraphs: %d",nr);
544 len += 4; 563 len += 4;
545 if (!(inline_count = malloc(nr * sizeof(*inline_count)))) 564 if (!(inline_count = malloc(nr * sizeof(*inline_count))))
546 goto ERROR3; 565 goto ERROR3;
547 566
548 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");
549 for (i = 0; i < nr; i ++) { 568 for (i = 0; i < nr; i ++) {
550 psiconv_progress(lev+3,off+len,"Element %d",i); 569 psiconv_progress(config,lev+3,off+len,"Element %d",i);
551 if (i >= psiconv_list_length(result)) { 570 if (i >= psiconv_list_length(result)) {
552 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");
553 if (!(para = malloc(sizeof(*para)))) 572 if (!(para = malloc(sizeof(*para))))
554 goto ERROR4; 573 goto ERROR4;
555 if (!(para->in_lines = psiconv_list_new(sizeof( 574 if (!(para->in_lines = psiconv_list_new(sizeof(
556 struct psiconv_in_line_layout_s)))) 575 struct psiconv_in_line_layout_s))))
557 goto ERROR4_1; 576 goto ERROR4_1;
… …
565 free(para); 584 free(para);
566 } 585 }
567 if (!(para = psiconv_list_get(result,i))) 586 if (!(para = psiconv_list_get(result,i)))
568 goto ERROR4; 587 goto ERROR4;
569 588
570 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");
571 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 590 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
572 if (res) 591 if (res)
573 goto ERROR4; 592 goto ERROR4;
574 if (temp != strlen(para->text)+1) { 593 if (temp != strlen(para->text)+1) {
575 psiconv_warn(lev+4,off+len, 594 psiconv_warn(config,lev+4,off+len,
576 "Disagreement of the length of paragraph in layout section"); 595 "Disagreement of the length of paragraph in layout section");
577 psiconv_debug(lev+4,off+len, 596 psiconv_debug(config,lev+4,off+len,
578 "Paragraph length: layout section says %d, counted %d", 597 "Paragraph length: layout section says %d, counted %d",
579 temp,strlen(para->text)+1); 598 temp,strlen(para->text)+1);
580 } else 599 } else
581 psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp); 600 psiconv_debug(config,lev+4,off+len,"Paragraph length: %d",temp);
582 len += 4; 601 len += 4;
583 602
584 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");
585 temp = psiconv_read_u8(buf,lev+4,off+len,&res); 604 temp = psiconv_read_u8(config,buf,lev+4,off+len,&res);
586 if (res) 605 if (res)
587 goto ERROR4; 606 goto ERROR4;
588 if (temp != 0x00) { 607 if (temp != 0x00) {
589 psiconv_debug(lev+4,off+len,"Type: %02x",temp); 608 psiconv_debug(config,lev+4,off+len,"Type: %02x",temp);
590 for (j = 0; j < psiconv_list_length(anon_styles); j++) { 609 for (j = 0; j < psiconv_list_length(anon_styles); j++) {
591 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) { 610 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) {
592 psiconv_warn(lev+4,off+len,"Massive memory curruption"); 611 psiconv_warn(config,lev+4,off+len,"Massive memory curruption");
593 goto ERROR4; 612 goto ERROR4;
594 } 613 }
595 if (temp == anon_ptr->nr) 614 if (temp == anon_ptr->nr)
596 break; 615 break;
597 } 616 }
598 if (j == psiconv_list_length(anon_styles)) { 617 if (j == psiconv_list_length(anon_styles)) {
599 psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown"); 618 psiconv_warn(config,lev+4,off+len,"Layout section paragraph type unknown");
600 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");
601 para->base_style = 0; 620 para->base_style = 0;
602 if (!(temp_style = psiconv_get_style(styles,0))) { 621 if (!(temp_style = psiconv_get_style(styles,0))) {
603 psiconv_warn(lev+4,off,"Base style unknown"); 622 psiconv_warn(config,lev+4,off,"Base style unknown");
604 goto ERROR4; 623 goto ERROR4;
605 } 624 }
606 if (!(temp_para = psiconv_clone_paragraph_layout 625 if (!(temp_para = psiconv_clone_paragraph_layout
607 (temp_style->paragraph))) 626 (temp_style->paragraph)))
608 goto ERROR4; 627 goto ERROR4;
… …
627 para->base_character = temp_char; 646 para->base_character = temp_char;
628 } 647 }
629 inline_count[i] = 0; 648 inline_count[i] = 0;
630 len += 0x01; 649 len += 0x01;
631 } else { 650 } else {
632 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)"
633 ,temp); 652 ,temp);
634 len += 0x01; 653 len += 0x01;
635 if (parse_styles) { 654 if (parse_styles) {
636 temp = psiconv_read_u32(buf,lev+4,off+len,&res); 655 temp = psiconv_read_u32(config,buf,lev+4,off+len,&res);
637 if (res) 656 if (res)
638 goto ERROR4; 657 goto ERROR4;
639 psiconv_progress(lev+4,off+len+temp+4, 658 psiconv_progress(config,lev+4,off+len+temp+4,
640 "Going to read the paragraph element base style"); 659 "Going to read the paragraph element base style");
641 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);
642 if (res) 661 if (res)
643 goto ERROR4; 662 goto ERROR4;
644 psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp); 663 psiconv_debug(config,lev+4,off+len+temp+4, "Style: %02x",temp);
645 } else 664 } else
646 temp = 0x00; 665 temp = 0x00;
647 666
648 if (!(temp_style = psiconv_get_style (styles,temp))) { 667 if (!(temp_style = psiconv_get_style (styles,temp))) {
649 psiconv_warn(lev+4,off,"Unknown Style referenced"); 668 psiconv_warn(config,lev+4,off,"Unknown Style referenced");
650 if (!(temp_style = psiconv_get_style(styles,0))) { 669 if (!(temp_style = psiconv_get_style(styles,0))) {
651 psiconv_warn(lev+4,off,"Base style unknown"); 670 psiconv_warn(config,lev+4,off,"Base style unknown");
652 goto ERROR4; 671 goto ERROR4;
653 } 672 }
654 } 673 }
655 674
656 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph))) 675 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph)))
… …
662 goto ERROR4; 681 goto ERROR4;
663 psiconv_free_character_layout(para->base_character); 682 psiconv_free_character_layout(para->base_character);
664 para->base_character = temp_char; 683 para->base_character = temp_char;
665 684
666 para->base_style = temp; 685 para->base_style = temp;
667 psiconv_progress(lev+4,off+len,"Going to read paragraph layout"); 686 psiconv_progress(config,lev+4,off+len,"Going to read paragraph layout");
668 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,
669 para->base_paragraph))) 688 para->base_paragraph)))
670 goto ERROR4; 689 goto ERROR4;
671 len += leng; 690 len += leng;
672 if (parse_styles) 691 if (parse_styles)
673 len += 1; 692 len += 1;
674 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 "
675 "layout elements"); 694 "layout elements");
676 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);
677 if (res) 696 if (res)
678 goto ERROR4; 697 goto ERROR4;
679 psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]); 698 psiconv_debug(config,lev+4,off+len,"Nr: %08x",inline_count[i]);
680 len += 4; 699 len += 4;
681 } 700 }
682 } 701 }
683 702
684 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");
685 704
686 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");
687 nr = psiconv_read_u32(buf,lev+3,off+len,&res); 706 nr = psiconv_read_u32(config,buf,lev+3,off+len,&res);
688 if (res) 707 if (res)
689 goto ERROR4; 708 goto ERROR4;
690 psiconv_debug(lev+3,off+len,"Elements: %08x",nr); 709 psiconv_debug(config,lev+3,off+len,"Elements: %08x",nr);
691 len += 0x04; 710 len += 0x04;
692 711
693 psiconv_progress(lev+3,off+len, 712 psiconv_progress(config,lev+3,off+len,
694 "Going to read the text layout inline elements"); 713 "Going to read the text layout inline elements");
695 total = 0; 714 total = 0;
696 for (i = 0; i < psiconv_list_length(result); i++) { 715 for (i = 0; i < psiconv_list_length(result); i++) {
697 if (!(para = psiconv_list_get(result,i))) { 716 if (!(para = psiconv_list_get(result,i))) {
698 psiconv_warn(lev+3,off+len,"Massive memory corruption"); 717 psiconv_warn(config,lev+3,off+len,"Massive memory corruption");
699 goto ERROR4; 718 goto ERROR4;
700 } 719 }
701 line_length = -1; 720 line_length = -1;
702 for (j = 0; j < inline_count[i]; j++) { 721 for (j = 0; j < inline_count[i]; j++) {
703 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",
704 total,i,j); 723 total,i,j);
705 if (total >= nr) { 724 if (total >= nr) {
706 psiconv_warn(lev+3,off+len, 725 psiconv_warn(config,lev+3,off+len,
707 "Layout section inlines: not enough element"); 726 "Layout section inlines: not enough element");
708 psiconv_debug(lev+3,off+len,"Can't read element!"); 727 psiconv_debug(config,lev+3,off+len,"Can't read element!");
709 } else { 728 } else {
710 total ++; 729 total ++;
730 in_line.object = NULL;
731 in_line.layout = NULL;
711 if (!(in_line.layout = psiconv_clone_character_layout 732 if (!(in_line.layout = psiconv_clone_character_layout
712 (para->base_character))) 733 (para->base_character)))
713 goto ERROR4; 734 goto ERROR4;
714 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");
715 temp = psiconv_read_u8(buf,lev+4,len+off,&res); 736 temp = psiconv_read_u8(config,buf,lev+4,len+off,&res);
716 if (res) 737 if (res)
717 goto ERROR4; 738 goto ERROR5;
718 len += 1; 739 len += 1;
719 psiconv_debug(lev+4,off,"Type: %02x",temp); 740 psiconv_debug(config,lev+4,off+len,"Type: %02x",temp);
720 psiconv_progress(lev+4,off, 741 psiconv_progress(config,lev+4,off+len,
721 "Going to read the number of characters it applies to"); 742 "Going to read the number of characters it applies to");
722 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);
723 if (res) 744 if (res)
724 goto ERROR4; 745 goto ERROR5;
725 psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); 746 psiconv_debug(config,lev+4,off+len,"Length: %02x",in_line.length);
726 len += 4; 747 len += 4;
727 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");
728 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,
729 in_line.layout))) 750 in_line.layout)))
730 goto ERROR4; 751 goto ERROR5;
731 len += leng; 752 len += leng;
732 753
733 if (temp == 0x01) { 754 if (temp == 0x01) {
734 psiconv_debug(lev+4,off+len,"Skipping object data"); 755 psiconv_debug(config,lev+4,off+len,"Found an embedded object");
735 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;
736 } else if (temp != 0x00) { 797 } else if (temp != 0x00) {
737 psiconv_warn(lev+4,off+len,"Layout section unknown inline type"); 798 psiconv_warn(config,lev+4,off+len,"Layout section unknown inline type");
738 } 799 }
739 if (line_length + in_line.length > strlen(para->text)) { 800 if (line_length + in_line.length > strlen(para->text)) {
740 psiconv_warn(lev+4,off+len, 801 psiconv_warn(config,lev+4,off+len,
741 "Layout section inlines: line length mismatch"); 802 "Layout section inlines: line length mismatch");
742 res = -1; 803 res = -1;
743 in_line.length = strlen(para->text) - line_length; 804 in_line.length = strlen(para->text) - line_length;
744 } 805 }
745 line_length += in_line.length; 806 line_length += in_line.length;
746 if ((res = psiconv_list_add(para->in_lines,&in_line))) 807 if ((res = psiconv_list_add(para->in_lines,&in_line)))
747 goto ERROR4; 808 goto ERROR5;
748 } 809 }
749 } 810 }
750 } 811 }
751 812
752 if (total != nr) { 813 if (total != nr) {
753 psiconv_warn(lev+4,off+len, 814 psiconv_warn(config,lev+4,off+len,
754 "Layout section too many inlines, skipping remaining"); 815 "Layout section too many inlines, skipping remaining");
755 } 816 }
756 817
757 free(inline_count); 818 free(inline_count);
758 819
759 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { 820 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {
760 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { 821 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
761 psiconv_warn(lev+4,off+len,"Massive memory corruption"); 822 psiconv_warn(config,lev+4,off+len,"Massive memory corruption");
762 goto ERROR2; 823 goto ERROR2;
763 } 824 }
764 psiconv_free_character_layout(anon_ptr->character); 825 psiconv_free_character_layout(anon_ptr->character);
765 psiconv_free_paragraph_layout(anon_ptr->paragraph); 826 psiconv_free_paragraph_layout(anon_ptr->paragraph);
766 } 827 }
767 psiconv_list_free(anon_styles); 828 psiconv_list_free(anon_styles);
768 829
769 if (length) 830 if (length)
770 *length = len; 831 *length = len;
771 832
772 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)",
773 len); 834 len);
774 835
775 return 0; 836 return 0;
776 837
777ERROR4_4: 838ERROR4_4:
… …
788 psiconv_free_character_layout(anon.character); 849 psiconv_free_character_layout(anon.character);
789ERROR3_1: 850ERROR3_1:
790 psiconv_free_paragraph_layout(anon.paragraph); 851 psiconv_free_paragraph_layout(anon.paragraph);
791 goto ERROR3; 852 goto ERROR3;
792 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);
793ERROR4: 859ERROR4:
794 free(inline_count); 860 free(inline_count);
795ERROR3: 861ERROR3:
796 for (i = 0; i < psiconv_list_length(anon_styles); i++) { 862 for (i = 0; i < psiconv_list_length(anon_styles); i++) {
797 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { 863 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
798 psiconv_warn(lev+1,off,"Massive memory corruption"); 864 psiconv_warn(config,lev+1,off,"Massive memory corruption");
799 break; 865 break;
800 } 866 }
801 psiconv_free_paragraph_layout(anon_ptr->paragraph); 867 psiconv_free_paragraph_layout(anon_ptr->paragraph);
802 psiconv_free_character_layout(anon_ptr->character); 868 psiconv_free_character_layout(anon_ptr->character);
803 } 869 }
804 870
805ERROR2: 871ERROR2:
806 psiconv_list_free(anon_styles); 872 psiconv_list_free(anon_styles);
807ERROR1: 873ERROR1:
808 psiconv_warn(lev+1,off,"Reading of Layout Section failed"); 874 psiconv_warn(config,lev+1,off,"Reading of Layout Section failed");
809 if (length) 875 if (length)
810 *length = 0; 876 *length = 0;
811 if (!res) 877 if (!res)
812 return -PSICONV_E_NOMEM; 878 return -PSICONV_E_NOMEM;
813 else 879 else
814 return res; 880 return res;
815} 881}
816 882
817int psiconv_parse_styled_layout_section(const psiconv_buffer buf, 883int psiconv_parse_styled_layout_section(const psiconv_config config,
884 const psiconv_buffer buf,
818 int lev,psiconv_u32 off, 885 int lev,psiconv_u32 off,
819 int *length, 886 int *length,
820 psiconv_text_and_layout result, 887 psiconv_text_and_layout result,
821 psiconv_word_styles_section styles) 888 psiconv_word_styles_section styles)
822{ 889{
823 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);
824} 891}
825 892
826int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, 893int psiconv_parse_styleless_layout_section(const psiconv_config config,
894 const psiconv_buffer buf,
827 int lev,psiconv_u32 off, 895 int lev,psiconv_u32 off,
828 int *length, 896 int *length,
829 psiconv_text_and_layout result, 897 psiconv_text_and_layout result,
830 psiconv_character_layout base_char, 898 const psiconv_character_layout base_char,
831 psiconv_paragraph_layout base_para) 899 const psiconv_paragraph_layout base_para)
832{ 900{
833 int res = 0; 901 int res = 0;
834 psiconv_word_styles_section styles_section; 902 psiconv_word_styles_section styles_section;
835 903
836 if (!(styles_section = malloc(sizeof(*styles_section)))) 904 if (!(styles_section = malloc(sizeof(*styles_section))))
… …
848 goto ERROR5; 916 goto ERROR5;
849 if (!(styles_section->styles = psiconv_list_new(sizeof( 917 if (!(styles_section->styles = psiconv_list_new(sizeof(
850 struct psiconv_word_style_s)))) 918 struct psiconv_word_style_s))))
851 goto ERROR6; 919 goto ERROR6;
852 920
853 res = psiconv_parse_layout_section(buf,lev,off,length,result, 921 res = psiconv_parse_layout_section(config,buf,lev,off,length,result,
854 styles_section,0); 922 styles_section,0);
855 923
856 psiconv_free_word_styles_section(styles_section); 924 psiconv_free_word_styles_section(styles_section);
857 return res; 925 return res;
858 926
… …
865ERROR3: 933ERROR3:
866 free(styles_section->normal); 934 free(styles_section->normal);
867ERROR2: 935ERROR2:
868 free(styles_section); 936 free(styles_section);
869ERROR1: 937ERROR1:
870 psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed"); 938 psiconv_warn(config,lev+1,off,"Reading of Styleless Layout Section failed");
871 if (length) 939 if (length)
872 *length = 0; 940 *length = 0;
873 if (!res) 941 if (!res)
874 return -PSICONV_E_NOMEM; 942 return -PSICONV_E_NOMEM;
875 else 943 else
876 return res; 944 return res;
877} 945}
878 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.65  
changed lines
  Added in v.168
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26