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