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

 Legend:



Removed from v.41
 


changed lines


 
Added in v.65
 Legend:



Removed from v.41
 


changed lines


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

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