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