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

 Legend:



Removed from v.41
 


changed lines


 
Added in v.270
 Legend:



Removed from v.41
 


changed lines


 
Added in v.270
-Removed from v.41
+Added in v.270

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