/[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 18		Revision 64
1	/*	1	/*
2	parse_common.c - Part of psiconv, a PSION 5 file formats converter	2	parse_common.c - Part of psiconv, a PSION 5 file formats converter
3	Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl>	3	Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl>
4		4
5	This program is free software; you can redistribute it and/or modify	5	This program is free software; you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by	6	it under the terms of the GNU General Public License as published by
7	the Free Software Foundation; either version 2 of the License, or	7	the Free Software Foundation; either version 2 of the License, or
8	(at your option) any later version.	8	(at your option) any later version.
…		…
16	along with this program; if not, write to the Free Software	16	along with this program; if not, write to the Free Software
17	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	17	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18	*/	18	*/
19		19
20	#include "config.h"	20	#include "config.h"
		21	#include "compat.h"
21	#include <stdlib.h>	22	#include <stdlib.h>
22	#include <string.h>	23	#include <string.h>
23		24
24	#include "data.h"	25	#include "data.h"
25	#include "parse_routines.h"	26	#include "parse_routines.h"
…		…
38	int res=0;	39	int res=0;
39	int len=0;	40	int len=0;
40	psiconv_u32 temp;	41	psiconv_u32 temp;
41		42
42	psiconv_progress(lev+1,off+len,"Going to read the header section");	43	psiconv_progress(lev+1,off+len,"Going to read the header section");
43	(result) = malloc(sizeof(*result));	44	if (!((result) = malloc(sizeof(*result))))
		45	goto ERROR1;
44		46
45	psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3");	47	psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3");
46	(*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len);	48	(*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len,&res);
		49	if (!res)
		50	goto ERROR2;
47	psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1);	51	psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1);
		52	if ((*result)->uid1 == PSICONV_ID_CLIPART) {
		53	/* That's all folks... */
		54	(*result)->file = psiconv_clipart_file;
		55	(*result)->uid2 = 0;
		56	(*result)->uid3 = 0;
		57	(*result)->checksum = 0;
		58	len += 4;
		59	psiconv_debug(lev+2,off+len,"File is a Clipart file");
		60	goto DONE;
		61	}
48	if ((*result)->uid1 != PSICONV_ID_PSION5) {	62	if ((*result)->uid1 != PSICONV_ID_PSION5) {
49	psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably "	63	psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably "
50	"not a (parsable) Psion 5 file");	64	"not a (parsable) Psion 5 file");
51	res = -1;	65	res = -PSICONV_E_PARSE;
		66	goto ERROR2;
52	}	67	}
53	len += 4;	68	len += 4;
54	(*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len);	69	(*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len,&res);
		70	if (res)
		71	goto ERROR2;
55	psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2);	72	psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2);
56	len += 4;	73	len += 4;
57	(*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len);	74	(*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len,&res);
		75	if (res)
		76	goto ERROR2;
58	psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3);	77	psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3);
59	len += 4;	78	len += 4;
60		79
61	(*result)->file = psiconv_unknown_file;	80	(*result)->file = psiconv_unknown_file;
62	if ((*result)->uid1 == PSICONV_ID_PSION5) {	81	if ((*result)->uid1 == PSICONV_ID_PSION5) {
…		…
65	(*result)->file = psiconv_word_file;	84	(*result)->file = psiconv_word_file;
66	psiconv_debug(lev+2,off+len,"File is a Word file");	85	psiconv_debug(lev+2,off+len,"File is a Word file");
67	} else if ((*result)->uid3 == PSICONV_ID_TEXTED) {	86	} else if ((*result)->uid3 == PSICONV_ID_TEXTED) {
68	(*result)->file = psiconv_texted_file;	87	(*result)->file = psiconv_texted_file;
69	psiconv_debug(lev+2,off+len,"File is a TextEd file");	88	psiconv_debug(lev+2,off+len,"File is a TextEd file");
		89	} else if ((*result)->uid3 == PSICONV_ID_SKETCH) {
		90	(*result)->file = psiconv_sketch_file;
		91	psiconv_debug(lev+2,off+len,"File is a Sketch file");
70	}	92	}
71	} else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {	93	} else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {
72	(*result)->file = psiconv_mbm_file;	94	(*result)->file = psiconv_mbm_file;
73	if ((*result)->uid3 != 0x00)	95	if ((*result)->uid3 != 0x00)
74	psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?");	96	psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?");
75	psiconv_debug(lev+2,off+len,"File is a MBM file");	97	psiconv_debug(lev+2,off+len,"File is a MBM file");
…		…
79	psiconv_warn(lev+2,off+len,"Unknown file type");	101	psiconv_warn(lev+2,off+len,"Unknown file type");
80	(*result)->file = psiconv_unknown_file;	102	(*result)->file = psiconv_unknown_file;
81	}	103	}
82		104
83	psiconv_progress(lev+2,off+len,"Checking UID4");	105	psiconv_progress(lev+2,off+len,"Checking UID4");
84	temp = psiconv_read_u32(buf,lev+2,off+len);	106	temp = psiconv_read_u32(buf,lev+2,off+len,&res);
		107	if (res)
		108	goto ERROR2;
85	if (temp == psiconv_checkuid((result)->uid1,(result)->uid2,	109	if (temp == psiconv_checkuid((result)->uid1,(result)->uid2,
86	(*result)->uid3))	110	(*result)->uid3))
87	psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp);	111	psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp);
88	else {	112	else {
89	psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!");	113	psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!");
90	psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x",	114	psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x",
91	psiconv_checkuid((result)->uid1,(result)->uid2,	115	psiconv_checkuid((result)->uid1,(result)->uid2,
92	(*result)->uid3),temp);	116	(*result)->uid3),temp);
93	res = -1;	117	res = -PSICONV_E_PARSE;
		118	goto ERROR2;
94	}	119	}
95	len += 4;	120	len += 4;
96		121
		122	DONE:
97	if (length)	123	if (length)
98	*length = len;	124	*length = len;
99		125
100	psiconv_progress(lev+1,off+len-1,	126	psiconv_progress(lev+1,off+len-1,
101	"End of Header Section (total length: %08x)",len);	127	"End of Header Section (total length: %08x)",len);
102		128
103	return res;	129	return res;
		130
		131	ERROR2:
		132	free(*result);
		133	ERROR1:
		134	psiconv_warn(lev+1,off,"Reading of Header Section failed");
		135	if (length)
		136	*length = 0;
		137	if (res == 0)
		138	return -PSICONV_E_NOMEM;
		139	else
		140	return res;
104	}	141	}
105		142
106	int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev,	143	int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev,
107	psiconv_u32 off, int *length,	144	psiconv_u32 off, int *length,
108	psiconv_section_table_section *result)	145	psiconv_section_table_section *result)
…		…
113		150
114	int i;	151	int i;
115	psiconv_u8 nr;	152	psiconv_u8 nr;
116		153
117	psiconv_progress(lev+1,off+len,"Going to read the section table section");	154	psiconv_progress(lev+1,off+len,"Going to read the section table section");
118	result = psiconv_list_new(sizeof(entry));	155	if (!(result = psiconv_list_new(sizeof(entry))))
		156	goto ERROR1;
119		157
120	psiconv_progress(lev+2,off+len,"Going to read the section table length");	158	psiconv_progress(lev+2,off+len,"Going to read the section table length");
121	nr = psiconv_read_u8(buf,lev+2,off+len);	159	nr = psiconv_read_u8(buf,lev+2,off+len,&res);
		160	if (res)
		161	goto ERROR2;
122	psiconv_debug(lev+2,off+len,"Length: %08x",nr);	162	psiconv_debug(lev+2,off+len,"Length: %08x",nr);
123	if (nr & 0x01) {	163	if (nr & 0x01) {
124	psiconv_warn(lev+2,off+len,	164	psiconv_warn(lev+2,off+len,
125	"Section table length odd - ignoring last entry");	165	"Section table length odd - ignoring last entry");
126	res = -1;
127	}	166	}
128	len ++;	167	len ++;
129		168
130	psiconv_progress(lev+2,off+len,"Going to read the section table entries");	169	psiconv_progress(lev+2,off+len,"Going to read the section table entries");
131	entry = malloc(sizeof(*entry));	170	entry = malloc(sizeof(*entry));
132	for (i = 0; i < nr / 2; i++) {	171	for (i = 0; i < nr / 2; i++) {
133	entry->id = psiconv_read_u32(buf,lev+2,off + len);	172	entry->id = psiconv_read_u32(buf,lev+2,off + len,&res);
		173	if (res)
		174	goto ERROR3;
134	psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id);	175	psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id);
135	len += 0x04;	176	len += 0x04;
136	entry->offset = psiconv_read_u32(buf,lev+2,off + len);	177	entry->offset = psiconv_read_u32(buf,lev+2,off + len,&res);
		178	if (res)
		179	goto ERROR3;
137	psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset);	180	psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset);
138	len += 0x04;	181	len += 0x04;
139	psiconv_list_add(*result,entry);	182	if ((res=psiconv_list_add(*result,entry)))
		183	goto ERROR3;
140	}	184	}
141		185
142	free(entry);	186	free(entry);
143		187
144	if (length)	188	if (length)
145	*length = len;	189	*length = len;
146		190
147	psiconv_progress(lev+1,off+len-1,"End of section table section "	191	psiconv_progress(lev+1,off+len-1,"End of section table section "
148	"(total length: %08x", len);	192	"(total length: %08x)", len);
149		193
		194	return 0;
		195	ERROR3:
		196	free(entry);
		197	ERROR2:
		198	psiconv_list_free(*result);
		199	ERROR1:
		200	psiconv_warn(lev+1,off,"Reading of Section Table Section failed");
		201	if (length)
		202	*length = 0;
		203	if (res == 0)
		204	return -PSICONV_E_NOMEM;
		205	else
150	return res;	206	return res;
151	}	207	}
152		208
153	int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev,	209	int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev,
154	psiconv_u32 off, int *length,	210	psiconv_u32 off, int *length,
155	psiconv_application_id_section *result)	211	psiconv_application_id_section *result)
…		…
157	int res=0;	213	int res=0;
158	int len=0;	214	int len=0;
159	int leng;	215	int leng;
160		216
161	psiconv_progress(lev+1,off,"Going to read the application id section");	217	psiconv_progress(lev+1,off,"Going to read the application id section");
162	(result) = malloc(sizeof(*result));	218	if (!(result = malloc(sizeof(*result))))
		219	goto ERROR1;
163		220
164	psiconv_progress(lev+2,off+len,"Going to read the type identifier");	221	psiconv_progress(lev+2,off+len,"Going to read the type identifier");
165	(*result)->id = psiconv_read_u32(buf,lev+2,off+len);	222	(*result)->id = psiconv_read_u32(buf,lev+2,off+len,&res);
		223	if (res)
		224	goto ERROR2;
166	psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id);	225	psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id);
167	len += 4;	226	len += 4;
168		227
169	psiconv_progress(lev+2,off+len,"Going to read the application id string");	228	psiconv_progress(lev+2,off+len,"Going to read the application id string");
170	(*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng);	229	(*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res);
		230	if (res)
		231	goto ERROR2;
171	len += leng;	232	len += leng;
172		233
173	if (length)	234	if (length)
174	*length = len;	235	*length = len;
175		236
176	psiconv_progress(lev+1,off+len-1,"End of application id section "	237	psiconv_progress(lev+1,off+len-1,"End of application id section "
177	"(total length: %08x", len);	238	"(total length: %08x", len);
178		239
179	return res;	240	return res;
		241	ERROR2:
		242	free(*result);
		243	ERROR1:
		244	psiconv_warn(lev+1,off,"Reading of Application ID Section failed");
		245	if (length)
		246	*length = 0;
		247	if (res == 0)
		248	return -PSICONV_E_NOMEM;
		249	else
		250	return res;
180	}	251	}
181		252
182	int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off,	253	int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off,
183	int length,psiconv_text_and_layout result)	254	int length,psiconv_text_and_layout result)
184	{	255	{
…		…
188		259
189	psiconv_u32 text_len;	260	psiconv_u32 text_len;
190	psiconv_paragraph para;	261	psiconv_paragraph para;
191		262
192	int nr;	263	int nr;
193	int i,j,start,leng;	264	int i,j,start,leng,temp;
194	char *str_copy;	265	char *str_copy;
195		266
196	psiconv_progress(lev+1,off,"Going to parse the text section");	267	psiconv_progress(lev+1,off,"Going to parse the text section");
197	psiconv_progress(lev+2,off,"Reading the text length");	268	psiconv_progress(lev+2,off,"Reading the text length");
		269
		270	if(!(result = psiconv_list_new(sizeof(para))))
		271	goto ERROR1;
		272	if (!(para = malloc(sizeof(*para))))
		273	goto ERROR2;
		274
198	text_len = psiconv_read_X(buf,lev+2,off,&leng);	275	text_len = psiconv_read_X(buf,lev+2,off,&leng,&res);
		276	if (!res)
		277	goto ERROR3;
199	psiconv_debug(lev+2,off,"Length: %08x",text_len);	278	psiconv_debug(lev+2,off,"Length: %08x",text_len);
200	len += leng;	279	len += leng;
201
202	result = psiconv_list_new(sizeof(para));
203	para = malloc(sizeof(*para));
204		280
205	psiconv_progress(lev+2,off+len,"Going to read all paragraph text");	281	psiconv_progress(lev+2,off+len,"Going to read all paragraph text");
206	nr = 0;	282	nr = 0;
207	start = 0;	283	start = 0;
208	for (i = 0; i < text_len; i++)	284	for (i = 0; i < text_len; i++) {
209	if (psiconv_read_u8(buf,lev+2,off+len+i) == 0x06) {	285	temp = psiconv_read_u8(buf,lev+2,off+len+i,&res);
		286	if (res)
		287	goto ERROR3;
		288	if (temp == 0x06) {
210	para->text = malloc(i - start + 1);	289	if (!(para->text = malloc(i - start + 1)))
		290	goto ERROR3;
211	for (j = 0; j < i - start; j++)	291	for (j = 0; j < i - start; j++) {
212	para->text[j] = psiconv_read_u8(buf,lev+1,off + len + start + j);	292	temp = psiconv_read_u8(buf,lev+1,off + len + start + j,&res);
		293	if (res)
		294	goto ERROR4;
		295	para->text[j] = temp;
		296	}
213	para->text[j] = 0;	297	para->text[j] = 0;
214		298
215	psiconv_list_add(*result,para);	299	if ((res = psiconv_list_add(*result,para)))
		300	goto ERROR4;
216		301
217	str_copy = psiconv_make_printable(para->text);	302	if (!(str_copy = psiconv_make_printable(para->text)))
		303	goto ERROR3;
218	psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr,	304	psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr,
219	strlen(str_copy) +1);	305	strlen(str_copy) +1);
220	psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy);	306	psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy);
221	free(str_copy);	307	free(str_copy);
222		308
223	start = i + 1;	309	start = i + 1;
224	nr ++;	310	nr ++;
225	}	311	}
		312	}
226		313
227	if (start != text_len) {	314	if (start != text_len) {
228	res = -1;
229	psiconv_warn(lev+2,off+start+len,	315	psiconv_warn(lev+2,off+start+len,
230	"Last line does not end on EOL (%d characters left)", len - start);	316	"Last line does not end on EOL (%d characters left)", len - start);
231	para->text = malloc(text_len - start + 1);	317	if (!(para->text = malloc(text_len - start + 1)))
		318	goto ERROR3;
232	for (j = 0; j < text_len - start; j++)	319	for (j = 0; j < text_len - start; j++) {
233	para->text[j] = psiconv_read_u8(buf,lev+2,off + start + j + len);	320	temp = psiconv_read_u8(buf,lev+2,off + start + j + len, &res);
		321	if (res)
		322	goto ERROR4;
		323	para->text[j] = temp;
		324	}
234	para->text[text_len - start] = 0;	325	para->text[text_len - start] = 0;
235	psiconv_list_add(*result,para);	326	if ((res = psiconv_list_add(*result,para)))
		327	goto ERROR4;
236	str_copy = psiconv_make_printable(para->text);	328	if (!(str_copy = psiconv_make_printable(para->text)))
		329	goto ERROR3;
237	psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr,	330	psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr,
238	strlen(str_copy)+1);	331	strlen(str_copy)+1);
239	psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy);	332	psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy);
240	free(str_copy);	333	free(str_copy);
241	}	334	}
242		335
243	free(para);	336	free(para);
244		337
245	/* Initialize the remaining parts of each paragraph */	338	/* Initialize the remaining parts of each paragraph */
246	for (i = 0; i < psiconv_list_length(*result); i ++) {	339	for (i = 0; i < psiconv_list_length(*result); i ++) {
247	para = psiconv_list_get(*result,i);	340	if (!(para = psiconv_list_get(*result,i))) {
248	para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout));	341	psiconv_warn(lev+2,off+len,"Massive memory corruption");
249	para->replacements = psiconv_list_new(sizeof(struct psiconv_replacement));	342	goto ERROR2_0;
		343	}
		344	if (!(para->in_lines = psiconv_list_new(sizeof(
		345	struct psiconv_in_line_layout_s))))
		346	goto ERROR2_0;
		347	if (!(para->replacements = psiconv_list_new(sizeof(
		348	struct psiconv_replacement_s))))
		349	goto ERROR2_1;
		350	if (!(para->base_character = psiconv_basic_character_layout()))
		351	goto ERROR2_2;
		352	if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
		353	goto ERROR2_3;
250	para->base_style = 0;	354	para->base_style = 0;
251	para->base_character = psiconv_basic_character_layout();
252	para->base_paragraph = psiconv_basic_paragraph_layout();
253	}	355	}
254		356
255		357
256	len += text_len;	358	len += text_len;
257		359
…		…
260		362
261	psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x",	363	psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x",
262	len);	364	len);
263		365
264	return res;	366	return res;
		367
		368	ERROR2_3:
		369	psiconv_free_character_layout(para->base_character);
		370	ERROR2_2:
		371	psiconv_list_free(para->replacements);
		372	ERROR2_1:
		373	psiconv_list_free(para->in_lines);
		374	ERROR2_0:
		375	for (j = 0; j < i; j++) {
		376	if (!(para = psiconv_list_get(*result,j))) {
		377	psiconv_warn(lev+1,off,"Massive memory corruption...");
		378	break;
		379	}
		380	psiconv_list_free(para->in_lines);
		381	psiconv_list_free(para->replacements);
		382	psiconv_free_character_layout(para->base_character);
		383	psiconv_free_paragraph_layout(para->base_paragraph);
		384	}
		385	goto ERROR2;
		386
		387	ERROR4:
		388	free(para->text);
		389	ERROR3:
		390	free(para);
		391	ERROR2:
		392	for (i = 0; i < psiconv_list_length(*result);i++) {
		393	if (!(para = psiconv_list_get(*result,i))) {
		394	psiconv_warn(lev+1,off,"Massive memory corruption...");
		395	break;
		396	}
		397	free(para->text);
		398	}
		399	psiconv_list_free(*result);
		400	ERROR1:
		401	psiconv_warn(lev+1,off,"Reading of Text Section failed");
		402	if (length)
		403	*length = 0;
		404	if (!res)
		405	return -PSICONV_E_NOMEM;
		406	else
		407	return res;
265	}	408	}
266		409
267	/* First do a parse_text_section, or you will get into trouble here */	410	/* First do a parse_text_section, or you will get into trouble here */
268	int psiconv_parse_layout_section(const psiconv_buffer buf,	411	int psiconv_parse_layout_section(const psiconv_buffer buf,
269	int lev,psiconv_u32 off,	412	int lev,psiconv_u32 off,
…		…
275	int res = 0;	418	int res = 0;
276	int len = 0;	419	int len = 0;
277	psiconv_u32 temp;	420	psiconv_u32 temp;
278	int parse_styles,nr,i,j,total,leng,line_length;	421	int parse_styles,nr,i,j,total,leng,line_length;
279		422
280	typedef struct anon_style	423	typedef struct anon_style_s
281	{	424	{
282	int nr;	425	int nr;
283	psiconv_s16 base_style;	426	psiconv_s16 base_style;
284	psiconv_character_layout character;	427	psiconv_character_layout character;
285	psiconv_paragraph_layout paragraph;	428	psiconv_paragraph_layout paragraph;
286	} *anon_style;	429	} *anon_style;
287		430
288	typedef psiconv_list anon_style_list; /* of struct anon_style */	431	typedef psiconv_list anon_style_list; /* of struct anon_style */
289		432
290	anon_style_list anon_styles;	433	anon_style_list anon_styles;
291	struct anon_style anon;	434	struct anon_style_s anon;
292	anon_style anon_ptr=NULL;	435	anon_style anon_ptr=NULL;
293		436
		437	psiconv_character_layout temp_char;
		438	psiconv_paragraph_layout temp_para;
		439	psiconv_word_style temp_style;
294	psiconv_paragraph para;	440	psiconv_paragraph para;
295	struct psiconv_in_line_layout in_line;	441	struct psiconv_in_line_layout_s in_line;
296		442
297	int *inline_count;	443	int *inline_count;
298		444
299		445
300	psiconv_progress(lev+1,off,"Going to read the layout section");	446	psiconv_progress(lev+1,off,"Going to read the layout section");
301		447
302	psiconv_progress(lev+2,off,"Going to read the section type");	448	psiconv_progress(lev+2,off,"Going to read the section type");
303	temp = psiconv_read_u16(buf,lev+2,off+len);	449	temp = psiconv_read_u16(buf,lev+2,off+len,&res);
		450	if (res)
		451	goto ERROR1;
304	psiconv_debug(lev+2,off+len,"Type: %02x",temp);	452	psiconv_debug(lev+2,off+len,"Type: %02x",temp);
305	parse_styles = with_styles;	453	parse_styles = with_styles;
306	if ((temp == 0x0001) && !with_styles) {	454	if ((temp == 0x0001) && !with_styles) {
307	psiconv_warn(lev+2,off+len,"Styleless layout section expected, "	455	psiconv_warn(lev+2,off+len,"Styleless layout section expected, "
308	"but styled section found!");	456	"but styled section found!");
309	parse_styles = 1;	457	parse_styles = 1;
310	res = -1;
311	} else if ((temp == 0x0000) && (with_styles)) {	458	} else if ((temp == 0x0000) && (with_styles)) {
312	psiconv_warn(lev+2,off+len,"Styled layout section expected, "	459	psiconv_warn(lev+2,off+len,"Styled layout section expected, "
313	"but styleless section found!");	460	"but styleless section found!");
314	parse_styles = 0;	461	parse_styles = 0;
315	res = -1;
316	} else if ((temp != 0x0000) && (temp != 0x0001)) {	462	} else if ((temp != 0x0000) && (temp != 0x0001)) {
317	psiconv_warn(lev+2,off+len,	463	psiconv_warn(lev+2,off+len,
318	"Layout section type indicator has unknown value!");	464	"Layout section type indicator has unknown value!");
319	res = -1;
320	}	465	}
321	len += 0x02;	466	len += 0x02;
322		467
323	psiconv_progress(lev+2,off+len,"Going to read paragraph type list");	468	psiconv_progress(lev+2,off+len,"Going to read paragraph type list");
324	anon_styles = psiconv_list_new(sizeof(anon));	469	if (!(anon_styles = psiconv_list_new(sizeof(anon))))
		470	goto ERROR1;
325	psiconv_progress(lev+3,off+len,"Going to read paragraph type list length");	471	psiconv_progress(lev+3,off+len,"Going to read paragraph type list length");
326	nr = psiconv_read_u8(buf,lev+3,off+len);	472	nr = psiconv_read_u8(buf,lev+3,off+len,&res);
		473	if (res)
		474	goto ERROR2;
327	psiconv_debug(lev+3,off+len,"Length: %02x",nr);	475	psiconv_debug(lev+3,off+len,"Length: %02x",nr);
328	len ++;	476	len ++;
329		477
330	psiconv_progress(lev+3,off+len,	478	psiconv_progress(lev+3,off+len,
331	"Going to read the paragraph type list elements");	479	"Going to read the paragraph type list elements");
332	for (i = 0; i < nr; i ++) {	480	for (i = 0; i < nr; i ++) {
333	psiconv_progress(lev+3,off+len,"Element %d",i);	481	psiconv_progress(lev+3,off+len,"Element %d",i);
334	anon.nr = psiconv_read_u32(buf,lev+4,off+len);	482	anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res);
		483	if (res)
		484	goto ERROR3;
335	psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr);	485	psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr);
336	len += 0x04;	486	len += 0x04;
337		487
338	psiconv_progress(lev+4,off,"Going to determine the base style");	488	psiconv_progress(lev+4,off,"Going to determine the base style");
339	if (parse_styles) {	489	if (parse_styles) {
		490	temp = psiconv_read_u32(buf,lev+4, off+len,&res);
		491	if (res)
		492	goto ERROR3;
340	anon.base_style = psiconv_read_u8(buf,lev+3,	493	anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res);
341	off+len+4+psiconv_read_u32(buf,lev+4,	494	if (res)
342	off+len));	495	goto ERROR3;
343	psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len),	496	psiconv_debug(lev+4,off+len+temp,
344	"Style indicator: %02x",anon.base_style);	497	"Style indicator: %02x",anon.base_style);
345	} else	498	} else
346	anon.base_style = 0;	499	anon.base_style = 0;
		500	if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
		501	psiconv_warn(lev+4,off,"Unknown Style referenced");
		502	if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
		503	psiconv_warn(lev+4,off,"Base style unknown");
		504	goto ERROR3;
		505	}
		506	}
347	anon.paragraph = psiconv_clone_paragraph_layout(psiconv_get_style	507	if (!(anon.paragraph = psiconv_clone_paragraph_layout
348	(styles,anon.base_style)->paragraph);	508	(temp_style->paragraph)))
		509	goto ERROR3;
349	anon.character = psiconv_clone_character_layout(psiconv_get_style	510	if (!(anon.character = psiconv_clone_character_layout
350	(styles,anon.base_style)->character);	511	(temp_style->character)))
		512	goto ERROR3_1;
351		513
352	psiconv_progress(lev+4,off+len,"Going to read the paragraph layout");	514	psiconv_progress(lev+4,off+len,"Going to read the paragraph layout");
353	res \|= psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,	515	if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,
354	anon.paragraph);	516	anon.paragraph)))
		517	goto ERROR3_2;
355	len += leng;	518	len += leng;
356	if (parse_styles)	519	if (parse_styles)
357	len ++;	520	len ++;
358		521
359	psiconv_progress(lev+4,off+len,"Going to read the character layout");	522	psiconv_progress(lev+4,off+len,"Going to read the character layout");
360	res \|= psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,	523	if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,
361	anon.character);	524	anon.character)))
		525	goto ERROR3_2;
362	len += leng;	526	len += leng;
363	psiconv_list_add(anon_styles,&anon);	527	if ((res = psiconv_list_add(anon_styles,&anon)))
		528	goto ERROR3_2;
364	}	529	}
365		530
366	psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list");	531	psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list");
367	psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs");	532	psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs");
368	nr = psiconv_read_u32(buf,lev+3,off+len);	533	nr = psiconv_read_u32(buf,lev+3,off+len,&res);
		534	if (res)
		535	goto ERROR3;
369	if (nr != psiconv_list_length(result)) {	536	if (nr != psiconv_list_length(result)) {
370	psiconv_warn(lev+3,off+len,	537	psiconv_warn(lev+3,off+len,
371	"Number of text paragraphs and paragraph elements does not match");	538	"Number of text paragraphs and paragraph elements does not match");
372	psiconv_debug(lev+3,off+len,	539	psiconv_debug(lev+3,off+len,
373	"%d text paragraphs, %d paragraph elements",	540	"%d text paragraphs, %d paragraph elements",
374	psiconv_list_length(result),nr);	541	psiconv_list_length(result),nr);
375	}	542	}
376	psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr);	543	psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr);
377	len += 4;	544	len += 4;
378	inline_count = malloc(nr * sizeof(*inline_count));	545	if (!(inline_count = malloc(nr * sizeof(*inline_count))))
		546	goto ERROR3;
379		547
380	psiconv_progress(lev+3,off+len,"Going to read the paragraph elements");	548	psiconv_progress(lev+3,off+len,"Going to read the paragraph elements");
381	for (i = 0; i < nr; i ++) {	549	for (i = 0; i < nr; i ++) {
382	psiconv_progress(lev+3,off+len,"Element %d",i);	550	psiconv_progress(lev+3,off+len,"Element %d",i);
383	if (i >= psiconv_list_length(result)) {	551	if (i >= psiconv_list_length(result)) {
384	psiconv_debug(lev+4,off+len,"Going to allocate a new element");	552	psiconv_debug(lev+4,off+len,"Going to allocate a new element");
385	para = malloc(sizeof(*para));	553	if (!(para = malloc(sizeof(*para))))
386	para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout));	554	goto ERROR4;
		555	if (!(para->in_lines = psiconv_list_new(sizeof(
		556	struct psiconv_in_line_layout_s))))
		557	goto ERROR4_1;
387	para->base_style = 0;	558	para->base_style = 0;
388	para->base_character = psiconv_basic_character_layout();	559	if (!(para->base_character = psiconv_basic_character_layout()))
		560	goto ERROR4_2;
389	para->base_paragraph = psiconv_basic_paragraph_layout();	561	if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
		562	goto ERROR4_3;
		563	if ((res = psiconv_list_add(result,para)))
		564	goto ERROR4_4;
390	free(para);	565	free(para);
391	}	566	}
392	para = psiconv_list_get(result,i);	567	if (!(para = psiconv_list_get(result,i)))
		568	goto ERROR4;
393		569
394	psiconv_progress(lev+4,off+len,"Going to read the paragraph length");	570	psiconv_progress(lev+4,off+len,"Going to read the paragraph length");
395	temp = psiconv_read_u32(buf,lev+4,off+len);	571	temp = psiconv_read_u32(buf,lev+4,off+len,&res);
		572	if (!res)
		573	goto ERROR4;
396	if (temp != strlen(para->text)+1) {	574	if (temp != strlen(para->text)+1) {
397	res = -1;
398	psiconv_warn(lev+4,off+len,	575	psiconv_warn(lev+4,off+len,
399	"Disagreement of the length of paragraph in layout section");	576	"Disagreement of the length of paragraph in layout section");
400	psiconv_debug(lev+4,off+len,	577	psiconv_debug(lev+4,off+len,
401	"Paragraph length: layout section says %d, counted %d",	578	"Paragraph length: layout section says %d, counted %d",
402	temp,strlen(para->text)+1);	579	temp,strlen(para->text)+1);
403	} else	580	} else
404	psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp);	581	psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp);
405	len += 4;	582	len += 4;
406		583
407	psiconv_progress(lev+4,off+len,"Going to read the paragraph type");	584	psiconv_progress(lev+4,off+len,"Going to read the paragraph type");
408	temp = psiconv_read_u8(buf,lev+4,off+len);	585	temp = psiconv_read_u8(buf,lev+4,off+len,&res);
		586	if (!res)
		587	goto ERROR4;
409	if (temp != 0x00) {	588	if (temp != 0x00) {
410	psiconv_debug(lev+4,off+len,"Type: %02x",temp);	589	psiconv_debug(lev+4,off+len,"Type: %02x",temp);
411	for (j = 0; j < psiconv_list_length(anon_styles); j++) {	590	for (j = 0; j < psiconv_list_length(anon_styles); j++) {
412	anon_ptr = psiconv_list_get(anon_styles,j);	591	if (!(anon_ptr = psiconv_list_get(anon_styles,j))) {
		592	psiconv_warn(lev+4,off+len,"Massive memory curruption");
		593	goto ERROR4;
		594	}
413	if (temp == anon_ptr->nr)	595	if (temp == anon_ptr->nr)
414	break;	596	break;
415	}	597	}
416	if (j == psiconv_list_length(anon_styles)) {	598	if (j == psiconv_list_length(anon_styles)) {
417	psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown");	599	psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown");
418	psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead");	600	psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead");
419	para->base_style = 0;	601	para->base_style = 0;
		602	if (!(temp_style = psiconv_get_style(styles,0))) {
		603	psiconv_warn(lev+4,off,"Base style unknown");
		604	goto ERROR4;
		605	}
		606	if (!(temp_para = psiconv_clone_paragraph_layout
		607	(temp_style->paragraph)))
		608	goto ERROR4;
420	psiconv_free_paragraph_layout(para->base_paragraph);	609	psiconv_free_paragraph_layout(para->base_paragraph);
		610	para->base_paragraph = temp_para;
		611
		612	if (!(temp_char = psiconv_clone_character_layout
		613	(temp_style->character)))
		614	goto ERROR4;
421	psiconv_free_character_layout(para->base_character);	615	psiconv_free_character_layout(para->base_character);
422	para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style	616	para->base_character = temp_char;
423	(styles,0)->paragraph);
424	para->base_character = psiconv_clone_character_layout(psiconv_get_style
425	(styles,0)->character);
426	} else {	617	} else {
427	para->base_style = anon_ptr->base_style;	618	para->base_style = anon_ptr->base_style;
		619	if (!(temp_para = psiconv_clone_paragraph_layout (anon_ptr->paragraph)))
		620	goto ERROR4;
428	psiconv_free_paragraph_layout(para->base_paragraph);	621	psiconv_free_paragraph_layout(para->base_paragraph);
		622	para->base_paragraph = temp_para;
		623
		624	if (!(temp_char = psiconv_clone_character_layout (anon_ptr->character)))
		625	goto ERROR4;
429	psiconv_free_character_layout(para->base_character);	626	psiconv_free_character_layout(para->base_character);
430	para->base_paragraph = psiconv_clone_paragraph_layout	627	para->base_character = temp_char;
431	(anon_ptr->paragraph);
432	para->base_character = psiconv_clone_character_layout
433	(anon_ptr->character);
434	}	628	}
435	inline_count[i] = 0;	629	inline_count[i] = 0;
436	len += 0x01;	630	len += 0x01;
437	} else {	631	} else {
438	psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)"	632	psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)"
439	,temp);	633	,temp);
440	len += 0x01;	634	len += 0x01;
441	if (parse_styles) {	635	if (parse_styles) {
442	psiconv_progress(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len),	636	temp = psiconv_read_u32(buf,lev+4,off+len,&res);
		637	if (res)
		638	goto ERROR4;
		639	psiconv_progress(lev+4,off+len+temp+4,
443	"Going to read the paragraph element base style");	640	"Going to read the paragraph element base style");
444	temp = psiconv_read_u8(buf,lev+4,	641	temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res);
445	off+len+psiconv_read_u32(buf,lev+4,off+len));	642	if (res)
446	psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len),	643	goto ERROR4;
447	"Style: %02x",temp);	644	psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp);
448	} else	645	} else
449	temp = 0x00;	646	temp = 0x00;
		647
		648	if (!(temp_style = psiconv_get_style (styles,temp))) {
		649	psiconv_warn(lev+4,off,"Unknown Style referenced");
		650	if (!(temp_style = psiconv_get_style(styles,0))) {
		651	psiconv_warn(lev+4,off,"Base style unknown");
		652	goto ERROR4;
		653	}
		654	}
		655
		656	if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph)))
		657	goto ERROR4;
450	psiconv_free_paragraph_layout(para->base_paragraph);	658	psiconv_free_paragraph_layout(para->base_paragraph);
		659	para->base_paragraph = temp_para;
		660
		661	if (!(temp_char = psiconv_clone_character_layout(temp_style->character)))
		662	goto ERROR4;
451	psiconv_free_character_layout(para->base_character);	663	psiconv_free_character_layout(para->base_character);
452	para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style	664	para->base_character = temp_char;
453	(styles,temp)->paragraph);	665
454	para->base_character = psiconv_clone_character_layout(psiconv_get_style
455	(styles,temp)->character);
456	para->base_style = temp;	666	para->base_style = temp;
457	psiconv_progress(lev+4,off+len,"Going to read paragraph layout");	667	psiconv_progress(lev+4,off+len,"Going to read paragraph layout");
458	psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,	668	if (!(psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,
459	para->base_paragraph);	669	para->base_paragraph)))
		670	goto ERROR4;
460	len += leng;	671	len += leng;
461	if (parse_styles)	672	if (parse_styles)
462	len += 1;	673	len += 1;
463	psiconv_progress(lev+4,off+len,"Going to read number of in-line "	674	psiconv_progress(lev+4,off+len,"Going to read number of in-line "
464	"layout elements");	675	"layout elements");
465	inline_count[i] = psiconv_read_u32(buf,lev+4,off+len);	676	inline_count[i] = psiconv_read_u32(buf,lev+4,off+len,&res);
		677	if (res)
		678	goto ERROR4;
466	psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]);	679	psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]);
467	len += 4;	680	len += 4;
468	}	681	}
469	}	682	}
470		683
471	psiconv_progress(lev+2,off+len,"Going to read the text layout inline list");	684	psiconv_progress(lev+2,off+len,"Going to read the text layout inline list");
472		685
473	psiconv_progress(lev+3,off+len,"Going to read the number of elements");	686	psiconv_progress(lev+3,off+len,"Going to read the number of elements");
474	nr = psiconv_read_u32(buf,lev+3,off+len);	687	nr = psiconv_read_u32(buf,lev+3,off+len,&res);
		688	if (res)
		689	goto ERROR4;
475	psiconv_debug(lev+3,off,"Elements: %08x",nr);	690	psiconv_debug(lev+3,off,"Elements: %08x",nr);
476	len += 0x04;	691	len += 0x04;
477		692
478	psiconv_progress(lev+3,off+len,	693	psiconv_progress(lev+3,off+len,
479	"Going to read the text layout inline elements");	694	"Going to read the text layout inline elements");
480	total = 0;	695	total = 0;
481	for (i = 0; i < psiconv_list_length(result); i++) {	696	for (i = 0; i < psiconv_list_length(result); i++) {
482	para = psiconv_list_get(result,i);	697	if (!(para = psiconv_list_get(result,i))) {
		698	psiconv_warn(lev+3,off+len,"Massive memory corruption");
		699	goto ERROR4;
		700	}
483	line_length = -1;	701	line_length = -1;
484	for (j = 0; j < inline_count[i]; j++) {	702	for (j = 0; j < inline_count[i]; j++) {
485	psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d",	703	psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d",
486	total,i,j);	704	total,i,j);
487	if (total >= nr) {	705	if (total >= nr) {
488	psiconv_warn(lev+3,off+len,	706	psiconv_warn(lev+3,off+len,
489	"Layout section inlines: not enough element");	707	"Layout section inlines: not enough element");
490	res = -1;
491	psiconv_debug(lev+3,off+len,"Can't read element!");	708	psiconv_debug(lev+3,off+len,"Can't read element!");
492	} else {	709	} else {
493	total ++;	710	total ++;
494	in_line.layout = psiconv_clone_character_layout(para->base_character);	711	if (!(in_line.layout = psiconv_clone_character_layout
		712	(para->base_character)))
		713	goto ERROR4;
495	psiconv_progress(lev+4,off+len,"Going to read the element type");	714	psiconv_progress(lev+4,off+len,"Going to read the element type");
496	temp = psiconv_read_u8(buf,lev+4,len+off);	715	temp = psiconv_read_u8(buf,lev+4,len+off,&res);
		716	if (res)
		717	goto ERROR4;
497	len += 1;	718	len += 1;
498	psiconv_debug(lev+4,off,"Type: %02x",temp);	719	psiconv_debug(lev+4,off,"Type: %02x",temp);
499	psiconv_progress(lev+4,off,	720	psiconv_progress(lev+4,off,
500	"Going to read the number of characters it applies to");	721	"Going to read the number of characters it applies to");
501	in_line.length = psiconv_read_u32(buf,lev+4,len+off);	722	in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res);
		723	if (res)
		724	goto ERROR4;
502	psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length);	725	psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length);
503	len += 4;	726	len += 4;
504	psiconv_progress(lev+4,off+len,"Going to read the character layout");	727	psiconv_progress(lev+4,off+len,"Going to read the character layout");
505	res \|= psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,	728	if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,
506	in_line.layout);	729	in_line.layout)))
		730	goto ERROR4;
507	len += leng;	731	len += leng;
508		732
509	if (temp == 0x01) {	733	if (temp == 0x01) {
510	psiconv_debug(lev+4,off+len,"Skipping object data");	734	psiconv_debug(lev+4,off+len,"Skipping object data");
511	len += 0x10;	735	len += 0x10;
512	} else if (temp != 0x00) {	736	} else if (temp != 0x00) {
513	psiconv_warn(lev+4,off+len,"Layout section unknown inline type");	737	psiconv_warn(lev+4,off+len,"Layout section unknown inline type");
514	res = -1;
515	}	738	}
516	if (line_length + in_line.length > strlen(para->text)) {	739	if (line_length + in_line.length > strlen(para->text)) {
517	psiconv_warn(lev+4,off+len,	740	psiconv_warn(lev+4,off+len,
518	"Layout section inlines: line length mismatch");	741	"Layout section inlines: line length mismatch");
519	res = -1;	742	res = -1;
520	in_line.length = strlen(para->text) - line_length;	743	in_line.length = strlen(para->text) - line_length;
521	}	744	}
522	line_length += in_line.length;	745	line_length += in_line.length;
523	psiconv_list_add(para->in_lines,&in_line);	746	if ((res = psiconv_list_add(para->in_lines,&in_line)))
		747	goto ERROR4;
524	}	748	}
525	}	749	}
526	}	750	}
527		751
528	if (total != nr) {	752	if (total != nr) {
…		…
531	}	755	}
532		756
533	free(inline_count);	757	free(inline_count);
534		758
535	for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {	759	for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {
536	anon_ptr = psiconv_list_get(anon_styles,i);	760	if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
		761	psiconv_warn(lev+4,off+len,"Massive memory corruption");
		762	goto ERROR2;
		763	}
537	psiconv_free_character_layout(anon_ptr->character);	764	psiconv_free_character_layout(anon_ptr->character);
538	psiconv_free_paragraph_layout(anon_ptr->paragraph);	765	psiconv_free_paragraph_layout(anon_ptr->paragraph);
539	}	766	}
540	psiconv_list_free(anon_styles);	767	psiconv_list_free(anon_styles);
541		768
…		…
543	*length = len;	770	*length = len;
544		771
545	psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x",	772	psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x",
546	len);	773	len);
547		774
		775	return 0;
		776
		777	ERROR4_4:
		778	psiconv_free_paragraph_layout(para->base_paragraph);
		779	ERROR4_3:
		780	psiconv_free_character_layout(para->base_character);
		781	ERROR4_2:
		782	psiconv_list_free(para->in_lines);
		783	ERROR4_1:
		784	free(para);
		785	goto ERROR4;
		786
		787	ERROR3_2:
		788	psiconv_free_character_layout(anon.character);
		789	ERROR3_1:
		790	psiconv_free_paragraph_layout(anon.paragraph);
		791	goto ERROR3;
		792
		793	ERROR4:
		794	free(inline_count);
		795	ERROR3:
		796	for (i = 0; i < psiconv_list_length(anon_styles); i++) {
		797	if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
		798	psiconv_warn(lev+1,off,"Massive memory corruption");
		799	break;
		800	}
		801	psiconv_free_paragraph_layout(anon_ptr->paragraph);
		802	psiconv_free_character_layout(anon_ptr->character);
		803	}
		804
		805	ERROR2:
		806	psiconv_list_free(anon_styles);
		807	ERROR1:
		808	psiconv_warn(lev+1,off,"Reading of Layout Section failed");
		809	if (length)
		810	*length = 0;
		811	if (!res)
		812	return -PSICONV_E_NOMEM;
		813	else
548	return res;	814	return res;
549	}	815	}
550		816
551	int psiconv_parse_styled_layout_section(const psiconv_buffer buf,	817	int psiconv_parse_styled_layout_section(const psiconv_buffer buf,
552	int lev,psiconv_u32 off,	818	int lev,psiconv_u32 off,
553	int *length,	819	int *length,
…		…
562	int *length,	828	int *length,
563	psiconv_text_and_layout result,	829	psiconv_text_and_layout result,
564	psiconv_character_layout base_char,	830	psiconv_character_layout base_char,
565	psiconv_paragraph_layout base_para)	831	psiconv_paragraph_layout base_para)
566	{	832	{
567	int res;	833	int res = 0;
568	psiconv_word_styles_section styles_section;	834	psiconv_word_styles_section styles_section;
569		835
570	styles_section = malloc(sizeof(*styles_section));	836	if (!(styles_section = malloc(sizeof(*styles_section))))
		837	goto ERROR1;
571	styles_section->normal = malloc(sizeof(*styles_section->normal));	838	if (!(styles_section->normal = malloc(sizeof(*styles_section->normal))))
572	styles_section->normal->character = psiconv_clone_character_layout(base_char);	839	goto ERROR2;
573	styles_section->normal->paragraph = psiconv_clone_paragraph_layout(base_para);	840	if (!(styles_section->normal->character =
		841	psiconv_clone_character_layout(base_char)))
		842	goto ERROR3;
		843	if (!(styles_section->normal->paragraph =
		844	psiconv_clone_paragraph_layout(base_para)))
		845	goto ERROR4;
574	styles_section->normal->hotkey = 0;	846	styles_section->normal->hotkey = 0;
575	styles_section->normal->name = strdup("");	847	if (!(styles_section->normal->name = strdup("")))
		848	goto ERROR5;
576	styles_section->styles = psiconv_list_new(sizeof(struct psiconv_word_style));	849	if (!(styles_section->styles = psiconv_list_new(sizeof(
		850	struct psiconv_word_style_s))))
		851	goto ERROR6;
577		852
578	res = psiconv_parse_layout_section(buf,lev,off,length,result,	853	res = psiconv_parse_layout_section(buf,lev,off,length,result,
579	styles_section,0);	854	styles_section,0);
580		855
581	psiconv_free_word_styles_section(styles_section);	856	psiconv_free_word_styles_section(styles_section);
582	return res;	857	return res;
		858
		859	ERROR6:
		860	free(styles_section->normal->name);
		861	ERROR5:
		862	psiconv_free_paragraph_layout(styles_section->normal->paragraph);
		863	ERROR4:
		864	psiconv_free_character_layout(styles_section->normal->character);
		865	ERROR3:
		866	free(styles_section->normal);
		867	ERROR2:
		868	free(styles_section);
		869	ERROR1:
		870	psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed");
		871	if (length)
		872	*length = 0;
		873	if (!res)
		874	return -PSICONV_E_NOMEM;
		875	else
		876	return res;
583	}	877	}
584		878

 Legend:



Removed from v.18
 


changed lines


 
Added in v.64
 Legend:



Removed from v.18
 


changed lines


 
Added in v.64
-Removed from v.18
+Added in v.64

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