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