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