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