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

 Legend:



Removed from v.41
 


changed lines


 
Added in v.94
 Legend:



Removed from v.41
 


changed lines


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

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