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

 Legend:



Removed from v.25
 


changed lines


 
Added in v.238
 Legend:



Removed from v.25
 


changed lines


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

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