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