/[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 20		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);
		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	}
49	if ((*result)->uid1 != PSICONV_ID_PSION5) {	62	if ((*result)->uid1 != PSICONV_ID_PSION5) {
50	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 "
51	"not a (parsable) Psion 5 file");	64	"not a (parsable) Psion 5 file");
52	res = -1;	65	res = -PSICONV_E_PARSE;
		66	goto ERROR2;
53	}	67	}
54	len += 4;	68	len += 4;
55	(*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;
56	psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2);	72	psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2);
57	len += 4;	73	len += 4;
58	(*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;
59	psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3);	77	psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3);
60	len += 4;	78	len += 4;
61		79
62	(*result)->file = psiconv_unknown_file;	80	(*result)->file = psiconv_unknown_file;
63	if ((*result)->uid1 == PSICONV_ID_PSION5) {	81	if ((*result)->uid1 == PSICONV_ID_PSION5) {
…		…
66	(*result)->file = psiconv_word_file;	84	(*result)->file = psiconv_word_file;
67	psiconv_debug(lev+2,off+len,"File is a Word file");	85	psiconv_debug(lev+2,off+len,"File is a Word file");
68	} else if ((*result)->uid3 == PSICONV_ID_TEXTED) {	86	} else if ((*result)->uid3 == PSICONV_ID_TEXTED) {
69	(*result)->file = psiconv_texted_file;	87	(*result)->file = psiconv_texted_file;
70	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");
		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");
71	}	95	}
72	} else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {	96	} else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {
73	(*result)->file = psiconv_mbm_file;	97	(*result)->file = psiconv_mbm_file;
74	if ((*result)->uid3 != 0x00)	98	if ((*result)->uid3 != 0x00)
75	psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?");	99	psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?");
…		…
80	psiconv_warn(lev+2,off+len,"Unknown file type");	104	psiconv_warn(lev+2,off+len,"Unknown file type");
81	(*result)->file = psiconv_unknown_file;	105	(*result)->file = psiconv_unknown_file;
82	}	106	}
83		107
84	psiconv_progress(lev+2,off+len,"Checking UID4");	108	psiconv_progress(lev+2,off+len,"Checking UID4");
85	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;
86	if (temp == psiconv_checkuid((result)->uid1,(result)->uid2,	112	if (temp == psiconv_checkuid((result)->uid1,(result)->uid2,
87	(*result)->uid3))	113	(*result)->uid3))
88	psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp);	114	psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp);
89	else {	115	else {
90	psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!");	116	psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!");
91	psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x",	117	psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x",
92	psiconv_checkuid((result)->uid1,(result)->uid2,	118	psiconv_checkuid((result)->uid1,(result)->uid2,
93	(*result)->uid3),temp);	119	(*result)->uid3),temp);
94	res = -1;	120	res = -PSICONV_E_PARSE;
		121	goto ERROR2;
95	}	122	}
96	len += 4;	123	len += 4;
97		124
		125	DONE:
98	if (length)	126	if (length)
99	*length = len;	127	*length = len;
100		128
101	psiconv_progress(lev+1,off+len-1,	129	psiconv_progress(lev+1,off+len-1,
102	"End of Header Section (total length: %08x)",len);	130	"End of Header Section (total length: %08x)",len);
103		131
104	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;
105	}	144	}
106		145
107	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,
108	psiconv_u32 off, int *length,	147	psiconv_u32 off, int *length,
109	psiconv_section_table_section *result)	148	psiconv_section_table_section *result)
…		…
114		153
115	int i;	154	int i;
116	psiconv_u8 nr;	155	psiconv_u8 nr;
117		156
118	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");
119	result = psiconv_list_new(sizeof(entry));	158	if (!(result = psiconv_list_new(sizeof(entry))))
		159	goto ERROR1;
120		160
121	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");
122	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;
123	psiconv_debug(lev+2,off+len,"Length: %08x",nr);	165	psiconv_debug(lev+2,off+len,"Length: %08x",nr);
124	if (nr & 0x01) {	166	if (nr & 0x01) {
125	psiconv_warn(lev+2,off+len,	167	psiconv_warn(lev+2,off+len,
126	"Section table length odd - ignoring last entry");	168	"Section table length odd - ignoring last entry");
127	res = -1;
128	}	169	}
129	len ++;	170	len ++;
130		171
131	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");
132	entry = malloc(sizeof(*entry));	173	entry = malloc(sizeof(*entry));
133	for (i = 0; i < nr / 2; i++) {	174	for (i = 0; i < nr / 2; i++) {
134	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;
135	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);
136	len += 0x04;	179	len += 0x04;
137	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;
138	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);
139	len += 0x04;	184	len += 0x04;
140	psiconv_list_add(*result,entry);	185	if ((res=psiconv_list_add(*result,entry)))
		186	goto ERROR3;
141	}	187	}
142		188
143	free(entry);	189	free(entry);
144		190
145	if (length)	191	if (length)
146	*length = len;	192	*length = len;
147		193
148	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 "
149	"(total length: %08x", len);	195	"(total length: %08x)", len);
150		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
151	return res;	209	return res;
152	}	210	}
153		211
154	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,
155	psiconv_u32 off, int *length,	213	psiconv_u32 off, int *length,
156	psiconv_application_id_section *result)	214	psiconv_application_id_section *result)
…		…
158	int res=0;	216	int res=0;
159	int len=0;	217	int len=0;
160	int leng;	218	int leng;
161		219
162	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");
163	(result) = malloc(sizeof(*result));	221	if (!(result = malloc(sizeof(*result))))
		222	goto ERROR1;
164		223
165	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");
166	(*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;
167	psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id);	228	psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id);
168	len += 4;	229	len += 4;
169		230
170	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");
171	(*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;
172	len += leng;	235	len += leng;
173		236
174	if (length)	237	if (length)
175	*length = len;	238	*length = len;
176		239
177	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 "
178	"(total length: %08x", len);	241	"(total length: %08x", len);
179		242
180	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;
181	}	254	}
182		255
183	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,
184	int length,psiconv_text_and_layout result)	257	int length,psiconv_text_and_layout result)
185	{	258	{
…		…
189		262
190	psiconv_u32 text_len;	263	psiconv_u32 text_len;
191	psiconv_paragraph para;	264	psiconv_paragraph para;
192		265
193	int nr;	266	int nr;
194	int i,j,start,leng;	267	int i,j,start,leng,temp;
195	char *str_copy;	268	char *str_copy;
196		269
197	psiconv_progress(lev+1,off,"Going to parse the text section");	270	psiconv_progress(lev+1,off,"Going to parse the text section");
198	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
199	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;
200	psiconv_debug(lev+2,off,"Length: %08x",text_len);	281	psiconv_debug(lev+2,off,"Length: %08x",text_len);
201	len += leng;	282	len += leng;
202
203	result = psiconv_list_new(sizeof(para));
204	para = malloc(sizeof(*para));
205		283
206	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");
207	nr = 0;	285	nr = 0;
208	start = 0;	286	start = 0;
209	for (i = 0; i < text_len; i++)	287	for (i = 0; i < text_len; i++) {
210	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) {
211	para->text = malloc(i - start + 1);	292	if (!(para->text = malloc(i - start + 1)))
		293	goto ERROR3;
212	for (j = 0; j < i - start; j++)	294	for (j = 0; j < i - start; j++) {
213	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	}
214	para->text[j] = 0;	300	para->text[j] = 0;
215		301
216	psiconv_list_add(*result,para);	302	if ((res = psiconv_list_add(*result,para)))
		303	goto ERROR4;
217		304
218	str_copy = psiconv_make_printable(para->text);	305	if (!(str_copy = psiconv_make_printable(para->text)))
		306	goto ERROR3;
219	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,
220	strlen(str_copy) +1);	308	strlen(str_copy) +1);
221	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);
222	free(str_copy);	310	free(str_copy);
223		311
224	start = i + 1;	312	start = i + 1;
225	nr ++;	313	nr ++;
226	}	314	}
		315	}
227		316
228	if (start != text_len) {	317	if (start != text_len) {
229	res = -1;
230	psiconv_warn(lev+2,off+start+len,	318	psiconv_warn(lev+2,off+start+len,
231	"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);
232	para->text = malloc(text_len - start + 1);	320	if (!(para->text = malloc(text_len - start + 1)))
		321	goto ERROR3;
233	for (j = 0; j < text_len - start; j++)	322	for (j = 0; j < text_len - start; j++) {
234	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	}
235	para->text[text_len - start] = 0;	328	para->text[text_len - start] = 0;
236	psiconv_list_add(*result,para);	329	if ((res = psiconv_list_add(*result,para)))
		330	goto ERROR4;
237	str_copy = psiconv_make_printable(para->text);	331	if (!(str_copy = psiconv_make_printable(para->text)))
		332	goto ERROR3;
238	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,
239	strlen(str_copy)+1);	334	strlen(str_copy)+1);
240	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);
241	free(str_copy);	336	free(str_copy);
242	}	337	}
243		338
244	free(para);	339	free(para);
245		340
246	/* Initialize the remaining parts of each paragraph */	341	/* Initialize the remaining parts of each paragraph */
247	for (i = 0; i < psiconv_list_length(*result); i ++) {	342	for (i = 0; i < psiconv_list_length(*result); i ++) {
248	para = psiconv_list_get(*result,i);	343	if (!(para = psiconv_list_get(*result,i))) {
249	para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout));	344	psiconv_warn(lev+2,off+len,"Massive memory corruption");
250	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;
251	para->base_style = 0;	357	para->base_style = 0;
252	para->base_character = psiconv_basic_character_layout();
253	para->base_paragraph = psiconv_basic_paragraph_layout();
254	}	358	}
255		359
256		360
257	len += text_len;	361	len += text_len;
258		362
…		…
261		365
262	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",
263	len);	367	len);
264		368
265	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;
266	}	411	}
267		412
268	/* 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 */
269	int psiconv_parse_layout_section(const psiconv_buffer buf,	414	int psiconv_parse_layout_section(const psiconv_buffer buf,
270	int lev,psiconv_u32 off,	415	int lev,psiconv_u32 off,
…		…
276	int res = 0;	421	int res = 0;
277	int len = 0;	422	int len = 0;
278	psiconv_u32 temp;	423	psiconv_u32 temp;
279	int parse_styles,nr,i,j,total,leng,line_length;	424	int parse_styles,nr,i,j,total,leng,line_length;
280		425
281	typedef struct anon_style	426	typedef struct anon_style_s
282	{	427	{
283	int nr;	428	int nr;
284	psiconv_s16 base_style;	429	psiconv_s16 base_style;
285	psiconv_character_layout character;	430	psiconv_character_layout character;
286	psiconv_paragraph_layout paragraph;	431	psiconv_paragraph_layout paragraph;
287	} *anon_style;	432	} *anon_style;
288		433
289	typedef psiconv_list anon_style_list; /* of struct anon_style */	434	typedef psiconv_list anon_style_list; /* of struct anon_style */
290		435
291	anon_style_list anon_styles;	436	anon_style_list anon_styles;
292	struct anon_style anon;	437	struct anon_style_s anon;
293	anon_style anon_ptr=NULL;	438	anon_style anon_ptr=NULL;
294		439
		440	psiconv_character_layout temp_char;
		441	psiconv_paragraph_layout temp_para;
		442	psiconv_word_style temp_style;
295	psiconv_paragraph para;	443	psiconv_paragraph para;
296	struct psiconv_in_line_layout in_line;	444	struct psiconv_in_line_layout_s in_line;
297		445
298	int *inline_count;	446	int *inline_count;
299		447
300		448
301	psiconv_progress(lev+1,off,"Going to read the layout section");	449	psiconv_progress(lev+1,off,"Going to read the layout section");
302		450
303	psiconv_progress(lev+2,off,"Going to read the section type");	451	psiconv_progress(lev+2,off,"Going to read the section type");
304	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;
305	psiconv_debug(lev+2,off+len,"Type: %02x",temp);	455	psiconv_debug(lev+2,off+len,"Type: %02x",temp);
306	parse_styles = with_styles;	456	parse_styles = with_styles;
307	if ((temp == 0x0001) && !with_styles) {	457	if ((temp == 0x0001) && !with_styles) {
308	psiconv_warn(lev+2,off+len,"Styleless layout section expected, "	458	psiconv_warn(lev+2,off+len,"Styleless layout section expected, "
309	"but styled section found!");	459	"but styled section found!");
310	parse_styles = 1;	460	parse_styles = 1;
311	res = -1;
312	} else if ((temp == 0x0000) && (with_styles)) {	461	} else if ((temp == 0x0000) && (with_styles)) {
313	psiconv_warn(lev+2,off+len,"Styled layout section expected, "	462	psiconv_warn(lev+2,off+len,"Styled layout section expected, "
314	"but styleless section found!");	463	"but styleless section found!");
315	parse_styles = 0;	464	parse_styles = 0;
316	res = -1;
317	} else if ((temp != 0x0000) && (temp != 0x0001)) {	465	} else if ((temp != 0x0000) && (temp != 0x0001)) {
318	psiconv_warn(lev+2,off+len,	466	psiconv_warn(lev+2,off+len,
319	"Layout section type indicator has unknown value!");	467	"Layout section type indicator has unknown value!");
320	res = -1;
321	}	468	}
322	len += 0x02;	469	len += 0x02;
323		470
324	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");
325	anon_styles = psiconv_list_new(sizeof(anon));	472	if (!(anon_styles = psiconv_list_new(sizeof(anon))))
		473	goto ERROR1;
326	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");
327	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;
328	psiconv_debug(lev+3,off+len,"Length: %02x",nr);	478	psiconv_debug(lev+3,off+len,"Length: %02x",nr);
329	len ++;	479	len ++;
330		480
331	psiconv_progress(lev+3,off+len,	481	psiconv_progress(lev+3,off+len,
332	"Going to read the paragraph type list elements");	482	"Going to read the paragraph type list elements");
333	for (i = 0; i < nr; i ++) {	483	for (i = 0; i < nr; i ++) {
334	psiconv_progress(lev+3,off+len,"Element %d",i);	484	psiconv_progress(lev+3,off+len,"Element %d",i);
335	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;
336	psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr);	488	psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr);
337	len += 0x04;	489	len += 0x04;
338		490
339	psiconv_progress(lev+4,off,"Going to determine the base style");	491	psiconv_progress(lev+4,off,"Going to determine the base style");
340	if (parse_styles) {	492	if (parse_styles) {
		493	temp = psiconv_read_u32(buf,lev+4, off+len,&res);
		494	if (res)
		495	goto ERROR3;
341	anon.base_style = psiconv_read_u8(buf,lev+3,	496	anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res);
342	off+len+4+psiconv_read_u32(buf,lev+4,	497	if (res)
343	off+len));	498	goto ERROR3;
344	psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len),	499	psiconv_debug(lev+4,off+len+temp,
345	"Style indicator: %02x",anon.base_style);	500	"Style indicator: %02x",anon.base_style);
346	} else	501	} else
347	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	}
348	anon.paragraph = psiconv_clone_paragraph_layout(psiconv_get_style	510	if (!(anon.paragraph = psiconv_clone_paragraph_layout
349	(styles,anon.base_style)->paragraph);	511	(temp_style->paragraph)))
		512	goto ERROR3;
350	anon.character = psiconv_clone_character_layout(psiconv_get_style	513	if (!(anon.character = psiconv_clone_character_layout
351	(styles,anon.base_style)->character);	514	(temp_style->character)))
		515	goto ERROR3_1;
352		516
353	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");
354	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,
355	anon.paragraph);	519	anon.paragraph)))
		520	goto ERROR3_2;
356	len += leng;	521	len += leng;
357	if (parse_styles)	522	if (parse_styles)
358	len ++;	523	len ++;
359		524
360	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");
361	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,
362	anon.character);	527	anon.character)))
		528	goto ERROR3_2;
363	len += leng;	529	len += leng;
364	psiconv_list_add(anon_styles,&anon);	530	if ((res = psiconv_list_add(anon_styles,&anon)))
		531	goto ERROR3_2;
365	}	532	}
366		533
367	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");
368	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");
369	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;
370	if (nr != psiconv_list_length(result)) {	539	if (nr != psiconv_list_length(result)) {
371	psiconv_warn(lev+3,off+len,	540	psiconv_warn(lev+3,off+len,
372	"Number of text paragraphs and paragraph elements does not match");	541	"Number of text paragraphs and paragraph elements does not match");
373	psiconv_debug(lev+3,off+len,	542	psiconv_debug(lev+3,off+len,
374	"%d text paragraphs, %d paragraph elements",	543	"%d text paragraphs, %d paragraph elements",
375	psiconv_list_length(result),nr);	544	psiconv_list_length(result),nr);
376	}	545	}
377	psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr);	546	psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr);
378	len += 4;	547	len += 4;
379	inline_count = malloc(nr * sizeof(*inline_count));	548	if (!(inline_count = malloc(nr * sizeof(*inline_count))))
		549	goto ERROR3;
380		550
381	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");
382	for (i = 0; i < nr; i ++) {	552	for (i = 0; i < nr; i ++) {
383	psiconv_progress(lev+3,off+len,"Element %d",i);	553	psiconv_progress(lev+3,off+len,"Element %d",i);
384	if (i >= psiconv_list_length(result)) {	554	if (i >= psiconv_list_length(result)) {
385	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");
386	para = malloc(sizeof(*para));	556	if (!(para = malloc(sizeof(*para))))
387	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;
388	para->base_style = 0;	561	para->base_style = 0;
389	para->base_character = psiconv_basic_character_layout();	562	if (!(para->base_character = psiconv_basic_character_layout()))
		563	goto ERROR4_2;
390	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;
391	free(para);	568	free(para);
392	}	569	}
393	para = psiconv_list_get(result,i);	570	if (!(para = psiconv_list_get(result,i)))
		571	goto ERROR4;
394		572
395	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");
396	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;
397	if (temp != strlen(para->text)+1) {	577	if (temp != strlen(para->text)+1) {
398	res = -1;
399	psiconv_warn(lev+4,off+len,	578	psiconv_warn(lev+4,off+len,
400	"Disagreement of the length of paragraph in layout section");	579	"Disagreement of the length of paragraph in layout section");
401	psiconv_debug(lev+4,off+len,	580	psiconv_debug(lev+4,off+len,
402	"Paragraph length: layout section says %d, counted %d",	581	"Paragraph length: layout section says %d, counted %d",
403	temp,strlen(para->text)+1);	582	temp,strlen(para->text)+1);
404	} else	583	} else
405	psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp);	584	psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp);
406	len += 4;	585	len += 4;
407		586
408	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");
409	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;
410	if (temp != 0x00) {	591	if (temp != 0x00) {
411	psiconv_debug(lev+4,off+len,"Type: %02x",temp);	592	psiconv_debug(lev+4,off+len,"Type: %02x",temp);
412	for (j = 0; j < psiconv_list_length(anon_styles); j++) {	593	for (j = 0; j < psiconv_list_length(anon_styles); j++) {
413	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	}
414	if (temp == anon_ptr->nr)	598	if (temp == anon_ptr->nr)
415	break;	599	break;
416	}	600	}
417	if (j == psiconv_list_length(anon_styles)) {	601	if (j == psiconv_list_length(anon_styles)) {
418	psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown");	602	psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown");
419	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");
420	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;
421	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;
422	psiconv_free_character_layout(para->base_character);	618	psiconv_free_character_layout(para->base_character);
423	para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style	619	para->base_character = temp_char;
424	(styles,0)->paragraph);
425	para->base_character = psiconv_clone_character_layout(psiconv_get_style
426	(styles,0)->character);
427	} else {	620	} else {
428	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;
429	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;
430	psiconv_free_character_layout(para->base_character);	629	psiconv_free_character_layout(para->base_character);
431	para->base_paragraph = psiconv_clone_paragraph_layout	630	para->base_character = temp_char;
432	(anon_ptr->paragraph);
433	para->base_character = psiconv_clone_character_layout
434	(anon_ptr->character);
435	}	631	}
436	inline_count[i] = 0;	632	inline_count[i] = 0;
437	len += 0x01;	633	len += 0x01;
438	} else {	634	} else {
439	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)"
440	,temp);	636	,temp);
441	len += 0x01;	637	len += 0x01;
442	if (parse_styles) {	638	if (parse_styles) {
443	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,
444	"Going to read the paragraph element base style");	643	"Going to read the paragraph element base style");
445	temp = psiconv_read_u8(buf,lev+4,	644	temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res);
446	off+len+psiconv_read_u32(buf,lev+4,off+len));	645	if (res)
447	psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len),	646	goto ERROR4;
448	"Style: %02x",temp);	647	psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp);
449	} else	648	} else
450	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;
451	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;
452	psiconv_free_character_layout(para->base_character);	666	psiconv_free_character_layout(para->base_character);
453	para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style	667	para->base_character = temp_char;
454	(styles,temp)->paragraph);	668
455	para->base_character = psiconv_clone_character_layout(psiconv_get_style
456	(styles,temp)->character);
457	para->base_style = temp;	669	para->base_style = temp;
458	psiconv_progress(lev+4,off+len,"Going to read paragraph layout");	670	psiconv_progress(lev+4,off+len,"Going to read paragraph layout");
459	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,
460	para->base_paragraph);	672	para->base_paragraph)))
		673	goto ERROR4;
461	len += leng;	674	len += leng;
462	if (parse_styles)	675	if (parse_styles)
463	len += 1;	676	len += 1;
464	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 "
465	"layout elements");	678	"layout elements");
466	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;
467	psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]);	682	psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]);
468	len += 4;	683	len += 4;
469	}	684	}
470	}	685	}
471		686
472	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");
473		688
474	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");
475	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;
476	psiconv_debug(lev+3,off,"Elements: %08x",nr);	693	psiconv_debug(lev+3,off+len,"Elements: %08x",nr);
477	len += 0x04;	694	len += 0x04;
478		695
479	psiconv_progress(lev+3,off+len,	696	psiconv_progress(lev+3,off+len,
480	"Going to read the text layout inline elements");	697	"Going to read the text layout inline elements");
481	total = 0;	698	total = 0;
482	for (i = 0; i < psiconv_list_length(result); i++) {	699	for (i = 0; i < psiconv_list_length(result); i++) {
483	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	}
484	line_length = -1;	704	line_length = -1;
485	for (j = 0; j < inline_count[i]; j++) {	705	for (j = 0; j < inline_count[i]; j++) {
486	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",
487	total,i,j);	707	total,i,j);
488	if (total >= nr) {	708	if (total >= nr) {
489	psiconv_warn(lev+3,off+len,	709	psiconv_warn(lev+3,off+len,
490	"Layout section inlines: not enough element");	710	"Layout section inlines: not enough element");
491	res = -1;
492	psiconv_debug(lev+3,off+len,"Can't read element!");	711	psiconv_debug(lev+3,off+len,"Can't read element!");
493	} else {	712	} else {
494	total ++;	713	total ++;
495	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;
496	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");
497	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;
498	len += 1;	721	len += 1;
499	psiconv_debug(lev+4,off,"Type: %02x",temp);	722	psiconv_debug(lev+4,off+len,"Type: %02x",temp);
500	psiconv_progress(lev+4,off,	723	psiconv_progress(lev+4,off+len,
501	"Going to read the number of characters it applies to");	724	"Going to read the number of characters it applies to");
502	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;
503	psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length);	728	psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length);
504	len += 4;	729	len += 4;
505	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");
506	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,
507	in_line.layout);	732	in_line.layout)))
		733	goto ERROR4;
508	len += leng;	734	len += leng;
509		735
510	if (temp == 0x01) {	736	if (temp == 0x01) {
511	psiconv_debug(lev+4,off+len,"Skipping object data");	737	psiconv_debug(lev+4,off+len,"Skipping object data");
512	len += 0x10;	738	len += 0x10;
513	} else if (temp != 0x00) {	739	} else if (temp != 0x00) {
514	psiconv_warn(lev+4,off+len,"Layout section unknown inline type");	740	psiconv_warn(lev+4,off+len,"Layout section unknown inline type");
515	res = -1;
516	}	741	}
517	if (line_length + in_line.length > strlen(para->text)) {	742	if (line_length + in_line.length > strlen(para->text)) {
518	psiconv_warn(lev+4,off+len,	743	psiconv_warn(lev+4,off+len,
519	"Layout section inlines: line length mismatch");	744	"Layout section inlines: line length mismatch");
520	res = -1;	745	res = -1;
521	in_line.length = strlen(para->text) - line_length;	746	in_line.length = strlen(para->text) - line_length;
522	}	747	}
523	line_length += in_line.length;	748	line_length += in_line.length;
524	psiconv_list_add(para->in_lines,&in_line);	749	if ((res = psiconv_list_add(para->in_lines,&in_line)))
		750	goto ERROR4;
525	}	751	}
526	}	752	}
527	}	753	}
528		754
529	if (total != nr) {	755	if (total != nr) {
…		…
532	}	758	}
533		759
534	free(inline_count);	760	free(inline_count);
535		761
536	for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {	762	for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {
537	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	}
538	psiconv_free_character_layout(anon_ptr->character);	767	psiconv_free_character_layout(anon_ptr->character);
539	psiconv_free_paragraph_layout(anon_ptr->paragraph);	768	psiconv_free_paragraph_layout(anon_ptr->paragraph);
540	}	769	}
541	psiconv_list_free(anon_styles);	770	psiconv_list_free(anon_styles);
542		771
543	if (length)	772	if (length)
544	*length = len;	773	*length = len;
545		774
546	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)",
547	len);	776	len);
548		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
549	return res;	817	return res;
550	}	818	}
551		819
552	int psiconv_parse_styled_layout_section(const psiconv_buffer buf,	820	int psiconv_parse_styled_layout_section(const psiconv_buffer buf,
553	int lev,psiconv_u32 off,	821	int lev,psiconv_u32 off,
554	int *length,	822	int *length,
…		…
557	{	825	{
558	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);
559	}	827	}
560		828
561	int psiconv_parse_styleless_layout_section(const psiconv_buffer buf,	829	int psiconv_parse_styleless_layout_section(const psiconv_buffer buf,
562	int lev,psiconv_u32 off,	830	int lev,psiconv_u32 off,
563	int *length,	831	int *length,
564	psiconv_text_and_layout result,	832	psiconv_text_and_layout result,
565	psiconv_character_layout base_char,	833	const psiconv_character_layout base_char,
566	psiconv_paragraph_layout base_para)	834	const psiconv_paragraph_layout base_para)
567	{	835	{
568	int res;	836	int res = 0;
569	psiconv_word_styles_section styles_section;	837	psiconv_word_styles_section styles_section;
570		838
571	styles_section = malloc(sizeof(*styles_section));	839	if (!(styles_section = malloc(sizeof(*styles_section))))
		840	goto ERROR1;
572	styles_section->normal = malloc(sizeof(*styles_section->normal));	841	if (!(styles_section->normal = malloc(sizeof(*styles_section->normal))))
573	styles_section->normal->character = psiconv_clone_character_layout(base_char);	842	goto ERROR2;
574	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;
575	styles_section->normal->hotkey = 0;	849	styles_section->normal->hotkey = 0;
576	styles_section->normal->name = strdup("");	850	if (!(styles_section->normal->name = strdup("")))
		851	goto ERROR5;
577	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;
578		855
579	res = psiconv_parse_layout_section(buf,lev,off,length,result,	856	res = psiconv_parse_layout_section(buf,lev,off,length,result,
580	styles_section,0);	857	styles_section,0);
581		858
582	psiconv_free_word_styles_section(styles_section);	859	psiconv_free_word_styles_section(styles_section);
583	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;
584	}	880	}
585		881

 Legend:



Removed from v.20
 


changed lines


 
Added in v.94
 Legend:



Removed from v.20
 


changed lines


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

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