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

 Legend:



Removed from v.25
 


changed lines


 
Added in v.168
 Legend:



Removed from v.25
 


changed lines


 
Added in v.168
-Removed from v.25
+Added in v.168

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