/[public]/psiconv/tags/rel-0-9-9/lib/psiconv/parse_driver.c

Diff of /psiconv/tags/rel-0-9-9/lib/psiconv/parse_driver.c

Parent Directory | Revision Log | View Patch Patch

Revision 24		Revision 237
1	/*	1	/*
2	parse_driver.c - Part of psiconv, a PSION 5 file formats converter	2	parse_driver.c - Part of psiconv, a PSION 5 file formats converter
3	Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl>	3	Copyright (c) 1999-2004 Frodo Looijaard <frodol@dds.nl>
4		4
5	This program is free software; you can redistribute it and/or modify	5	This program is free software; you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by	6	it under the terms of the GNU General Public License as published by
7	the Free Software Foundation; either version 2 of the License, or	7	the Free Software Foundation; either version 2 of the License, or
8	(at your option) any later version.	8	(at your option) any later version.
…		…
16	along with this program; if not, write to the Free Software	16	along with this program; if not, write to the Free Software
17	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	17	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18	*/	18	*/
19		19
20	#include "config.h"	20	#include "config.h"
		21	#include "compat.h"
		22
21	#include <stdlib.h>	23	#include <stdlib.h>
		24	#include <string.h>
22		25
23	#include "parse.h"	26	#include "parse.h"
24	#include "parse_routines.h"	27	#include "parse_routines.h"
25	#include "data.h"	28	#include "unicode.h"
26		29
27	psiconv_file_type_t psiconv_file_type(psiconv_buffer buf,int *length,	30	#ifdef DMALLOC
		31	#include <dmalloc.h>
		32	#endif
		33
		34	/* Compare whether application id names match.
		35	Sought must be lower case; the comparison is case insensitive */
		36	static psiconv_bool_t applid_matches(psiconv_string_t found,
		37	const char *sought)
		38	{
		39	int i;
		40	if (psiconv_unicode_strlen(found) != strlen(sought))
		41	return psiconv_bool_false;
		42	for (i = 0; i < strlen(sought); i++)
		43	if ((found[i] != sought[i]) &&
		44	((sought[i] < 'a') \|\| (sought[i] > 'z') \|\|
		45	(found[i] != sought[i] + 'A' - 'a')))
		46	return psiconv_bool_false;
		47	return psiconv_bool_true;
		48	}
		49
		50	psiconv_file_type_t psiconv_file_type(const psiconv_config config,
		51	psiconv_buffer buf,int *length,
28	psiconv_header_section *result)	52	psiconv_header_section *result)
29	{	53	{
30	psiconv_header_section header;	54	psiconv_header_section header;
31	psiconv_file_type_t res;	55	psiconv_file_type_t res;
32	int leng;	56	int leng;
33		57
34	psiconv_parse_header_section(buf,0,0,&leng,&header);	58	if ((psiconv_parse_header_section(config,buf,0,0,&leng,&header)))
		59	return psiconv_unknown_file;
35	res = header->file;	60	res = header->file;
36	if (result)	61	if (result)
37	*result = header;	62	*result = header;
38	else	63	else
39	psiconv_free_header_section(header);	64	psiconv_free_header_section(header);
40	if (length)	65	if (length)
41	*length = leng;	66	*length = leng;
42	return res;	67	return res;
43	}	68	}
44		69
45	int psiconv_parse(const psiconv_buffer buf,psiconv_file *result)	70	int psiconv_parse(const psiconv_config config,const psiconv_buffer buf,
		71	psiconv_file *result)
46	{	72	{
47	int res=0;	73	int res=0;
48	int lev=0;	74	int lev=0;
49	int off=0;	75	int off=0;
50	int leng;	76	int leng;
51		77
52	(result) = malloc(sizeof(*result));	78	if (!((result) = malloc(sizeof(*result))))
		79	goto ERROR1;
53		80
54	(*result)->type = psiconv_file_type(buf,&leng,NULL);	81	(*result)->type = psiconv_file_type(config,buf,&leng,NULL);
55	if ((*result)->type == psiconv_unknown_file) {	82	if ((*result)->type == psiconv_unknown_file) {
56	psiconv_warn(lev+1,off,"Unknown file type: can't parse!");	83	psiconv_warn(config,lev+1,off,"Unknown file type: can't parse!");
57	(*result)->file = NULL;	84	(*result)->file = NULL;
58	res = -1;
59	} else if ((*result)->type == psiconv_word_file)	85	} else if ((*result)->type == psiconv_word_file)
60	res = psiconv_parse_word_file(buf,lev+2,leng,	86	res = psiconv_parse_word_file(config,buf,lev+2,leng,
61	(psiconv_word_f )(&((result)->file)));	87	(psiconv_word_f )(&((result)->file)));
62	else if ((*result)->type == psiconv_texted_file)	88	else if ((*result)->type == psiconv_texted_file)
63	res = psiconv_parse_texted_file(buf,lev+2,leng,	89	res = psiconv_parse_texted_file(config,buf,lev+2,leng,
64	(psiconv_texted_f )(&((result)->file)));	90	(psiconv_texted_f )(&((result)->file)));
65	else if ((*result)->type == psiconv_mbm_file)	91	else if ((*result)->type == psiconv_mbm_file)
66	res = psiconv_parse_mbm_file(buf,lev+2,leng,	92	res = psiconv_parse_mbm_file(config,buf,lev+2,leng,
67	(psiconv_mbm_f )(&((result)->file)));	93	(psiconv_mbm_f )(&((result)->file)));
68	else if ((*result)->type == psiconv_sketch_file)	94	else if ((*result)->type == psiconv_sketch_file)
69	res = psiconv_parse_sketch_file(buf,lev+2,leng,	95	res = psiconv_parse_sketch_file(config,buf,lev+2,leng,
70	(psiconv_sketch_f )(&((result)->file)));	96	(psiconv_sketch_f )(&((result)->file)));
		97	else if ((*result)->type == psiconv_clipart_file)
		98	res = psiconv_parse_clipart_file(config,buf,lev+2,leng,
		99	(psiconv_clipart_f )(&((result)->file)));
		100	else if ((*result)->type == psiconv_sheet_file)
		101	res = psiconv_parse_sheet_file(config,buf,lev+2,leng,
		102	(psiconv_sheet_f )(&((result)->file)));
71	else {	103	else {
72	psiconv_warn(lev+1,off,"Can't parse this file yet!");	104	psiconv_warn(config,lev+1,off,"Can't parse this file yet!");
73	(*result)->file = NULL;	105	(*result)->file = NULL;
74	}	106	}
75	res = -1;	107	if (res)
		108	goto ERROR2;
		109	return 0;
76		110
		111	ERROR2:
		112	free(*result);
		113	ERROR1:
		114	psiconv_error(config,lev+1,off,"Reading of Psion File failed");
		115	if (res == 0)
		116	return -PSICONV_E_NOMEM;
		117	else
		118	return res;
		119	}
		120
		121	int psiconv_parse_clipart_file(const psiconv_config config,
		122	const psiconv_buffer buf,int lev,
		123	psiconv_u32 off, psiconv_clipart_f *result)
		124	{
		125	int res=0;
		126	int i;
		127	psiconv_jumptable_section table;
		128	psiconv_clipart_section clipart;
		129	psiconv_u32 *entry;
		130
		131	psiconv_progress(config,lev+1,off,"Going to read a clipart file");
		132	if (!((result) = malloc(sizeof(*result))))
		133	goto ERROR1;
		134
		135	psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
		136	if ((res = psiconv_parse_jumptable_section(config,buf,lev+2,off, NULL,&table)))
		137	goto ERROR2;
		138
		139	psiconv_progress(config,lev+2,off,"Going to read the clipart sections");
		140	if (!((result)->sections = psiconv_list_new(sizeof(clipart))))
		141	goto ERROR3;
		142	for (i = 0; i < psiconv_list_length(table); i ++) {
		143	if (!(entry = psiconv_list_get(table,i)))
		144	goto ERROR4;
		145	psiconv_progress(config,lev+3,off,"Going to read clipart section %i",i);
		146	if ((res = psiconv_parse_clipart_section(config,buf,lev+3,*entry,NULL,&clipart)))
		147	goto ERROR4;
		148	if ((res = psiconv_list_add((*result)->sections,clipart)))
		149	goto ERROR5;
		150	free(clipart);
		151	}
		152
		153	psiconv_free_jumptable_section(table);
		154	psiconv_progress(config,lev+1,off,"End of clipart file");
77	return res;	155	return res;
		156	ERROR5:
		157	psiconv_free_clipart_section(clipart);
		158	ERROR4:
		159	for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
		160	if (!(clipart = psiconv_list_get((*result)->sections,i))) {
		161	psiconv_error(config,lev+1,off,"Data structure corruption");
		162	goto ERROR3;
		163	}
		164	psiconv_free_clipart_section(clipart);
		165	}
		166	psiconv_list_free((*result)->sections);
		167	ERROR3:
		168	psiconv_free_jumptable_section(table);
		169	ERROR2:
		170	free(*result);
		171	ERROR1:
		172	psiconv_error(config,lev+1,off,"Reading of Clipart File failed");
		173	if (res == 0)
		174	return -PSICONV_E_NOMEM;
		175	else
		176	return res;
78	}	177	}
79		178
80	int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off,	179	int psiconv_parse_mbm_file(const psiconv_config config,
		180	const psiconv_buffer buf,int lev, psiconv_u32 off,
81	psiconv_mbm_f *result)	181	psiconv_mbm_f *result)
82	{	182	{
83	int res=0;	183	int res=0;
84	int i;	184	int i;
85	psiconv_mbm_jumptable_section table;	185	psiconv_jumptable_section table;
86	psiconv_paint_data_section paint;	186	psiconv_paint_data_section paint;
87	psiconv_u32 *entry;	187	psiconv_u32 *entry;
88	psiconv_u32 sto;	188	psiconv_u32 sto;
89		189
90	psiconv_progress(lev+1,off,"Going to read a mbm file");	190	psiconv_progress(config,lev+1,off,"Going to read a mbm file");
91	result = malloc(sizeof(*result));	191	if (!(result = malloc(sizeof(*result))))
		192	goto ERROR1;
92		193
93	psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable");	194	psiconv_progress(config,lev+2,off,"Going to read the offset of the MBM jumptable");
94	sto = psiconv_read_u32(buf,lev+2,off);	195	sto = psiconv_read_u32(config,buf,lev+2,off,&res);
		196	if (res)
		197	goto ERROR2;
95	psiconv_debug(lev+2,off,"Offset: %08x",sto);	198	psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
96		199
97	psiconv_progress(lev+2,off,"Going to read the MBM jumptable");	200	psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
98	res \|= psiconv_parse_mbm_jumptable_section(buf,lev+2,sto, NULL,&table);	201	if ((res = psiconv_parse_jumptable_section(config,buf,lev+2,sto, NULL,&table)))
		202	goto ERROR2;
99		203
100	psiconv_progress(lev+2,off,"Going to read the picture sections");	204	psiconv_progress(config,lev+2,off,"Going to read the picture sections");
101	(result)->sections = psiconv_list_new(sizeof(paint));	205	if (!((result)->sections = psiconv_list_new(sizeof(paint))))
		206	goto ERROR3;
102	for (i = 0; i < psiconv_list_length(table); i ++) {	207	for (i = 0; i < psiconv_list_length(table); i ++) {
103	entry = psiconv_list_get(table,i);	208	if (!(entry = psiconv_list_get(table,i)))
		209	goto ERROR4;
104	psiconv_progress(lev+3,off,"Going to read picture section %i",i);	210	psiconv_progress(config,lev+3,off,"Going to read picture section %i",i);
105	psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,&paint);	211	if ((res = psiconv_parse_paint_data_section(config,buf,lev+3,*entry,NULL,
		212	0,&paint)))
		213	goto ERROR4;
106	psiconv_list_add((*result)->sections,paint);	214	if ((res = psiconv_list_add((*result)->sections,paint)))
		215	goto ERROR5;
		216	free(paint);
107	}	217	}
108		218
109	psiconv_free_mbm_jumptable_section(table);	219	psiconv_free_jumptable_section(table);
110	psiconv_progress(lev+1,off,"End of mbm file");	220	psiconv_progress(config,lev+1,off,"End of mbm file");
		221	return 0;
		222	ERROR5:
		223	psiconv_free_paint_data_section(paint);
		224	ERROR4:
		225	for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
		226	if (!(paint = psiconv_list_get((*result)->sections,i))) {
		227	psiconv_error(config,lev+1,off,"Data structure corruption");
		228	goto ERROR3;
		229	}
		230	psiconv_free_paint_data_section(paint);
		231	}
		232	psiconv_list_free((*result)->sections);
		233	ERROR3:
		234	psiconv_free_jumptable_section(table);
		235	ERROR2:
		236	free(*result);
		237	ERROR1:
		238	psiconv_error(config,lev+1,off,"Reading of MBM File failed");
		239	if (res == 0)
		240	return -PSICONV_E_NOMEM;
		241	else
111	return res;	242	return res;
112	}	243	}
113		244
114	int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev,	245	int psiconv_parse_sketch_file(const psiconv_config config,
		246	const psiconv_buffer buf,int lev,
115	psiconv_u32 off,	247	psiconv_u32 off,
116	psiconv_sketch_f *result)	248	psiconv_sketch_f *result)
117	{	249	{
118	psiconv_section_table_section table;	250	psiconv_section_table_section table;
119	psiconv_application_id_section appl_id;	251	psiconv_application_id_section appl_id;
…		…
123	psiconv_section_table_entry entry;	255	psiconv_section_table_entry entry;
124	int i;	256	int i;
125	int res=0;	257	int res=0;
126	char *temp_str;	258	char *temp_str;
127		259
128	psiconv_progress(lev+1,off,"Going to read a sketch file");	260	psiconv_progress(config,lev+1,off,"Going to read a sketch file");
129	result = malloc(sizeof(*result));	261	if (!(result = malloc(sizeof(*result))))
		262	goto ERROR1;
130		263
131	psiconv_progress(lev+2,off,	264	psiconv_progress(config,lev+2,off,
132	"Going to read the offset of the section table section");	265	"Going to read the offset of the section table section");
133	sto = psiconv_read_u32(buf,lev+2,off);	266	sto = psiconv_read_u32(config,buf,lev+2,off,&res);
		267	if (res)
		268	goto ERROR2;
134	psiconv_debug(lev+2,off,"Offset: %08x",sto);	269	psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
135		270
136	psiconv_progress(lev+2,sto, "Going to read the section table section");	271	psiconv_progress(config,lev+2,sto, "Going to read the section table section");
137	res \|= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);	272	if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
		273	goto ERROR2;
138		274
139	for (i = 0; i < psiconv_list_length(table); i ++) {	275	for (i = 0; i < psiconv_list_length(table); i ++) {
140	psiconv_progress(lev+2,sto, "Going to read entry %d",i);	276	psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
141	entry = psiconv_list_get(table,i);	277	if (!(entry = psiconv_list_get(table,i)))
		278	goto ERROR3;
142	if (entry->id == PSICONV_ID_APPL_ID_SECTION) {	279	if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
143	applid_sec = entry->offset;	280	applid_sec = entry->offset;
144	psiconv_debug(lev+3,sto,	281	psiconv_debug(config,lev+3,sto,
145	"Found the Application ID section at %08x",applid_sec);	282	"Found the Application ID section at %08x",applid_sec);
146	} else if (entry->id == PSICONV_ID_SKETCH_SECTION) {	283	} else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
147	sketch_sec = entry->offset;	284	sketch_sec = entry->offset;
148	psiconv_debug(lev+3,sto,	285	psiconv_debug(config,lev+3,sto,
149	"Found the Sketch section at %08x",sketch_sec);	286	"Found the Sketch section at %08x",sketch_sec);
150	} else {	287	} else {
151	psiconv_warn(lev+3,sto,	288	psiconv_warn(config,lev+3,sto,
152	"Found unknown section in the Section Table");	289	"Found unknown section in the Section Table (ignoring)");
153	psiconv_debug(lev+3,sto,	290	psiconv_debug(config,lev+3,sto,
154	"Section ID %08x, offset %08x",entry->id,entry->offset);	291	"Section ID %08x, offset %08x",entry->id,entry->offset);
155	res = -1;
156	}	292	}
157	}	293	}
158		294
159	psiconv_progress(lev+2,sto, "Looking for the Application ID section");	295	psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
160	if (! applid_sec) {	296	if (! applid_sec) {
161	psiconv_warn(lev+2,sto,	297	psiconv_error(config,lev+2,sto,
162	"Application ID section not found in the section table");	298	"Application ID section not found in the section table");
163	res = -1;	299	res = -PSICONV_E_PARSE;
		300	goto ERROR3;
164	} else {	301	} else {
165	psiconv_debug(lev+2,sto,	302	psiconv_debug(config,lev+2,sto,
166	"Application ID section at offset %08x",applid_sec);	303	"Application ID section at offset %08x",applid_sec);
167	res \|= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,	304	if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
168	&appl_id);	305	&appl_id)))
		306	goto ERROR3;
169	}	307	}
170	if ((appl_id->id != PSICONV_ID_SKETCH) \|\|	308	if ((appl_id->id != PSICONV_ID_SKETCH) \|\|
171	strcmp(appl_id->name,"Paint.app")) {	309	!applid_matches(appl_id->name,"paint.app")) {
172	psiconv_warn(lev+2,applid_sec,	310	psiconv_warn(config,lev+2,applid_sec,
173	"Application ID section contains unexpected data");	311	"Application ID section contains unexpected data");
174	psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",	312	psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
175	PSICONV_ID_SKETCH,appl_id->id);	313	PSICONV_ID_SKETCH,appl_id->id);
176	temp_str = psiconv_make_printable(appl_id->name);	314	if (!(temp_str = psiconv_make_printable(config,appl_id->name)))
		315	goto ERROR4;
177	psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",	316	psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
178	"Paint.app",temp_str);	317	"Paint.app",temp_str);
179	free(temp_str);	318	free(temp_str);
		319	res = -PSICONV_E_PARSE;
		320	goto ERROR4;
180	}	321	}
181		322
182	psiconv_progress(lev+2,sto, "Looking for the Sketch section");	323	psiconv_progress(config,lev+2,sto, "Looking for the Sketch section");
183	if (! sketch_sec) {	324	if (! sketch_sec) {
184	psiconv_warn(lev+2,sto,	325	psiconv_warn(config,lev+2,sto,
185	"Sketch section not found in the section table");	326	"Sketch section not found in the section table");
186	res = -1;
187	} else {	327	} else {
188	psiconv_debug(lev+2,sto,	328	psiconv_debug(config,lev+2,sto,
189	"Sketch section at offset %08x",applid_sec);	329	"Sketch section at offset %08x",applid_sec);
190	res \|= psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL,0,	330	if ((res = psiconv_parse_sketch_section(config,buf,lev+2,sketch_sec,NULL,
191	&(*result)->sketch_sec);	331	&(*result)->sketch_sec)))
		332	goto ERROR4;
192	}	333	}
193		334
194	psiconv_free_application_id_section(appl_id);	335	psiconv_free_application_id_section(appl_id);
195	psiconv_free_section_table_section(table);	336	psiconv_free_section_table_section(table);
196		337
197	psiconv_progress(lev+1,off,"End of word file");	338	psiconv_progress(config,lev+1,off,"End of sketch file");
198	return res;	339	return res;
		340
		341	ERROR4:
		342	psiconv_free_application_id_section(appl_id);
		343	ERROR3:
		344	free(table);
		345	ERROR2:
		346	free(*result);
		347	ERROR1:
		348	psiconv_error(config,lev+1,off,"Reading of Sketch File failed");
		349	if (res == 0)
		350	return -PSICONV_E_NOMEM;
		351	else
		352	return res;
199	}	353	}
200
201		354
202		355
203	int psiconv_parse_texted_file(const psiconv_buffer buf,int lev,	356	int psiconv_parse_texted_file(const psiconv_config config,
		357	const psiconv_buffer buf,int lev,
204	psiconv_u32 off,	358	psiconv_u32 off,
205	psiconv_texted_f *result)	359	psiconv_texted_f *result)
206	{	360	{
207	int res=0;	361	int res=0;
208	psiconv_section_table_section table;	362	psiconv_section_table_section table;
…		…
215	psiconv_u32 applid_sec = 0;	369	psiconv_u32 applid_sec = 0;
216	psiconv_u32 sto;	370	psiconv_u32 sto;
217	psiconv_section_table_entry entry;	371	psiconv_section_table_entry entry;
218	int i;	372	int i;
219		373
220	psiconv_progress(lev+1,off,"Going to read a texted file");	374	psiconv_progress(config,lev+1,off,"Going to read a texted file");
221	result = malloc(sizeof(*result));	375	if (!(result = malloc(sizeof(*result))))
		376	goto ERROR1;
222		377
223	psiconv_progress(lev+2,off,	378	psiconv_progress(config,lev+2,off,
224	"Going to read the offset of the section table section");	379	"Going to read the offset of the section table section");
225	sto = psiconv_read_u32(buf,lev+2,off);	380	sto = psiconv_read_u32(config,buf,lev+2,off,&res);
		381	if (res)
		382	goto ERROR2;
226	psiconv_debug(lev+2,off,"Offset: %08x",sto);	383	psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
227		384
228	psiconv_progress(lev+2,sto, "Going to read the section table section");	385	psiconv_progress(config,lev+2,sto, "Going to read the section table section");
229	res \|= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);	386	if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
		387	goto ERROR2;
230		388
231	for (i = 0; i < psiconv_list_length(table); i ++) {	389	for (i = 0; i < psiconv_list_length(table); i ++) {
232	psiconv_progress(lev+2,sto, "Going to read entry %d",i);	390	psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
233	entry = psiconv_list_get(table,i);	391	if (!(entry = psiconv_list_get(table,i)))
		392	goto ERROR3;
234	if (entry->id == PSICONV_ID_APPL_ID_SECTION) {	393	if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
235	applid_sec = entry->offset;	394	applid_sec = entry->offset;
236	psiconv_debug(lev+3,sto,	395	psiconv_debug(config,lev+3,sto,
237	"Found the Application ID section at %08x",applid_sec);	396	"Found the Application ID section at %08x",applid_sec);
238	} else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {	397	} else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
239	page_sec = entry->offset;	398	page_sec = entry->offset;
240	psiconv_debug(lev+3,sto,	399	psiconv_debug(config,lev+3,sto,
241	"Found the Page Layout section at %08x",page_sec);	400	"Found the Page Layout section at %08x",page_sec);
242	} else if (entry->id == PSICONV_ID_TEXTED) {	401	} else if (entry->id == PSICONV_ID_TEXTED) {
243	texted_sec = entry->offset;	402	texted_sec = entry->offset;
244	psiconv_debug(lev+3,sto,	403	psiconv_debug(config,lev+3,sto,
245	"Found the TextEd section at %08x",texted_sec);	404	"Found the TextEd section at %08x",texted_sec);
246	} else {	405	} else {
247	psiconv_warn(lev+3,sto,	406	psiconv_warn(config,lev+3,sto,
248	"Found unknown section in the Section Table");	407	"Found unknown section in the Section Table (ignoring)");
249	psiconv_debug(lev+3,sto,	408	psiconv_debug(config,lev+3,sto,
250	"Section ID %08x, offset %08x",entry->id,entry->offset);	409	"Section ID %08x, offset %08x",entry->id,entry->offset);
251	res = -1;
252	}	410	}
253	}	411	}
254		412
255	psiconv_progress(lev+2,sto, "Looking for the Application ID section");	413	psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
256	if (! applid_sec) {	414	if (! applid_sec) {
257	psiconv_warn(lev+2,sto,	415	psiconv_error(config,lev+2,sto,
258	"Application ID section not found in the section table");	416	"Application ID section not found in the section table");
259	res = -1;	417	res = -PSICONV_E_PARSE;
		418	goto ERROR3;
260	} else {	419	} else {
261	psiconv_debug(lev+2,sto,	420	psiconv_debug(config,lev+2,sto,
262	"Application ID section at offset %08x",applid_sec);	421	"Application ID section at offset %08x",applid_sec);
263	res \|= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,	422	if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
264	&appl_id);	423	&appl_id)))
		424	goto ERROR3;
265	}	425	}
		426
266	if ((appl_id->id != PSICONV_ID_TEXTED) \|\|	427	if ((appl_id->id != PSICONV_ID_TEXTED) \|\|
267	strcmp(appl_id->name,"TextEd.app")) {	428	!applid_matches(appl_id->name,"texted.app")) {
268	psiconv_warn(lev+2,applid_sec,	429	psiconv_warn(config,lev+2,applid_sec,
269	"Application ID section contains unexpected data");	430	"Application ID section contains unexpected data");
270	psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",	431	psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
271	PSICONV_ID_TEXTED,appl_id->id);	432	PSICONV_ID_TEXTED,appl_id->id);
272	temp_str = psiconv_make_printable(appl_id->name);	433	if (!(temp_str = psiconv_make_printable(config,appl_id->name)))
		434	goto ERROR4;
273	psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",	435	psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
274	"TextEd.app",temp_str);	436	"TextEd.app",temp_str);
275	free(temp_str);	437	free(temp_str);
		438	res = -PSICONV_E_PARSE;
		439	goto ERROR4;
276	}	440	}
277		441
278	psiconv_progress(lev+2,sto,	442	psiconv_progress(config,lev+2,sto,
279	"Looking for the Page layout section");	443	"Looking for the Page layout section");
280	if (! page_sec) {	444	if (! page_sec) {
281	psiconv_warn(lev+2,sto,	445	psiconv_error(config,lev+2,sto,
282	"Page layout section not found in the section table");	446	"Page layout section not found in the section table");
283	(*result)->page_sec = NULL;	447	res = -PSICONV_E_PARSE;
284	res = -1;	448	goto ERROR4;
285	} else {	449	} else {
286	psiconv_debug(lev+2,sto,	450	psiconv_debug(config,lev+2,sto,
287	"Page layout section at offset %08x",page_sec);	451	"Page layout section at offset %08x",page_sec);
288	res \|= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,	452	if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
289	&(*result)->page_sec);	453	&(*result)->page_sec)))
		454	goto ERROR4;
290	}	455	}
291		456
292	base_char = psiconv_basic_character_layout();	457	if (!(base_char = psiconv_basic_character_layout()))
		458	goto ERROR5;
293	base_para = psiconv_basic_paragraph_layout();	459	if (!(base_para = psiconv_basic_paragraph_layout()))
		460	goto ERROR6;
294		461
295	psiconv_progress(lev+2,sto,	462	psiconv_progress(config,lev+2,sto,
296	"Looking for the TextEd section");	463	"Looking for the TextEd section");
297	if (! texted_sec) {	464	if (! texted_sec) {
298	psiconv_warn(lev+2,sto,	465	psiconv_error(config,lev+2,sto,
299	"TextEd section not found in the section table");	466	"TextEd section not found in the section table");
300	(*result)->texted_sec = NULL;	467	res = -PSICONV_E_PARSE;
301	res = -1;	468	goto ERROR7;
302	} else {	469	} else {
303	psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec);	470	psiconv_debug(config,lev+2,sto, "TextEd section at offset %08x",texted_sec);
304	res \|= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL,	471	if ((res = psiconv_parse_texted_section(config,buf,lev+2,texted_sec,NULL,
305	&(*result)->texted_sec,	472	&(*result)->texted_sec,
306	base_char,base_para);	473	base_char,base_para)))
		474	goto ERROR7;
307	}	475	}
308	psiconv_free_character_layout(base_char);	476	psiconv_free_character_layout(base_char);
309	psiconv_free_paragraph_layout(base_para);	477	psiconv_free_paragraph_layout(base_para);
310		478
311	psiconv_free_application_id_section(appl_id);	479	psiconv_free_application_id_section(appl_id);
312	psiconv_free_section_table_section(table);	480	psiconv_free_section_table_section(table);
313		481
314	psiconv_progress(lev+1,off,"End of word file");	482	psiconv_progress(config,lev+1,off,"End of TextEd file");
		483	return 0;
		484
		485	ERROR7:
		486	psiconv_free_paragraph_layout(base_para);
		487	ERROR6:
		488	psiconv_free_character_layout(base_char);
		489	ERROR5:
		490	psiconv_free_page_layout_section((*result)->page_sec);
		491	ERROR4:
		492	psiconv_free_application_id_section(appl_id);
		493	ERROR3:
		494	psiconv_free_section_table_section(table);
		495	ERROR2:
		496	free(*result);
		497	ERROR1:
		498	psiconv_error(config,lev+1,off,"Reading of TextEd File failed");
		499	if (res == 0)
		500	return -PSICONV_E_NOMEM;
		501	else
315	return res;	502	return res;
316	}	503	}
317		504
318	int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off,	505	int psiconv_parse_word_file(const psiconv_config config,
		506	const psiconv_buffer buf,int lev, psiconv_u32 off,
319	psiconv_word_f *result)	507	psiconv_word_f *result)
320	{	508	{
321	int res=0;	509	int res=0;
322	psiconv_section_table_section table;	510	psiconv_section_table_section table;
323	psiconv_application_id_section appl_id;	511	psiconv_application_id_section appl_id;
…		…
331	psiconv_u32 applid_sec = 0;	519	psiconv_u32 applid_sec = 0;
332	psiconv_section_table_entry entry;	520	psiconv_section_table_entry entry;
333	psiconv_u32 sto;	521	psiconv_u32 sto;
334	int i;	522	int i;
335		523
336	psiconv_progress(lev+1,off,"Going to read a word file");	524	psiconv_progress(config,lev+1,off,"Going to read a word file");
337	result = malloc(sizeof(*result));	525	if (!(result = malloc(sizeof(*result))))
		526	goto ERROR1;
338		527
339	psiconv_progress(lev+2,off,	528	psiconv_progress(config,lev+2,off,
340	"Going to read the offset of the section table section");	529	"Going to read the offset of the section table section");
341	sto = psiconv_read_u32(buf,lev+2,off);	530	sto = psiconv_read_u32(config,buf,lev+2,off,&res);
		531	if (res)
		532	goto ERROR2;
342	psiconv_debug(lev+2,off,"Offset: %08x",sto);	533	psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
343		534
344	psiconv_progress(lev+2,sto,	535	psiconv_progress(config,lev+2,sto,
345	"Going to read the section table section");	536	"Going to read the section table section");
346	res \|= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table);	537	if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
		538	goto ERROR2;
347		539
348	for (i = 0; i < psiconv_list_length(table); i ++) {	540	for (i = 0; i < psiconv_list_length(table); i ++) {
349	psiconv_progress(lev+2,sto, "Going to read entry %d",i);	541	psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
350	entry = psiconv_list_get(table,i);	542	if (!(entry = psiconv_list_get(table,i)))
		543	goto ERROR3;
351	if (entry->id == PSICONV_ID_APPL_ID_SECTION) {	544	if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
352	applid_sec = entry->offset;	545	applid_sec = entry->offset;
353	psiconv_debug(lev+3,sto,	546	psiconv_debug(config,lev+3,sto,
354	"Found the Application ID section at %08x",applid_sec);	547	"Found the Application ID section at %08x",applid_sec);
355	} else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {	548	} else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
356	page_sec = entry->offset;	549	page_sec = entry->offset;
357	psiconv_debug(lev+3,sto,	550	psiconv_debug(config,lev+3,sto,
358	"Found the Page Layout section at %08x",page_sec);	551	"Found the Page Layout section at %08x",page_sec);
359	} else if (entry->id == PSICONV_ID_TEXT_SECTION) {	552	} else if (entry->id == PSICONV_ID_TEXT_SECTION) {
360	text_sec = entry->offset;	553	text_sec = entry->offset;
361	psiconv_debug(lev+3,sto, "Found the Text section at %08x",text_sec);	554	psiconv_debug(config,lev+3,sto, "Found the Text section at %08x",text_sec);
362	} else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {	555	} else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
363	pwd_sec = entry->offset;	556	pwd_sec = entry->offset;
364	psiconv_debug(lev+3,sto,	557	psiconv_debug(config,lev+3,sto,
365	"Found the Password section at %08x",pwd_sec);	558	"Found the Password section at %08x",pwd_sec);
366	psiconv_warn(lev+3,sto,	559	psiconv_error(config,lev+3,sto,
367	"Password section found - can't read encrypted data");	560	"Password section found - can't read encrypted data");
368	res = -1;	561	res = -PSICONV_E_PARSE;
		562	goto ERROR3;
369	} else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {	563	} else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
370	status_sec = entry->offset;	564	status_sec = entry->offset;
371	psiconv_debug(lev+3,sto,	565	psiconv_debug(config,lev+3,sto,
372	"Found the Word Status section at %08x",status_sec);	566	"Found the Word Status section at %08x",status_sec);
373	} else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {	567	} else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
374	styles_sec = entry->offset;	568	styles_sec = entry->offset;
375	psiconv_debug(lev+3,sto,	569	psiconv_debug(config,lev+3,sto,
376	"Found the Word Styles section at %08x",styles_sec);	570	"Found the Word Styles section at %08x",styles_sec);
377	} else if (entry->id == PSICONV_ID_LAYOUT_SECTION) {	571	} else if (entry->id == PSICONV_ID_LAYOUT_SECTION) {
378	layout_sec = entry->offset;	572	layout_sec = entry->offset;
379	psiconv_debug(lev+3,sto,	573	psiconv_debug(config,lev+3,sto,
380	"Found the Layout section at %08x",layout_sec);	574	"Found the Layout section at %08x",layout_sec);
381	} else {	575	} else {
382	psiconv_warn(lev+3,sto,	576	psiconv_warn(config,lev+3,sto,
383	"Found unknown section in the Section Table");	577	"Found unknown section in the Section Table (ignoring)");
384	psiconv_debug(lev+3,sto,	578	psiconv_debug(config,lev+3,sto,
385	"Section ID %08x, offset %08x",entry->id,entry->offset);	579	"Section ID %08x, offset %08x",entry->id,entry->offset);
386	res = -1;
387	}	580	}
388	}	581	}
389		582
390		583
391	psiconv_progress(lev+2,sto,	584	psiconv_progress(config,lev+2,sto,
392	"Looking for the Status section");	585	"Looking for the Status section");
393	if (!status_sec) {	586	if (!status_sec) {
394	psiconv_warn(lev+2,sto, "Status section not found in the section table");	587	psiconv_error(config,lev+2,sto, "Status section not found in the section table");
395	res = -1;	588	res = -PSICONV_E_PARSE;
		589	goto ERROR3;
396	} else {	590	} else {
397	psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec);	591	psiconv_debug(config,lev+2,sto, "Status section at offset %08x",status_sec);
398	res \|= psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL,	592	if ((res = psiconv_parse_word_status_section(config,buf,lev+2,status_sec,NULL,
399	&((*result)->status_sec));	593	&((*result)->status_sec))))
		594	goto ERROR3;
400	}	595	}
401		596
402	psiconv_progress(lev+2,sto, "Looking for the Application ID section");	597	psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
403	if (! applid_sec) {	598	if (! applid_sec) {
404	psiconv_warn(lev+2,sto,	599	psiconv_error(config,lev+2,sto,
405	"Application ID section not found in the section table");	600	"Application ID section not found in the section table");
406	res = -1;	601	res = -PSICONV_E_PARSE;
		602	goto ERROR4;
407	} else {	603	} else {
408	psiconv_debug(lev+2,sto,	604	psiconv_debug(config,lev+2,sto,
409	"Application ID section at offset %08x",applid_sec);	605	"Application ID section at offset %08x",applid_sec);
410	res \|= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,	606	if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
411	&appl_id);	607	&appl_id)))
		608	goto ERROR4;
412	}	609	}
413	if ((appl_id->id != PSICONV_ID_WORD) \|\|	610	if ((appl_id->id != PSICONV_ID_WORD) \|\|
414	strcmp(appl_id->name,"Word.app")) {	611	!applid_matches(appl_id->name,"word.app")) {
415	psiconv_warn(lev+2,applid_sec,	612	psiconv_warn(config,lev+2,applid_sec,
416	"Application ID section contains unexpected data");	613	"Application ID section contains unexpected data");
417	psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",	614	psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
418	PSICONV_ID_WORD,appl_id->id);	615	PSICONV_ID_WORD,appl_id->id);
419	temp_str = psiconv_make_printable(appl_id->name);	616	if (!(temp_str = psiconv_make_printable(config,appl_id->name)))
		617	goto ERROR5;
420	psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",	618	psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
421	"Word.app",temp_str);	619	"Word.app",temp_str);
422	free(temp_str);	620	free(temp_str);
		621	res = -PSICONV_E_PARSE;
		622	goto ERROR5;
423	}	623	}
424		624
425	psiconv_progress(lev+2,sto,	625	psiconv_progress(config,lev+2,sto,
426	"Looking for the Page layout section");	626	"Looking for the Page layout section");
427	if (! page_sec) {	627	if (! page_sec) {
428	psiconv_warn(lev+2,sto,	628	psiconv_error(config,lev+2,sto,
429	"Page layout section not found in the section table");	629	"Page layout section not found in the section table");
430	(*result)->page_sec = NULL;	630	res = -PSICONV_E_PARSE;
431	res = -1;	631	goto ERROR5;
432	} else {	632	} else {
433	psiconv_debug(lev+2,sto,	633	psiconv_debug(config,lev+2,sto,
434	"Page layout section at offset %08x",page_sec);	634	"Page layout section at offset %08x",page_sec);
435	res \|= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,	635	if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
436	&(*result)->page_sec);	636	&(*result)->page_sec)))
		637	goto ERROR5;
437	}	638	}
438		639
439	psiconv_progress(lev+2,sto,	640	psiconv_progress(config,lev+2,sto,
440	"Looking for the Word Style section");	641	"Looking for the Word Style section");
441	if (!styles_sec) {	642	if (!styles_sec) {
442	psiconv_warn(lev+2,sto,	643	psiconv_error(config,lev+2,sto,
443	"Word styles section not found in the section table");	644	"Word styles section not found in the section table");
444	(*result)->styles_sec = NULL;	645	res = -PSICONV_E_PARSE;
445	res = -1;	646	goto ERROR6;
446	} else {	647	} else {
447	psiconv_debug(lev+2,sto,	648	psiconv_debug(config,lev+2,sto,
448	"Word styles section at offset %08x",styles_sec);	649	"Word styles section at offset %08x",styles_sec);
449	res \|= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL,	650	if ((res = psiconv_parse_word_styles_section(config,buf,lev+2,styles_sec,NULL,
450	&(*result)->styles_sec);	651	&(*result)->styles_sec)))
		652	goto ERROR6;
451	}	653	}
452		654
453	psiconv_progress(lev+2,sto,	655	psiconv_progress(config,lev+2,sto,
454	"Looking for the Text section");	656	"Looking for the Text section");
455	if (!text_sec) {	657	if (!text_sec) {
456	psiconv_warn(lev+2,sto, "Text section not found in the section table");	658	psiconv_error(config,lev+2,sto, "Text section not found in the section table");
457	(*result)->paragraphs = NULL;	659	res = -PSICONV_E_PARSE;
458	res = -1;	660	goto ERROR7;
459	} else {	661	} else {
460	psiconv_debug(lev+2,sto,	662	psiconv_debug(config,lev+2,sto,
461	"Text section at offset %08x",text_sec);	663	"Text section at offset %08x",text_sec);
462	res \|= psiconv_parse_text_section(buf,lev+2,text_sec,NULL,	664	if ((res = psiconv_parse_text_section(config,buf,lev+2,text_sec,NULL,
463	&(*result)->paragraphs);	665	&(*result)->paragraphs)))
		666	goto ERROR7;
464	}	667	}
465		668
466	if (((result)->paragraphs) && ((result)->styles_sec)) {	669	psiconv_progress(config,lev+2,sto, "Looking for the Layout section");
467	psiconv_progress(lev+2,sto,
468	"Looking for the Layout section");
469	if (!layout_sec) {	670	if (!layout_sec) {
470	psiconv_debug(lev+2,sto,	671	psiconv_debug(config,lev+2,sto, "No layout section today");
471	"Layout section not found in the section table");
472	res = -1;
473	} else {	672	} else {
474	psiconv_debug(lev+2,sto,	673	psiconv_debug(config,lev+2,sto,
475	"Layout section at offset %08x",layout_sec);	674	"Layout section at offset %08x",layout_sec);
476	res \|= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL,	675	if ((res = psiconv_parse_styled_layout_section(config,buf,lev+2,layout_sec,NULL,
477	(*result)->paragraphs,	676	(*result)->paragraphs,
478	(*result)->styles_sec);	677	(*result)->styles_sec)))
		678	goto ERROR8;
479	}	679	}
480	} else
481	psiconv_debug(lev+2,sto,
482	"Skipping search for Layout section, as either the "
483	"text or the word styles section was not found");
484		680
485	psiconv_free_application_id_section(appl_id);	681	psiconv_free_application_id_section(appl_id);
486	psiconv_free_section_table_section(table);	682	psiconv_free_section_table_section(table);
487		683
488	psiconv_progress(lev+1,off,"End of word file");	684	psiconv_progress(config,lev+1,off,"End of word file");
		685	return 0;
		686
		687
		688	ERROR8:
		689	psiconv_free_text_and_layout((*result)->paragraphs);
		690	ERROR7:
		691	psiconv_free_word_styles_section((*result)->styles_sec);
		692	ERROR6:
		693	psiconv_free_page_layout_section((*result)->page_sec);
		694	ERROR5:
		695	psiconv_free_application_id_section(appl_id);
		696	ERROR4:
		697	psiconv_free_word_status_section((*result)->status_sec);
		698	ERROR3:
		699	psiconv_free_section_table_section(table);
		700	ERROR2:
		701	free(*result);
		702	ERROR1:
		703	psiconv_error(config,lev+1,off,"Reading of Word File failed");
		704	if (res == 0)
		705	return -PSICONV_E_NOMEM;
		706	else
489	return res;	707	return res;
490	}	708	}
		709
		710	int psiconv_parse_sheet_file(const psiconv_config config,
		711	const psiconv_buffer buf,int lev, psiconv_u32 off,
		712	psiconv_sheet_f *result)
		713	{
		714	int res=0;
		715	psiconv_section_table_section table;
		716	psiconv_application_id_section appl_id;
		717	char *temp_str;
		718	psiconv_u32 pwd_sec = 0;
		719	psiconv_u32 status_sec = 0;
		720	psiconv_u32 page_sec = 0;
		721	psiconv_u32 applid_sec = 0;
		722	psiconv_u32 workbook_sec = 0;
		723	psiconv_section_table_entry entry;
		724	psiconv_u32 sto;
		725	int i;
		726
		727	psiconv_progress(config,lev+1,off,"Going to read a sheet file");
		728	if (!(result = malloc(sizeof(*result))))
		729	goto ERROR1;
		730
		731	psiconv_progress(config,lev+2,off,
		732	"Going to read the offset of the section table section");
		733	sto = psiconv_read_u32(config,buf,lev+2,off,&res);
		734	if (res)
		735	goto ERROR2;
		736	psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
		737
		738	psiconv_progress(config,lev+2,sto,
		739	"Going to read the section table section");
		740	if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
		741	goto ERROR2;
		742
		743	for (i = 0; i < psiconv_list_length(table); i ++) {
		744	psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
		745	if (!(entry = psiconv_list_get(table,i)))
		746	goto ERROR3;
		747	if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
		748	applid_sec = entry->offset;
		749	psiconv_debug(config,lev+3,sto,
		750	"Found the Application ID section at %08x",applid_sec);
		751	} else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
		752	page_sec = entry->offset;
		753	psiconv_debug(config,lev+3,sto,
		754	"Found the Page Layout section at %08x",page_sec);
		755	} else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
		756	pwd_sec = entry->offset;
		757	psiconv_debug(config,lev+3,sto,
		758	"Found the Password section at %08x",pwd_sec);
		759	psiconv_error(config,lev+3,sto,
		760	"Password section found - can't read encrypted data");
		761	res = -PSICONV_E_PARSE;
		762	goto ERROR3;
		763	} else if (entry->id == PSICONV_ID_SHEET_WORKBOOK_SECTION) {
		764	workbook_sec = entry->offset;
		765	psiconv_debug(config,lev+3,sto,
		766	"Found the Sheet Workbook section at %08x",workbook_sec);
		767	} else if (entry->id == PSICONV_ID_SHEET_STATUS_SECTION) {
		768	status_sec = entry->offset;
		769	psiconv_debug(config,lev+3,sto,
		770	"Found the Sheet Status section at %08x",status_sec);
		771	} else {
		772	psiconv_warn(config,lev+3,sto,
		773	"Found unknown section in the Section Table (ignoring)");
		774	psiconv_debug(config,lev+3,sto,
		775	"Section ID %08x, offset %08x",entry->id,entry->offset);
		776	}
		777	}
		778
		779
		780	psiconv_progress(config,lev+2,sto,
		781	"Looking for the Status section");
		782	if (!status_sec) {
		783	psiconv_error(config,lev+2,sto, "Status section not found in the section table");
		784	res = -PSICONV_E_PARSE;
		785	goto ERROR3;
		786	} else {
		787	psiconv_debug(config,lev+2,sto, "Status section at offset %08x",status_sec);
		788	if ((res = psiconv_parse_sheet_status_section(config,buf,lev+2,status_sec,NULL,
		789	&((*result)->status_sec))))
		790	goto ERROR3;
		791	}
		792
		793	psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
		794	if (! applid_sec) {
		795	psiconv_error(config,lev+2,sto,
		796	"Application ID section not found in the section table");
		797	res = -PSICONV_E_PARSE;
		798	goto ERROR4;
		799	} else {
		800	psiconv_debug(config,lev+2,sto,
		801	"Application ID section at offset %08x",applid_sec);
		802	if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
		803	&appl_id)))
		804	goto ERROR4;
		805	}
		806	if ((appl_id->id != PSICONV_ID_SHEET) \|\|
		807	!applid_matches(appl_id->name,"sheet.app")) {
		808	psiconv_warn(config,lev+2,applid_sec,
		809	"Application ID section contains unexpected data");
		810	psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
		811	PSICONV_ID_SHEET,appl_id->id);
		812	if (!(temp_str = psiconv_make_printable(config,appl_id->name)))
		813	goto ERROR5;
		814	psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
		815	"Sheet.app",temp_str);
		816	free(temp_str);
		817	res = -PSICONV_E_PARSE;
		818	goto ERROR5;
		819	}
		820
		821	psiconv_progress(config,lev+2,sto,
		822	"Looking for the Page layout section");
		823	if (! page_sec) {
		824	psiconv_error(config,lev+2,sto,
		825	"Page layout section not found in the section table");
		826	res = -PSICONV_E_PARSE;
		827	goto ERROR5;
		828	} else {
		829	psiconv_debug(config,lev+2,sto,
		830	"Page layout section at offset %08x",page_sec);
		831	if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
		832	&(*result)->page_sec)))
		833	goto ERROR5;
		834	}
		835
		836	psiconv_progress(config,lev+2,sto,
		837	"Looking for the Sheet Workbook section");
		838	if (! workbook_sec) {
		839	psiconv_error(config,lev+2,sto,
		840	"Sheet workbook section not found in the section table");
		841	res = -PSICONV_E_PARSE;
		842	goto ERROR6;
		843	} else {
		844	psiconv_debug(config,lev+2,sto,
		845	"Sheet workbook section at offset %08x",page_sec);
		846	if ((res = psiconv_parse_sheet_workbook_section(config,buf,lev+2,workbook_sec,NULL,
		847	&(*result)->workbook_sec)))
		848	goto ERROR6;
		849	}
		850
		851	psiconv_free_application_id_section(appl_id);
		852	psiconv_free_section_table_section(table);
		853
		854	psiconv_progress(config,lev+1,off,"End of Sheet file");
		855	return 0;
		856
		857	ERROR6:
		858	psiconv_free_page_layout_section((*result)->page_sec);
		859	ERROR5:
		860	psiconv_free_application_id_section(appl_id);
		861	ERROR4:
		862	psiconv_free_sheet_status_section((*result)->status_sec);
		863	ERROR3:
		864	psiconv_free_section_table_section(table);
		865	ERROR2:
		866	free(*result);
		867	ERROR1:
		868	psiconv_error(config,lev+1,off,"Reading of Sheet File failed");
		869	if (res == 0)
		870	return -PSICONV_E_NOMEM;
		871	else
		872	return res;
		873	}

 Legend:



Removed from v.24
 


changed lines


 
Added in v.237
 Legend:



Removed from v.24
 


changed lines


 
Added in v.237
-Removed from v.24
+Added in v.237

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