/[public]/psiconv/trunk/lib/psiconv/parse_common.c

Diff of /psiconv/trunk/lib/psiconv/parse_common.c

Parent Directory | Revision Log | View Patch Patch

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

 Legend:



Removed from v.167
 


changed lines


 
Added in v.233
 Legend:



Removed from v.167
 


changed lines


 
Added in v.233
-Removed from v.167
+Added in v.233

frodo@frodo.looijaard.name	ViewVC Help
Powered by ViewVC 1.1.26