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, 2000 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. |
… | |
… | |
28 | #ifdef DMALLOC |
28 | #ifdef DMALLOC |
29 | #include <dmalloc.h> |
29 | #include <dmalloc.h> |
30 | #endif |
30 | #endif |
31 | |
31 | |
32 | |
32 | |
33 | static int psiconv_parse_layout_section(const psiconv_buffer buf, |
33 | static int psiconv_parse_layout_section(const psiconv_config config, |
|
|
34 | const psiconv_buffer buf, |
34 | int lev,psiconv_u32 off, |
35 | int lev,psiconv_u32 off, |
35 | int *length, |
36 | int *length, |
36 | psiconv_text_and_layout result, |
37 | psiconv_text_and_layout result, |
37 | psiconv_word_styles_section styles, |
38 | psiconv_word_styles_section styles, |
38 | int with_styles); |
39 | int with_styles); |
|
|
40 | static psiconv_file_type_t psiconv_determine_embedded_object_type |
|
|
41 | (const psiconv_config config, |
|
|
42 | const psiconv_buffer buf,int lev, |
|
|
43 | int *status); |
39 | |
44 | |
40 | int psiconv_parse_header_section(const psiconv_buffer buf,int lev, |
45 | int psiconv_parse_header_section(const psiconv_config config, |
|
|
46 | const psiconv_buffer buf,int lev, |
41 | psiconv_u32 off, int *length, |
47 | psiconv_u32 off, int *length, |
42 | psiconv_header_section *result) |
48 | psiconv_header_section *result) |
43 | { |
49 | { |
44 | int res=0; |
50 | int res=0; |
45 | int len=0; |
51 | int len=0; |
46 | psiconv_u32 temp; |
52 | psiconv_u32 temp; |
47 | |
53 | |
48 | psiconv_progress(lev+1,off+len,"Going to read the header section"); |
54 | psiconv_progress(config,lev+1,off+len,"Going to read the header section"); |
49 | if (!((*result) = malloc(sizeof(**result)))) |
55 | if (!((*result) = malloc(sizeof(**result)))) |
50 | goto ERROR1; |
56 | goto ERROR1; |
51 | |
57 | |
52 | psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3"); |
58 | psiconv_progress(config,lev+2,off+len,"Going to read UID1 to UID3"); |
53 | (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len,&res); |
59 | (*result)->uid1 = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
54 | if (res) |
60 | if (res) |
55 | goto ERROR2; |
61 | goto ERROR2; |
56 | psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1); |
62 | psiconv_debug(config,lev+2,off+len,"UID1: %08x",(*result)->uid1); |
57 | if ((*result)->uid1 == PSICONV_ID_CLIPART) { |
63 | if ((*result)->uid1 == PSICONV_ID_CLIPART) { |
58 | /* That's all folks... */ |
64 | /* That's all folks... */ |
59 | (*result)->file = psiconv_clipart_file; |
65 | (*result)->file = psiconv_clipart_file; |
60 | (*result)->uid2 = 0; |
66 | (*result)->uid2 = 0; |
61 | (*result)->uid3 = 0; |
67 | (*result)->uid3 = 0; |
62 | (*result)->checksum = 0; |
68 | (*result)->checksum = 0; |
63 | len += 4; |
69 | len += 4; |
64 | psiconv_debug(lev+2,off+len,"File is a Clipart file"); |
70 | psiconv_debug(config,lev+2,off+len,"File is a Clipart file"); |
65 | goto DONE; |
71 | goto DONE; |
66 | } |
72 | } |
67 | if ((*result)->uid1 != PSICONV_ID_PSION5) { |
73 | if ((*result)->uid1 != PSICONV_ID_PSION5) { |
68 | psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably " |
74 | psiconv_error(config,lev+2,off+len, |
|
|
75 | "UID1 has unknown value. This is probably " |
69 | "not a (parsable) Psion 5 file"); |
76 | "not a (parsable) Psion 5 file"); |
70 | res = -PSICONV_E_PARSE; |
77 | res = -PSICONV_E_PARSE; |
71 | goto ERROR2; |
78 | goto ERROR2; |
72 | } |
79 | } |
73 | len += 4; |
80 | len += 4; |
74 | (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len,&res); |
81 | (*result)->uid2 = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
75 | if (res) |
82 | if (res) |
76 | goto ERROR2; |
83 | goto ERROR2; |
77 | psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2); |
84 | psiconv_debug(config,lev+2,off+len,"UID2: %08x",(*result)->uid2); |
78 | len += 4; |
85 | len += 4; |
79 | (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len,&res); |
86 | (*result)->uid3 = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
80 | if (res) |
87 | if (res) |
81 | goto ERROR2; |
88 | goto ERROR2; |
82 | psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3); |
89 | psiconv_debug(config,lev+2,off+len,"UID3: %08x",(*result)->uid3); |
83 | len += 4; |
90 | len += 4; |
84 | |
91 | |
85 | (*result)->file = psiconv_unknown_file; |
92 | (*result)->file = psiconv_unknown_file; |
86 | if ((*result)->uid1 == PSICONV_ID_PSION5) { |
93 | if ((*result)->uid1 == PSICONV_ID_PSION5) { |
87 | if ((*result)->uid2 == PSICONV_ID_DATA_FILE) { |
94 | if ((*result)->uid2 == PSICONV_ID_DATA_FILE) { |
88 | if ((*result)->uid3 == PSICONV_ID_WORD) { |
95 | if ((*result)->uid3 == PSICONV_ID_WORD) { |
89 | (*result)->file = psiconv_word_file; |
96 | (*result)->file = psiconv_word_file; |
90 | psiconv_debug(lev+2,off+len,"File is a Word file"); |
97 | psiconv_debug(config,lev+2,off+len,"File is a Word file"); |
91 | } else if ((*result)->uid3 == PSICONV_ID_TEXTED) { |
98 | } else if ((*result)->uid3 == PSICONV_ID_TEXTED) { |
92 | (*result)->file = psiconv_texted_file; |
99 | (*result)->file = psiconv_texted_file; |
93 | psiconv_debug(lev+2,off+len,"File is a TextEd file"); |
100 | psiconv_debug(config,lev+2,off+len,"File is a TextEd file"); |
94 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
101 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
95 | (*result)->file = psiconv_sketch_file; |
102 | (*result)->file = psiconv_sketch_file; |
96 | psiconv_debug(lev+2,off+len,"File is a Sketch file"); |
103 | psiconv_debug(config,lev+2,off+len,"File is a Sketch file"); |
97 | } else if ((*result)->uid3 == PSICONV_ID_SHEET) { |
104 | } else if ((*result)->uid3 == PSICONV_ID_SHEET) { |
98 | (*result)->file = psiconv_sheet_file; |
105 | (*result)->file = psiconv_sheet_file; |
99 | psiconv_debug(lev+2,off+len,"File is a Sheet file"); |
106 | psiconv_debug(config,lev+2,off+len,"File is a Sheet file"); |
100 | } |
107 | } |
101 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
108 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
102 | (*result)->file = psiconv_mbm_file; |
109 | (*result)->file = psiconv_mbm_file; |
103 | if ((*result)->uid3 != 0x00) |
110 | if ((*result)->uid3 != 0x00) |
104 | psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); |
111 | psiconv_warn(config,lev+2,off+len,"UID3 set in MBM file?!?"); |
105 | psiconv_debug(lev+2,off+len,"File is a MBM file"); |
112 | psiconv_debug(config,lev+2,off+len,"File is a MBM file"); |
106 | } |
113 | } |
107 | } |
114 | } |
108 | if ((*result)->file == psiconv_unknown_file) { |
115 | if ((*result)->file == psiconv_unknown_file) { |
109 | psiconv_warn(lev+2,off+len,"Unknown file type"); |
116 | psiconv_warn(config,lev+2,off+len,"Unknown file type"); |
110 | (*result)->file = psiconv_unknown_file; |
117 | (*result)->file = psiconv_unknown_file; |
111 | } |
118 | } |
112 | |
119 | |
113 | psiconv_progress(lev+2,off+len,"Checking UID4"); |
120 | psiconv_progress(config,lev+2,off+len,"Checking UID4"); |
114 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
121 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
115 | if (res) |
122 | if (res) |
116 | goto ERROR2; |
123 | goto ERROR2; |
117 | if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, |
124 | if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, |
118 | (*result)->uid3)) |
125 | (*result)->uid3)) |
119 | psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp); |
126 | psiconv_debug(config,lev+2,off+len,"Checksum %08x is correct",temp); |
120 | else { |
127 | else { |
121 | psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!"); |
128 | psiconv_error(config,lev+2,off+len,"Checksum failed, file corrupted!"); |
122 | psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x", |
129 | psiconv_debug(config,lev+2,off+len,"Expected checksum %08x, found %08x", |
123 | psiconv_checkuid((*result)->uid1,(*result)->uid2, |
130 | psiconv_checkuid((*result)->uid1,(*result)->uid2, |
124 | (*result)->uid3),temp); |
131 | (*result)->uid3),temp); |
125 | res = -PSICONV_E_PARSE; |
132 | res = -PSICONV_E_PARSE; |
126 | goto ERROR2; |
133 | goto ERROR2; |
127 | } |
134 | } |
… | |
… | |
129 | |
136 | |
130 | DONE: |
137 | DONE: |
131 | if (length) |
138 | if (length) |
132 | *length = len; |
139 | *length = len; |
133 | |
140 | |
134 | psiconv_progress(lev+1,off+len-1, |
141 | psiconv_progress(config,lev+1,off+len-1, |
135 | "End of Header Section (total length: %08x)",len); |
142 | "End of Header Section (total length: %08x)",len); |
136 | |
143 | |
137 | return res; |
144 | return res; |
138 | |
145 | |
139 | ERROR2: |
146 | ERROR2: |
140 | free(*result); |
147 | free(*result); |
141 | ERROR1: |
148 | ERROR1: |
142 | psiconv_warn(lev+1,off,"Reading of Header Section failed"); |
149 | psiconv_error(config,lev+1,off,"Reading of Header Section failed"); |
143 | if (length) |
150 | if (length) |
144 | *length = 0; |
151 | *length = 0; |
145 | if (res == 0) |
152 | if (res == 0) |
146 | return -PSICONV_E_NOMEM; |
153 | return -PSICONV_E_NOMEM; |
147 | else |
154 | else |
148 | return res; |
155 | return res; |
149 | } |
156 | } |
150 | |
157 | |
151 | int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev, |
158 | int psiconv_parse_section_table_section(const psiconv_config config, |
|
|
159 | const psiconv_buffer buf, int lev, |
152 | psiconv_u32 off, int *length, |
160 | psiconv_u32 off, int *length, |
153 | psiconv_section_table_section *result) |
161 | psiconv_section_table_section *result) |
154 | { |
162 | { |
155 | int res=0; |
163 | int res=0; |
156 | int len=0; |
164 | int len=0; |
157 | psiconv_section_table_entry entry; |
165 | psiconv_section_table_entry entry; |
158 | |
166 | |
159 | int i; |
167 | int i; |
160 | psiconv_u8 nr; |
168 | psiconv_u8 nr; |
161 | |
169 | |
162 | psiconv_progress(lev+1,off+len,"Going to read the section table section"); |
170 | psiconv_progress(config,lev+1,off+len,"Going to read the section table section"); |
163 | if (!(*result = psiconv_list_new(sizeof(*entry)))) |
171 | if (!(*result = psiconv_list_new(sizeof(*entry)))) |
164 | goto ERROR1; |
172 | goto ERROR1; |
165 | |
173 | |
166 | psiconv_progress(lev+2,off+len,"Going to read the section table length"); |
174 | psiconv_progress(config,lev+2,off+len,"Going to read the section table length"); |
167 | nr = psiconv_read_u8(buf,lev+2,off+len,&res); |
175 | nr = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
168 | if (res) |
176 | if (res) |
169 | goto ERROR2; |
177 | goto ERROR2; |
170 | psiconv_debug(lev+2,off+len,"Length: %08x",nr); |
178 | psiconv_debug(config,lev+2,off+len,"Length: %08x",nr); |
171 | if (nr & 0x01) { |
179 | if (nr & 0x01) { |
172 | psiconv_warn(lev+2,off+len, |
180 | psiconv_warn(config,lev+2,off+len, |
173 | "Section table length odd - ignoring last entry"); |
181 | "Section table length odd - ignoring last entry"); |
174 | } |
182 | } |
175 | len ++; |
183 | len ++; |
176 | |
184 | |
177 | psiconv_progress(lev+2,off+len,"Going to read the section table entries"); |
185 | psiconv_progress(config,lev+2,off+len,"Going to read the section table entries"); |
178 | entry = malloc(sizeof(*entry)); |
186 | entry = malloc(sizeof(*entry)); |
179 | for (i = 0; i < nr / 2; i++) { |
187 | for (i = 0; i < nr / 2; i++) { |
180 | entry->id = psiconv_read_u32(buf,lev+2,off + len,&res); |
188 | entry->id = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
181 | if (res) |
189 | if (res) |
182 | goto ERROR3; |
190 | goto ERROR3; |
183 | psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id); |
191 | psiconv_debug(config,lev+2,off + len,"Entry %d: ID = %08x",i,entry->id); |
184 | len += 0x04; |
192 | len += 0x04; |
185 | entry->offset = psiconv_read_u32(buf,lev+2,off + len,&res); |
193 | entry->offset = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
186 | if (res) |
194 | if (res) |
187 | goto ERROR3; |
195 | goto ERROR3; |
188 | psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset); |
196 | psiconv_debug(config,lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset); |
189 | len += 0x04; |
197 | len += 0x04; |
190 | if ((res=psiconv_list_add(*result,entry))) |
198 | if ((res=psiconv_list_add(*result,entry))) |
191 | goto ERROR3; |
199 | goto ERROR3; |
192 | } |
200 | } |
193 | |
201 | |
194 | free(entry); |
202 | free(entry); |
195 | |
203 | |
196 | if (length) |
204 | if (length) |
197 | *length = len; |
205 | *length = len; |
198 | |
206 | |
199 | psiconv_progress(lev+1,off+len-1,"End of section table section " |
207 | psiconv_progress(config,lev+1,off+len-1,"End of section table section " |
200 | "(total length: %08x)", len); |
208 | "(total length: %08x)", len); |
201 | |
209 | |
202 | return 0; |
210 | return 0; |
203 | ERROR3: |
211 | ERROR3: |
204 | free(entry); |
212 | free(entry); |
205 | ERROR2: |
213 | ERROR2: |
206 | psiconv_list_free(*result); |
214 | psiconv_list_free(*result); |
207 | ERROR1: |
215 | ERROR1: |
208 | psiconv_warn(lev+1,off,"Reading of Section Table Section failed"); |
216 | psiconv_error(config,lev+1,off,"Reading of Section Table Section failed"); |
209 | if (length) |
217 | if (length) |
210 | *length = 0; |
218 | *length = 0; |
211 | if (res == 0) |
219 | if (res == 0) |
212 | return -PSICONV_E_NOMEM; |
220 | return -PSICONV_E_NOMEM; |
213 | else |
221 | else |
214 | return res; |
222 | return res; |
215 | } |
223 | } |
216 | |
224 | |
217 | int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev, |
225 | int psiconv_parse_application_id_section(const psiconv_config config, |
|
|
226 | const psiconv_buffer buf, int lev, |
218 | psiconv_u32 off, int *length, |
227 | psiconv_u32 off, int *length, |
219 | psiconv_application_id_section *result) |
228 | psiconv_application_id_section *result) |
220 | { |
229 | { |
221 | int res=0; |
230 | int res=0; |
222 | int len=0; |
231 | int len=0; |
223 | int leng; |
232 | int leng; |
224 | |
233 | |
225 | psiconv_progress(lev+1,off,"Going to read the application id section"); |
234 | psiconv_progress(config,lev+1,off,"Going to read the application id section"); |
226 | if (!(*result = malloc(sizeof(**result)))) |
235 | if (!(*result = malloc(sizeof(**result)))) |
227 | goto ERROR1; |
236 | goto ERROR1; |
228 | |
237 | |
229 | psiconv_progress(lev+2,off+len,"Going to read the type identifier"); |
238 | psiconv_progress(config,lev+2,off+len,"Going to read the type identifier"); |
230 | (*result)->id = psiconv_read_u32(buf,lev+2,off+len,&res); |
239 | (*result)->id = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
231 | if (res) |
240 | if (res) |
232 | goto ERROR2; |
241 | goto ERROR2; |
233 | psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id); |
242 | psiconv_debug(config,lev+2,off+len,"Identifier: %08x",(*result)->id); |
234 | len += 4; |
243 | len += 4; |
235 | |
244 | |
236 | psiconv_progress(lev+2,off+len,"Going to read the application id string"); |
245 | psiconv_progress(config,lev+2,off+len,"Going to read the application id string"); |
237 | (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res); |
246 | (*result)->name = psiconv_read_string(config,buf,lev+2,off+len,&leng,&res); |
238 | if (res) |
247 | if (res) |
239 | goto ERROR2; |
248 | goto ERROR2; |
240 | len += leng; |
249 | len += leng; |
241 | |
250 | |
242 | if (length) |
251 | if (length) |
243 | *length = len; |
252 | *length = len; |
244 | |
253 | |
245 | psiconv_progress(lev+1,off+len-1,"End of application id section " |
254 | psiconv_progress(config,lev+1,off+len-1,"End of application id section " |
246 | "(total length: %08x", len); |
255 | "(total length: %08x", len); |
247 | |
256 | |
248 | return res; |
257 | return res; |
249 | ERROR2: |
258 | ERROR2: |
250 | free(*result); |
259 | free(*result); |
251 | ERROR1: |
260 | ERROR1: |
252 | psiconv_warn(lev+1,off,"Reading of Application ID Section failed"); |
261 | psiconv_error(config,lev+1,off,"Reading of Application ID Section failed"); |
253 | if (length) |
262 | if (length) |
254 | *length = 0; |
263 | *length = 0; |
255 | if (res == 0) |
264 | if (res == 0) |
256 | return -PSICONV_E_NOMEM; |
265 | return -PSICONV_E_NOMEM; |
257 | else |
266 | else |
258 | return res; |
267 | return res; |
259 | } |
268 | } |
260 | |
269 | |
261 | int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off, |
270 | int psiconv_parse_text_section(const psiconv_config config, |
|
|
271 | const psiconv_buffer buf,int lev,psiconv_u32 off, |
262 | int *length,psiconv_text_and_layout *result) |
272 | int *length,psiconv_text_and_layout *result) |
263 | { |
273 | { |
264 | |
274 | |
265 | int res = 0; |
275 | int res = 0; |
266 | int len=0; |
276 | int len=0; |
267 | |
277 | |
268 | psiconv_u32 text_len; |
278 | psiconv_u32 text_len; |
269 | psiconv_paragraph para; |
279 | psiconv_paragraph para; |
|
|
280 | psiconv_u8 temp; |
270 | |
281 | |
271 | int nr; |
282 | int nr; |
272 | int i,j,start,leng,temp; |
283 | int i,j,start,leng; |
273 | char *str_copy; |
284 | char *str_copy; |
274 | |
285 | |
275 | psiconv_progress(lev+1,off,"Going to parse the text section"); |
286 | psiconv_progress(config,lev+1,off,"Going to parse the text section"); |
276 | psiconv_progress(lev+2,off,"Reading the text length"); |
287 | psiconv_progress(config,lev+2,off,"Reading the text length"); |
277 | |
288 | |
278 | if(!(*result = psiconv_list_new(sizeof(*para)))) |
289 | if(!(*result = psiconv_list_new(sizeof(*para)))) |
279 | goto ERROR1; |
290 | goto ERROR1; |
280 | if (!(para = malloc(sizeof(*para)))) |
291 | if (!(para = malloc(sizeof(*para)))) |
281 | goto ERROR2; |
292 | goto ERROR2; |
282 | |
293 | |
283 | text_len = psiconv_read_X(buf,lev+2,off,&leng,&res); |
294 | text_len = psiconv_read_X(config,buf,lev+2,off,&leng,&res); |
284 | if (res) |
295 | if (res) |
285 | goto ERROR3; |
296 | goto ERROR3; |
286 | psiconv_debug(lev+2,off,"Length: %08x",text_len); |
297 | psiconv_debug(config,lev+2,off,"Length: %08x",text_len); |
287 | len += leng; |
298 | len += leng; |
288 | |
299 | |
289 | psiconv_progress(lev+2,off+len,"Going to read all paragraph text"); |
300 | psiconv_progress(config,lev+2,off+len,"Going to read all paragraph text"); |
290 | nr = 0; |
301 | nr = 0; |
291 | start = 0; |
302 | start = 0; |
292 | for (i = 0; i < text_len; i++) { |
303 | for (i = 0; i < text_len; i++) { |
293 | temp = psiconv_read_u8(buf,lev+2,off+len+i,&res); |
304 | temp = psiconv_read_u8(config,buf,lev+2,off+len+i,&res); |
294 | if (res) |
305 | if (res) |
295 | goto ERROR3; |
306 | goto ERROR3; |
296 | if (temp == 0x06) { |
307 | if (temp == 0x06) { |
297 | if (!(para->text = malloc(i - start + 1))) |
308 | if (!(para->text = malloc((sizeof((*(para->text))) * (i - start + 1))))) |
298 | goto ERROR3; |
309 | goto ERROR3; |
299 | for (j = 0; j < i - start; j++) { |
310 | for (j = 0; j < i - start; j++) { |
300 | temp = psiconv_read_u8(buf,lev+1,off + len + start + j,&res); |
311 | temp = psiconv_read_u8(config,buf,lev+1,off + len + start + j,&res); |
301 | if (res) |
312 | if (res) |
302 | goto ERROR4; |
313 | goto ERROR4; |
303 | para->text[j] = temp; |
314 | para->text[j] = psiconv_unicode_from_char(config,temp); |
304 | } |
315 | } |
305 | para->text[j] = 0; |
316 | para->text[j] = 0; |
306 | |
317 | |
307 | if ((res = psiconv_list_add(*result,para))) |
318 | if ((res = psiconv_list_add(*result,para))) |
308 | goto ERROR4; |
319 | goto ERROR4; |
309 | |
320 | |
310 | if (!(str_copy = psiconv_make_printable(para->text))) |
321 | if (!(str_copy = psiconv_make_printable(config,para->text))) |
311 | goto ERROR3; |
322 | goto ERROR3; |
312 | psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr, |
323 | psiconv_debug(config,lev+2,off+i+len,"Line %d: %d characters",nr, |
313 | strlen(str_copy) +1); |
324 | strlen(str_copy) +1); |
314 | psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy); |
325 | psiconv_debug(config,lev+2,off+i+len,"Line %d: `%s'",nr,str_copy); |
315 | free(str_copy); |
326 | free(str_copy); |
316 | |
327 | |
317 | start = i + 1; |
328 | start = i + 1; |
318 | nr ++; |
329 | nr ++; |
319 | } |
330 | } |
320 | } |
331 | } |
321 | |
332 | |
322 | if (start != text_len) { |
333 | if (start != text_len) { |
323 | psiconv_warn(lev+2,off+start+len, |
334 | psiconv_warn(config,lev+2,off+start+len, |
324 | "Last line does not end on EOL (%d characters left)", len - start); |
335 | "Last line does not end on EOL (%d characters left)", len - start); |
325 | if (!(para->text = malloc(text_len - start + 1))) |
336 | if (!(para->text = malloc(text_len - start + 1))) |
326 | goto ERROR3; |
337 | goto ERROR3; |
327 | for (j = 0; j < text_len - start; j++) { |
338 | for (j = 0; j < text_len - start; j++) { |
328 | temp = psiconv_read_u8(buf,lev+2,off + start + j + len, &res); |
339 | temp = psiconv_read_u8(config,buf,lev+2,off + start + j + len, &res); |
329 | if (res) |
340 | if (res) |
330 | goto ERROR4; |
341 | goto ERROR4; |
331 | para->text[j] = temp; |
342 | para->text[j] = psiconv_unicode_from_char(config,temp); |
332 | } |
343 | } |
333 | para->text[text_len - start] = 0; |
344 | para->text[text_len - start] = 0; |
334 | if ((res = psiconv_list_add(*result,para))) |
345 | if ((res = psiconv_list_add(*result,para))) |
335 | goto ERROR4; |
346 | goto ERROR4; |
336 | if (!(str_copy = psiconv_make_printable(para->text))) |
347 | if (!(str_copy = psiconv_make_printable(config,para->text))) |
337 | goto ERROR3; |
348 | goto ERROR3; |
338 | psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr, |
349 | psiconv_debug(config,lev+2,off+start+len,"Last line: %d characters",nr, |
339 | strlen(str_copy)+1); |
350 | strlen(str_copy)+1); |
340 | psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy); |
351 | psiconv_debug(config,lev+2,off+start+len,"Last line: `%s'",str_copy); |
341 | free(str_copy); |
352 | free(str_copy); |
342 | } |
353 | } |
343 | |
354 | |
344 | free(para); |
355 | free(para); |
345 | |
356 | |
346 | /* Initialize the remaining parts of each paragraph */ |
357 | /* Initialize the remaining parts of each paragraph */ |
347 | for (i = 0; i < psiconv_list_length(*result); i ++) { |
358 | for (i = 0; i < psiconv_list_length(*result); i ++) { |
348 | if (!(para = psiconv_list_get(*result,i))) { |
359 | if (!(para = psiconv_list_get(*result,i))) { |
349 | psiconv_warn(lev+2,off+len,"Massive memory corruption"); |
360 | psiconv_error(config,lev+2,off+len,"Massive memory corruption"); |
350 | goto ERROR2_0; |
361 | goto ERROR2_0; |
351 | } |
362 | } |
352 | if (!(para->in_lines = psiconv_list_new(sizeof( |
363 | if (!(para->in_lines = psiconv_list_new(sizeof( |
353 | struct psiconv_in_line_layout_s)))) |
364 | struct psiconv_in_line_layout_s)))) |
354 | goto ERROR2_0; |
365 | goto ERROR2_0; |
… | |
… | |
366 | len += text_len; |
377 | len += text_len; |
367 | |
378 | |
368 | if (length) |
379 | if (length) |
369 | *length = len; |
380 | *length = len; |
370 | |
381 | |
371 | psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x", |
382 | psiconv_progress(config,lev+1,off+len-1,"End of text section (total length: %08x", |
372 | len); |
383 | len); |
373 | |
384 | |
374 | return res; |
385 | return res; |
375 | |
386 | |
376 | ERROR2_3: |
387 | ERROR2_3: |
… | |
… | |
380 | ERROR2_1: |
391 | ERROR2_1: |
381 | psiconv_list_free(para->in_lines); |
392 | psiconv_list_free(para->in_lines); |
382 | ERROR2_0: |
393 | ERROR2_0: |
383 | for (j = 0; j < i; j++) { |
394 | for (j = 0; j < i; j++) { |
384 | if (!(para = psiconv_list_get(*result,j))) { |
395 | if (!(para = psiconv_list_get(*result,j))) { |
385 | psiconv_warn(lev+1,off,"Massive memory corruption..."); |
396 | psiconv_error(config,lev+1,off,"Massive memory corruption..."); |
386 | break; |
397 | break; |
387 | } |
398 | } |
388 | psiconv_list_free(para->in_lines); |
399 | psiconv_list_free(para->in_lines); |
389 | psiconv_list_free(para->replacements); |
400 | psiconv_list_free(para->replacements); |
390 | psiconv_free_character_layout(para->base_character); |
401 | psiconv_free_character_layout(para->base_character); |
… | |
… | |
397 | ERROR3: |
408 | ERROR3: |
398 | free(para); |
409 | free(para); |
399 | ERROR2: |
410 | ERROR2: |
400 | for (i = 0; i < psiconv_list_length(*result);i++) { |
411 | for (i = 0; i < psiconv_list_length(*result);i++) { |
401 | if (!(para = psiconv_list_get(*result,i))) { |
412 | if (!(para = psiconv_list_get(*result,i))) { |
402 | psiconv_warn(lev+1,off,"Massive memory corruption..."); |
413 | psiconv_error(config,lev+1,off,"Massive memory corruption..."); |
403 | break; |
414 | break; |
404 | } |
415 | } |
405 | free(para->text); |
416 | free(para->text); |
406 | } |
417 | } |
407 | psiconv_list_free(*result); |
418 | psiconv_list_free(*result); |
408 | ERROR1: |
419 | ERROR1: |
409 | psiconv_warn(lev+1,off,"Reading of Text Section failed"); |
420 | psiconv_error(config,lev+1,off,"Reading of Text Section failed"); |
410 | if (length) |
421 | if (length) |
411 | *length = 0; |
422 | *length = 0; |
412 | if (!res) |
423 | if (!res) |
413 | return -PSICONV_E_NOMEM; |
424 | return -PSICONV_E_NOMEM; |
414 | else |
425 | else |
415 | return res; |
426 | return res; |
416 | } |
427 | } |
417 | |
428 | |
418 | /* First do a parse_text_section, or you will get into trouble here */ |
429 | /* First do a parse_text_section, or you will get into trouble here */ |
419 | int psiconv_parse_layout_section(const psiconv_buffer buf, |
430 | int psiconv_parse_layout_section(const psiconv_config config, |
|
|
431 | const psiconv_buffer buf, |
420 | int lev,psiconv_u32 off, |
432 | int lev,psiconv_u32 off, |
421 | int *length, |
433 | int *length, |
422 | psiconv_text_and_layout result, |
434 | psiconv_text_and_layout result, |
423 | psiconv_word_styles_section styles, |
435 | psiconv_word_styles_section styles, |
424 | int with_styles) |
436 | int with_styles) |
… | |
… | |
449 | struct psiconv_in_line_layout_s in_line; |
461 | struct psiconv_in_line_layout_s in_line; |
450 | |
462 | |
451 | int *inline_count; |
463 | int *inline_count; |
452 | |
464 | |
453 | |
465 | |
454 | psiconv_progress(lev+1,off,"Going to read the layout section"); |
466 | psiconv_progress(config,lev+1,off,"Going to read the layout section"); |
455 | |
467 | |
456 | psiconv_progress(lev+2,off,"Going to read the section type"); |
468 | psiconv_progress(config,lev+2,off,"Going to read the section type"); |
457 | temp = psiconv_read_u16(buf,lev+2,off+len,&res); |
469 | temp = psiconv_read_u16(config,buf,lev+2,off+len,&res); |
458 | if (res) |
470 | if (res) |
459 | goto ERROR1; |
471 | goto ERROR1; |
460 | psiconv_debug(lev+2,off+len,"Type: %02x",temp); |
472 | psiconv_debug(config,lev+2,off+len,"Type: %02x",temp); |
461 | parse_styles = with_styles; |
473 | parse_styles = with_styles; |
462 | if ((temp == 0x0001) && !with_styles) { |
474 | if ((temp == 0x0001) && !with_styles) { |
463 | psiconv_warn(lev+2,off+len,"Styleless layout section expected, " |
475 | psiconv_warn(config,lev+2,off+len,"Styleless layout section expected, " |
464 | "but styled section found!"); |
476 | "but styled section found!"); |
465 | parse_styles = 1; |
477 | parse_styles = 1; |
466 | } else if ((temp == 0x0000) && (with_styles)) { |
478 | } else if ((temp == 0x0000) && (with_styles)) { |
467 | psiconv_warn(lev+2,off+len,"Styled layout section expected, " |
479 | psiconv_warn(config,lev+2,off+len,"Styled layout section expected, " |
468 | "but styleless section found!"); |
480 | "but styleless section found!"); |
469 | parse_styles = 0; |
481 | parse_styles = 0; |
470 | } else if ((temp != 0x0000) && (temp != 0x0001)) { |
482 | } else if ((temp != 0x0000) && (temp != 0x0001)) { |
471 | psiconv_warn(lev+2,off+len, |
483 | psiconv_warn(config,lev+2,off+len, |
472 | "Layout section type indicator has unknown value!"); |
484 | "Layout section type indicator has unknown value!"); |
473 | } |
485 | } |
474 | len += 0x02; |
486 | len += 0x02; |
475 | |
487 | |
476 | psiconv_progress(lev+2,off+len,"Going to read paragraph type list"); |
488 | psiconv_progress(config,lev+2,off+len,"Going to read paragraph type list"); |
477 | if (!(anon_styles = psiconv_list_new(sizeof(anon)))) |
489 | if (!(anon_styles = psiconv_list_new(sizeof(anon)))) |
478 | goto ERROR1; |
490 | goto ERROR1; |
479 | psiconv_progress(lev+3,off+len,"Going to read paragraph type list length"); |
491 | psiconv_progress(config,lev+3,off+len,"Going to read paragraph type list length"); |
480 | nr = psiconv_read_u8(buf,lev+3,off+len,&res); |
492 | nr = psiconv_read_u8(config,buf,lev+3,off+len,&res); |
481 | if (res) |
493 | if (res) |
482 | goto ERROR2; |
494 | goto ERROR2; |
483 | psiconv_debug(lev+3,off+len,"Length: %02x",nr); |
495 | psiconv_debug(config,lev+3,off+len,"Length: %02x",nr); |
484 | len ++; |
496 | len ++; |
485 | |
497 | |
486 | psiconv_progress(lev+3,off+len, |
498 | psiconv_progress(config,lev+3,off+len, |
487 | "Going to read the paragraph type list elements"); |
499 | "Going to read the paragraph type list elements"); |
488 | for (i = 0; i < nr; i ++) { |
500 | for (i = 0; i < nr; i ++) { |
489 | psiconv_progress(lev+3,off+len,"Element %d",i); |
501 | psiconv_progress(config,lev+3,off+len,"Element %d",i); |
490 | anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res); |
502 | anon.nr = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
491 | if (res) |
503 | if (res) |
492 | goto ERROR3; |
504 | goto ERROR3; |
493 | psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr); |
505 | psiconv_debug(config,lev+4,off+len,"Number: %08x",anon.nr); |
494 | len += 0x04; |
506 | len += 0x04; |
495 | |
507 | |
496 | psiconv_progress(lev+4,off,"Going to determine the base style"); |
508 | psiconv_progress(config,lev+4,off,"Going to determine the base style"); |
497 | if (parse_styles) { |
509 | if (parse_styles) { |
498 | temp = psiconv_read_u32(buf,lev+4, off+len,&res); |
510 | temp = psiconv_read_u32(config,buf,lev+4, off+len,&res); |
499 | if (res) |
511 | if (res) |
500 | goto ERROR3; |
512 | goto ERROR3; |
501 | anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res); |
513 | anon.base_style = psiconv_read_u8(config,buf,lev+3, off+len+4+temp,&res); |
502 | if (res) |
514 | if (res) |
503 | goto ERROR3; |
515 | goto ERROR3; |
504 | psiconv_debug(lev+4,off+len+temp, |
516 | psiconv_debug(config,lev+4,off+len+temp, |
505 | "Style indicator: %02x",anon.base_style); |
517 | "Style indicator: %02x",anon.base_style); |
506 | } else |
518 | } else |
507 | anon.base_style = 0; |
519 | anon.base_style = 0; |
508 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
520 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
509 | psiconv_warn(lev+4,off,"Unknown Style referenced"); |
521 | psiconv_warn(config,lev+4,off,"Unknown Style referenced"); |
510 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
522 | if (!(temp_style = psiconv_get_style(styles,anon.base_style))) { |
511 | psiconv_warn(lev+4,off,"Base style unknown"); |
523 | psiconv_warn(config,lev+4,off,"Base style unknown"); |
512 | goto ERROR3; |
524 | goto ERROR3; |
513 | } |
525 | } |
514 | } |
526 | } |
515 | if (!(anon.paragraph = psiconv_clone_paragraph_layout |
527 | if (!(anon.paragraph = psiconv_clone_paragraph_layout |
516 | (temp_style->paragraph))) |
528 | (temp_style->paragraph))) |
517 | goto ERROR3; |
529 | goto ERROR3; |
518 | if (!(anon.character = psiconv_clone_character_layout |
530 | if (!(anon.character = psiconv_clone_character_layout |
519 | (temp_style->character))) |
531 | (temp_style->character))) |
520 | goto ERROR3_1; |
532 | goto ERROR3_1; |
521 | |
533 | |
522 | psiconv_progress(lev+4,off+len,"Going to read the paragraph layout"); |
534 | psiconv_progress(config,lev+4,off+len,"Going to read the paragraph layout"); |
523 | if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, |
535 | if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng, |
524 | anon.paragraph))) |
536 | anon.paragraph))) |
525 | goto ERROR3_2; |
537 | goto ERROR3_2; |
526 | len += leng; |
538 | len += leng; |
527 | if (parse_styles) |
539 | if (parse_styles) |
528 | len ++; |
540 | len ++; |
529 | |
541 | |
530 | psiconv_progress(lev+4,off+len,"Going to read the character layout"); |
542 | psiconv_progress(config,lev+4,off+len,"Going to read the character layout"); |
531 | if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, |
543 | if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng, |
532 | anon.character))) |
544 | anon.character))) |
533 | goto ERROR3_2; |
545 | goto ERROR3_2; |
534 | len += leng; |
546 | len += leng; |
535 | if ((res = psiconv_list_add(anon_styles,&anon))) |
547 | if ((res = psiconv_list_add(anon_styles,&anon))) |
536 | goto ERROR3_2; |
548 | goto ERROR3_2; |
537 | } |
549 | } |
538 | |
550 | |
539 | psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list"); |
551 | psiconv_progress(config,lev+2,off+len,"Going to parse the paragraph element list"); |
540 | psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs"); |
552 | psiconv_progress(config,lev+3,off+len,"Going to read the number of paragraphs"); |
541 | nr = psiconv_read_u32(buf,lev+3,off+len,&res); |
553 | nr = psiconv_read_u32(config,buf,lev+3,off+len,&res); |
542 | if (res) |
554 | if (res) |
543 | goto ERROR3; |
555 | goto ERROR3; |
544 | if (nr != psiconv_list_length(result)) { |
556 | if (nr != psiconv_list_length(result)) { |
545 | psiconv_warn(lev+3,off+len, |
557 | psiconv_warn(config,lev+3,off+len, |
546 | "Number of text paragraphs and paragraph elements does not match"); |
558 | "Number of text paragraphs and paragraph elements does not match"); |
547 | psiconv_debug(lev+3,off+len, |
559 | psiconv_debug(config,lev+3,off+len, |
548 | "%d text paragraphs, %d paragraph elements", |
560 | "%d text paragraphs, %d paragraph elements", |
549 | psiconv_list_length(result),nr); |
561 | psiconv_list_length(result),nr); |
550 | } |
562 | } |
551 | psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr); |
563 | psiconv_debug(config,lev+3,off+len,"Number of paragraphs: %d",nr); |
552 | len += 4; |
564 | len += 4; |
553 | if (!(inline_count = malloc(nr * sizeof(*inline_count)))) |
565 | if (!(inline_count = malloc(nr * sizeof(*inline_count)))) |
554 | goto ERROR3; |
566 | goto ERROR3; |
555 | |
567 | |
556 | psiconv_progress(lev+3,off+len,"Going to read the paragraph elements"); |
568 | psiconv_progress(config,lev+3,off+len,"Going to read the paragraph elements"); |
557 | for (i = 0; i < nr; i ++) { |
569 | for (i = 0; i < nr; i ++) { |
558 | psiconv_progress(lev+3,off+len,"Element %d",i); |
570 | psiconv_progress(config,lev+3,off+len,"Element %d",i); |
559 | if (i >= psiconv_list_length(result)) { |
571 | if (i >= psiconv_list_length(result)) { |
560 | psiconv_debug(lev+4,off+len,"Going to allocate a new element"); |
572 | psiconv_debug(config,lev+4,off+len,"Going to allocate a new element"); |
561 | if (!(para = malloc(sizeof(*para)))) |
573 | if (!(para = malloc(sizeof(*para)))) |
562 | goto ERROR4; |
574 | goto ERROR4; |
563 | if (!(para->in_lines = psiconv_list_new(sizeof( |
575 | if (!(para->in_lines = psiconv_list_new(sizeof( |
564 | struct psiconv_in_line_layout_s)))) |
576 | struct psiconv_in_line_layout_s)))) |
565 | goto ERROR4_1; |
577 | goto ERROR4_1; |
… | |
… | |
573 | free(para); |
585 | free(para); |
574 | } |
586 | } |
575 | if (!(para = psiconv_list_get(result,i))) |
587 | if (!(para = psiconv_list_get(result,i))) |
576 | goto ERROR4; |
588 | goto ERROR4; |
577 | |
589 | |
578 | psiconv_progress(lev+4,off+len,"Going to read the paragraph length"); |
590 | psiconv_progress(config,lev+4,off+len,"Going to read the paragraph length"); |
579 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
591 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
580 | if (res) |
592 | if (res) |
581 | goto ERROR4; |
593 | goto ERROR4; |
582 | if (temp != strlen(para->text)+1) { |
594 | if (temp != psiconv_unicode_strlen(para->text)+1) { |
583 | psiconv_warn(lev+4,off+len, |
595 | psiconv_warn(config,lev+4,off+len, |
584 | "Disagreement of the length of paragraph in layout section"); |
596 | "Disagreement of the length of paragraph in layout section"); |
585 | psiconv_debug(lev+4,off+len, |
597 | psiconv_debug(config,lev+4,off+len, |
586 | "Paragraph length: layout section says %d, counted %d", |
598 | "Paragraph length: layout section says %d, counted %d", |
587 | temp,strlen(para->text)+1); |
599 | temp,psiconv_unicode_strlen(para->text)+1); |
588 | } else |
600 | } else |
589 | psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp); |
601 | psiconv_debug(config,lev+4,off+len,"Paragraph length: %d",temp); |
590 | len += 4; |
602 | len += 4; |
591 | |
603 | |
592 | psiconv_progress(lev+4,off+len,"Going to read the paragraph type"); |
604 | psiconv_progress(config,lev+4,off+len,"Going to read the paragraph type"); |
593 | temp = psiconv_read_u8(buf,lev+4,off+len,&res); |
605 | temp = psiconv_read_u8(config,buf,lev+4,off+len,&res); |
594 | if (res) |
606 | if (res) |
595 | goto ERROR4; |
607 | goto ERROR4; |
596 | if (temp != 0x00) { |
608 | if (temp != 0x00) { |
597 | psiconv_debug(lev+4,off+len,"Type: %02x",temp); |
609 | psiconv_debug(config,lev+4,off+len,"Type: %02x",temp); |
598 | for (j = 0; j < psiconv_list_length(anon_styles); j++) { |
610 | for (j = 0; j < psiconv_list_length(anon_styles); j++) { |
599 | if (!(anon_ptr = psiconv_list_get(anon_styles,j))) { |
611 | if (!(anon_ptr = psiconv_list_get(anon_styles,j))) { |
600 | psiconv_warn(lev+4,off+len,"Massive memory curruption"); |
612 | psiconv_error(config,lev+4,off+len,"Massive memory curruption"); |
601 | goto ERROR4; |
613 | goto ERROR4; |
602 | } |
614 | } |
603 | if (temp == anon_ptr->nr) |
615 | if (temp == anon_ptr->nr) |
604 | break; |
616 | break; |
605 | } |
617 | } |
606 | if (j == psiconv_list_length(anon_styles)) { |
618 | if (j == psiconv_list_length(anon_styles)) { |
607 | psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown"); |
619 | psiconv_warn(config,lev+4,off+len,"Layout section paragraph type unknown"); |
608 | psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead"); |
620 | psiconv_debug(config,lev+4,off+len,"Unknown type - using base styles instead"); |
609 | para->base_style = 0; |
621 | para->base_style = 0; |
610 | if (!(temp_style = psiconv_get_style(styles,0))) { |
622 | if (!(temp_style = psiconv_get_style(styles,0))) { |
611 | psiconv_warn(lev+4,off,"Base style unknown"); |
623 | psiconv_error(config,lev+4,off,"Base style unknown"); |
612 | goto ERROR4; |
624 | goto ERROR4; |
613 | } |
625 | } |
614 | if (!(temp_para = psiconv_clone_paragraph_layout |
626 | if (!(temp_para = psiconv_clone_paragraph_layout |
615 | (temp_style->paragraph))) |
627 | (temp_style->paragraph))) |
616 | goto ERROR4; |
628 | goto ERROR4; |
… | |
… | |
635 | para->base_character = temp_char; |
647 | para->base_character = temp_char; |
636 | } |
648 | } |
637 | inline_count[i] = 0; |
649 | inline_count[i] = 0; |
638 | len += 0x01; |
650 | len += 0x01; |
639 | } else { |
651 | } else { |
640 | psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)" |
652 | psiconv_debug(config,lev+4,off+len,"Type: %02x (not based on a paragraph type)" |
641 | ,temp); |
653 | ,temp); |
642 | len += 0x01; |
654 | len += 0x01; |
643 | if (parse_styles) { |
655 | if (parse_styles) { |
644 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
656 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
645 | if (res) |
657 | if (res) |
646 | goto ERROR4; |
658 | goto ERROR4; |
647 | psiconv_progress(lev+4,off+len+temp+4, |
659 | psiconv_progress(config,lev+4,off+len+temp+4, |
648 | "Going to read the paragraph element base style"); |
660 | "Going to read the paragraph element base style"); |
649 | temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res); |
661 | temp = psiconv_read_u8(config,buf,lev+4, off+len+temp+4,&res); |
650 | if (res) |
662 | if (res) |
651 | goto ERROR4; |
663 | goto ERROR4; |
652 | psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp); |
664 | psiconv_debug(config,lev+4,off+len+temp+4, "Style: %02x",temp); |
653 | } else |
665 | } else |
654 | temp = 0x00; |
666 | temp = 0x00; |
655 | |
667 | |
656 | if (!(temp_style = psiconv_get_style (styles,temp))) { |
668 | if (!(temp_style = psiconv_get_style (styles,temp))) { |
657 | psiconv_warn(lev+4,off,"Unknown Style referenced"); |
669 | psiconv_warn(config,lev+4,off,"Unknown Style referenced"); |
658 | if (!(temp_style = psiconv_get_style(styles,0))) { |
670 | if (!(temp_style = psiconv_get_style(styles,0))) { |
659 | psiconv_warn(lev+4,off,"Base style unknown"); |
671 | psiconv_error(config,lev+4,off,"Base style unknown"); |
660 | goto ERROR4; |
672 | goto ERROR4; |
661 | } |
673 | } |
662 | } |
674 | } |
663 | |
675 | |
664 | if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph))) |
676 | if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph))) |
… | |
… | |
670 | goto ERROR4; |
682 | goto ERROR4; |
671 | psiconv_free_character_layout(para->base_character); |
683 | psiconv_free_character_layout(para->base_character); |
672 | para->base_character = temp_char; |
684 | para->base_character = temp_char; |
673 | |
685 | |
674 | para->base_style = temp; |
686 | para->base_style = temp; |
675 | psiconv_progress(lev+4,off+len,"Going to read paragraph layout"); |
687 | psiconv_progress(config,lev+4,off+len,"Going to read paragraph layout"); |
676 | if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, |
688 | if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+4,off+len,&leng, |
677 | para->base_paragraph))) |
689 | para->base_paragraph))) |
678 | goto ERROR4; |
690 | goto ERROR4; |
679 | len += leng; |
691 | len += leng; |
680 | if (parse_styles) |
692 | if (parse_styles) |
681 | len += 1; |
693 | len += 1; |
682 | psiconv_progress(lev+4,off+len,"Going to read number of in-line " |
694 | psiconv_progress(config,lev+4,off+len,"Going to read number of in-line " |
683 | "layout elements"); |
695 | "layout elements"); |
684 | inline_count[i] = psiconv_read_u32(buf,lev+4,off+len,&res); |
696 | inline_count[i] = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
685 | if (res) |
697 | if (res) |
686 | goto ERROR4; |
698 | goto ERROR4; |
687 | psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]); |
699 | psiconv_debug(config,lev+4,off+len,"Nr: %08x",inline_count[i]); |
688 | len += 4; |
700 | len += 4; |
689 | } |
701 | } |
690 | } |
702 | } |
691 | |
703 | |
692 | psiconv_progress(lev+2,off+len,"Going to read the text layout inline list"); |
704 | psiconv_progress(config,lev+2,off+len,"Going to read the text layout inline list"); |
693 | |
705 | |
694 | psiconv_progress(lev+3,off+len,"Going to read the number of elements"); |
706 | psiconv_progress(config,lev+3,off+len,"Going to read the number of elements"); |
695 | nr = psiconv_read_u32(buf,lev+3,off+len,&res); |
707 | nr = psiconv_read_u32(config,buf,lev+3,off+len,&res); |
696 | if (res) |
708 | if (res) |
697 | goto ERROR4; |
709 | goto ERROR4; |
698 | psiconv_debug(lev+3,off+len,"Elements: %08x",nr); |
710 | psiconv_debug(config,lev+3,off+len,"Elements: %08x",nr); |
699 | len += 0x04; |
711 | len += 0x04; |
700 | |
712 | |
701 | psiconv_progress(lev+3,off+len, |
713 | psiconv_progress(config,lev+3,off+len, |
702 | "Going to read the text layout inline elements"); |
714 | "Going to read the text layout inline elements"); |
703 | total = 0; |
715 | total = 0; |
704 | for (i = 0; i < psiconv_list_length(result); i++) { |
716 | for (i = 0; i < psiconv_list_length(result); i++) { |
705 | if (!(para = psiconv_list_get(result,i))) { |
717 | if (!(para = psiconv_list_get(result,i))) { |
706 | psiconv_warn(lev+3,off+len,"Massive memory corruption"); |
718 | psiconv_error(config,lev+3,off+len,"Massive memory corruption"); |
707 | goto ERROR4; |
719 | goto ERROR4; |
708 | } |
720 | } |
709 | line_length = -1; |
721 | line_length = -1; |
710 | for (j = 0; j < inline_count[i]; j++) { |
722 | for (j = 0; j < inline_count[i]; j++) { |
711 | psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d", |
723 | psiconv_progress(config,lev+3,off+len,"Element %d: Paragraph %d, element %d", |
712 | total,i,j); |
724 | total,i,j); |
713 | if (total >= nr) { |
725 | if (total >= nr) { |
714 | psiconv_warn(lev+3,off+len, |
726 | psiconv_warn(config,lev+3,off+len, |
715 | "Layout section inlines: not enough element"); |
727 | "Layout section inlines: not enough element"); |
716 | psiconv_debug(lev+3,off+len,"Can't read element!"); |
728 | psiconv_debug(config,lev+3,off+len,"Can't read element!"); |
717 | } else { |
729 | } else { |
718 | total ++; |
730 | total ++; |
719 | in_line.object = NULL; |
731 | in_line.object = NULL; |
720 | in_line.layout = NULL; |
732 | in_line.layout = NULL; |
721 | if (!(in_line.layout = psiconv_clone_character_layout |
733 | if (!(in_line.layout = psiconv_clone_character_layout |
722 | (para->base_character))) |
734 | (para->base_character))) |
723 | goto ERROR4; |
735 | goto ERROR4; |
724 | psiconv_progress(lev+4,off+len,"Going to read the element type"); |
736 | psiconv_progress(config,lev+4,off+len,"Going to read the element type"); |
725 | temp = psiconv_read_u8(buf,lev+4,len+off,&res); |
737 | temp = psiconv_read_u8(config,buf,lev+4,len+off,&res); |
726 | if (res) |
738 | if (res) |
727 | goto ERROR5; |
739 | goto ERROR5; |
728 | len += 1; |
740 | len += 1; |
729 | psiconv_debug(lev+4,off+len,"Type: %02x",temp); |
741 | psiconv_debug(config,lev+4,off+len,"Type: %02x",temp); |
730 | psiconv_progress(lev+4,off+len, |
742 | psiconv_progress(config,lev+4,off+len, |
731 | "Going to read the number of characters it applies to"); |
743 | "Going to read the number of characters it applies to"); |
732 | in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res); |
744 | in_line.length = psiconv_read_u32(config,buf,lev+4,len+off,&res); |
733 | if (res) |
745 | if (res) |
734 | goto ERROR5; |
746 | goto ERROR5; |
735 | psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); |
747 | psiconv_debug(config,lev+4,off+len,"Length: %02x",in_line.length); |
736 | len += 4; |
748 | len += 4; |
737 | psiconv_progress(lev+4,off+len,"Going to read the character layout"); |
749 | psiconv_progress(config,lev+4,off+len,"Going to read the character layout"); |
738 | if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, |
750 | if ((res = psiconv_parse_character_layout_list(config,buf,lev+4,off+len,&leng, |
739 | in_line.layout))) |
751 | in_line.layout))) |
740 | goto ERROR5; |
752 | goto ERROR5; |
741 | len += leng; |
753 | len += leng; |
742 | |
754 | |
743 | if (temp == 0x01) { |
755 | if (temp == 0x01) { |
744 | psiconv_debug(lev+4,off+len,"Found an embedded object"); |
756 | psiconv_debug(config,lev+4,off+len,"Found an embedded object"); |
745 | psiconv_progress(lev+4,off+len,"Going to read the object marker " |
757 | psiconv_progress(config,lev+4,off+len,"Going to read the object marker " |
746 | "(0x%08x expected)",PSICONV_ID_OBJECT); |
758 | "(0x%08x expected)",PSICONV_ID_OBJECT); |
747 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
759 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
748 | if (res) |
760 | if (res) |
749 | goto ERROR5; |
761 | goto ERROR5; |
750 | if (temp != PSICONV_ID_OBJECT) { |
762 | if (temp != PSICONV_ID_OBJECT) { |
751 | psiconv_warn(lev+4,off+len,"Unknown id marks embedded object"); |
763 | psiconv_warn(config,lev+4,off+len,"Unknown id marks embedded object"); |
752 | psiconv_debug(lev+4,off+len,"Marker: read %08x, expected %08x", |
764 | psiconv_debug(config,lev+4,off+len,"Marker: read %08x, expected %08x", |
753 | temp,PSICONV_ID_OBJECT); |
765 | temp,PSICONV_ID_OBJECT); |
754 | } |
766 | } |
755 | len += 4; |
767 | len += 4; |
756 | psiconv_progress(lev+4,off+len, |
768 | psiconv_progress(config,lev+4,off+len, |
757 | "Going to read the Embedded Object Section offset"); |
769 | "Going to read the Embedded Object Section offset"); |
758 | temp = psiconv_read_u32(buf,lev+4,off+len,&res); |
770 | temp = psiconv_read_u32(config,buf,lev+4,off+len,&res); |
759 | if (res) |
771 | if (res) |
760 | goto ERROR5; |
772 | goto ERROR5; |
761 | psiconv_debug(lev+4,off+len, "Offset: %08x",temp); |
773 | psiconv_debug(config,lev+4,off+len, "Offset: %08x",temp); |
762 | len += 4; |
774 | len += 4; |
763 | psiconv_progress(lev+4,off+len, |
775 | psiconv_progress(config,lev+4,off+len, |
764 | "Going to parse the Embedded Object"); |
776 | "Going to parse the Embedded Object Section"); |
765 | if ((res = psiconv_parse_embedded_object(buf,lev+4,temp, |
777 | if ((res = psiconv_parse_embedded_object_section(config,buf,lev+4,temp, |
766 | NULL,&(in_line.object)))) |
778 | NULL,&(in_line.object)))) |
767 | goto ERROR5; |
779 | goto ERROR5; |
768 | psiconv_progress(lev+4,off+len, |
780 | psiconv_progress(config,lev+4,off+len, |
769 | "Going to read the object width"); |
781 | "Going to read the object width"); |
770 | in_line.object_width = psiconv_read_length(buf,lev+4,off+len, |
782 | in_line.object_width = psiconv_read_length(config,buf,lev+4,off+len, |
771 | &leng,&res); |
783 | &leng,&res); |
772 | if (res) |
784 | if (res) |
773 | goto ERROR5; |
785 | goto ERROR5; |
774 | psiconv_debug(lev+4,off+len,"Object width: %f cm", |
786 | psiconv_debug(config,lev+4,off+len,"Object width: %f cm", |
775 | in_line.object_width); |
787 | in_line.object_width); |
776 | len += leng; |
788 | len += leng; |
777 | psiconv_progress(lev+4,off+len, |
789 | psiconv_progress(config,lev+4,off+len, |
778 | "Going to read the object height"); |
790 | "Going to read the object height"); |
779 | in_line.object_height = psiconv_read_length(buf,lev+4,off+len,&leng, |
791 | in_line.object_height = psiconv_read_length(config,buf,lev+4,off+len,&leng, |
780 | &res); |
792 | &res); |
781 | if (res) |
793 | if (res) |
782 | goto ERROR5; |
794 | goto ERROR5; |
783 | psiconv_debug(lev+4,off+len,"Object height: %f cm", |
795 | psiconv_debug(config,lev+4,off+len,"Object height: %f cm", |
784 | in_line.object_height); |
796 | in_line.object_height); |
785 | len += leng; |
797 | len += leng; |
786 | } else if (temp != 0x00) { |
798 | } else if (temp != 0x00) { |
787 | psiconv_warn(lev+4,off+len,"Layout section unknown inline type"); |
799 | psiconv_warn(config,lev+4,off+len,"Layout section unknown inline type"); |
788 | } |
800 | } |
789 | if (line_length + in_line.length > strlen(para->text)) { |
801 | if (line_length + in_line.length > psiconv_unicode_strlen(para->text)) { |
790 | psiconv_warn(lev+4,off+len, |
802 | psiconv_warn(config,lev+4,off+len, |
791 | "Layout section inlines: line length mismatch"); |
803 | "Layout section inlines: line length mismatch"); |
792 | res = -1; |
804 | res = -1; |
793 | in_line.length = strlen(para->text) - line_length; |
805 | in_line.length = psiconv_unicode_strlen(para->text) - line_length; |
794 | } |
806 | } |
795 | line_length += in_line.length; |
807 | line_length += in_line.length; |
796 | if ((res = psiconv_list_add(para->in_lines,&in_line))) |
808 | if ((res = psiconv_list_add(para->in_lines,&in_line))) |
797 | goto ERROR5; |
809 | goto ERROR5; |
798 | } |
810 | } |
799 | } |
811 | } |
800 | } |
812 | } |
801 | |
813 | |
802 | if (total != nr) { |
814 | if (total != nr) { |
803 | psiconv_warn(lev+4,off+len, |
815 | psiconv_warn(config,lev+4,off+len, |
804 | "Layout section too many inlines, skipping remaining"); |
816 | "Layout section too many inlines, skipping remaining"); |
805 | } |
817 | } |
806 | |
818 | |
807 | free(inline_count); |
819 | free(inline_count); |
808 | |
820 | |
809 | for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { |
821 | for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { |
810 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
822 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
811 | psiconv_warn(lev+4,off+len,"Massive memory corruption"); |
823 | psiconv_error(config,lev+4,off+len,"Massive memory corruption"); |
812 | goto ERROR2; |
824 | goto ERROR2; |
813 | } |
825 | } |
814 | psiconv_free_character_layout(anon_ptr->character); |
826 | psiconv_free_character_layout(anon_ptr->character); |
815 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
827 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
816 | } |
828 | } |
817 | psiconv_list_free(anon_styles); |
829 | psiconv_list_free(anon_styles); |
818 | |
830 | |
819 | if (length) |
831 | if (length) |
820 | *length = len; |
832 | *length = len; |
821 | |
833 | |
822 | psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x)", |
834 | psiconv_progress(config,lev+1,off+len-1,"End of layout section (total length: %08x)", |
823 | len); |
835 | len); |
824 | |
836 | |
825 | return 0; |
837 | return 0; |
826 | |
838 | |
827 | ERROR4_4: |
839 | ERROR4_4: |
… | |
… | |
842 | |
854 | |
843 | ERROR5: |
855 | ERROR5: |
844 | if (in_line.layout) |
856 | if (in_line.layout) |
845 | psiconv_free_character_layout(in_line.layout); |
857 | psiconv_free_character_layout(in_line.layout); |
846 | if (in_line.object) |
858 | if (in_line.object) |
847 | psiconv_free_object(in_line.object); |
859 | psiconv_free_embedded_object_section(in_line.object); |
848 | ERROR4: |
860 | ERROR4: |
849 | free(inline_count); |
861 | free(inline_count); |
850 | ERROR3: |
862 | ERROR3: |
851 | for (i = 0; i < psiconv_list_length(anon_styles); i++) { |
863 | for (i = 0; i < psiconv_list_length(anon_styles); i++) { |
852 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
864 | if (!(anon_ptr = psiconv_list_get(anon_styles,i))) { |
853 | psiconv_warn(lev+1,off,"Massive memory corruption"); |
865 | psiconv_error(config,lev+1,off,"Massive memory corruption"); |
854 | break; |
866 | break; |
855 | } |
867 | } |
856 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
868 | psiconv_free_paragraph_layout(anon_ptr->paragraph); |
857 | psiconv_free_character_layout(anon_ptr->character); |
869 | psiconv_free_character_layout(anon_ptr->character); |
858 | } |
870 | } |
859 | |
871 | |
860 | ERROR2: |
872 | ERROR2: |
861 | psiconv_list_free(anon_styles); |
873 | psiconv_list_free(anon_styles); |
862 | ERROR1: |
874 | ERROR1: |
863 | psiconv_warn(lev+1,off,"Reading of Layout Section failed"); |
875 | psiconv_error(config,lev+1,off,"Reading of Layout Section failed"); |
864 | if (length) |
876 | if (length) |
865 | *length = 0; |
877 | *length = 0; |
866 | if (!res) |
878 | if (!res) |
867 | return -PSICONV_E_NOMEM; |
879 | return -PSICONV_E_NOMEM; |
868 | else |
880 | else |
869 | return res; |
881 | return res; |
870 | } |
882 | } |
871 | |
883 | |
872 | int psiconv_parse_styled_layout_section(const psiconv_buffer buf, |
884 | int psiconv_parse_styled_layout_section(const psiconv_config config, |
|
|
885 | const psiconv_buffer buf, |
873 | int lev,psiconv_u32 off, |
886 | int lev,psiconv_u32 off, |
874 | int *length, |
887 | int *length, |
875 | psiconv_text_and_layout result, |
888 | psiconv_text_and_layout result, |
876 | psiconv_word_styles_section styles) |
889 | psiconv_word_styles_section styles) |
877 | { |
890 | { |
878 | return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); |
891 | return psiconv_parse_layout_section(config,buf,lev,off,length,result,styles,1); |
879 | } |
892 | } |
880 | |
893 | |
881 | int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, |
894 | int psiconv_parse_styleless_layout_section(const psiconv_config config, |
|
|
895 | const psiconv_buffer buf, |
882 | int lev,psiconv_u32 off, |
896 | int lev,psiconv_u32 off, |
883 | int *length, |
897 | int *length, |
884 | psiconv_text_and_layout result, |
898 | psiconv_text_and_layout result, |
885 | const psiconv_character_layout base_char, |
899 | const psiconv_character_layout base_char, |
886 | const psiconv_paragraph_layout base_para) |
900 | const psiconv_paragraph_layout base_para) |
… | |
… | |
897 | goto ERROR3; |
911 | goto ERROR3; |
898 | if (!(styles_section->normal->paragraph = |
912 | if (!(styles_section->normal->paragraph = |
899 | psiconv_clone_paragraph_layout(base_para))) |
913 | psiconv_clone_paragraph_layout(base_para))) |
900 | goto ERROR4; |
914 | goto ERROR4; |
901 | styles_section->normal->hotkey = 0; |
915 | styles_section->normal->hotkey = 0; |
902 | if (!(styles_section->normal->name = strdup(""))) |
916 | if (( res = psiconv_unicode_from_chars(config,(psiconv_u8 *) "", |
|
|
917 | &styles_section->normal->name))) |
903 | goto ERROR5; |
918 | goto ERROR5; |
904 | if (!(styles_section->styles = psiconv_list_new(sizeof( |
919 | if (!(styles_section->styles = psiconv_list_new(sizeof( |
905 | struct psiconv_word_style_s)))) |
920 | struct psiconv_word_style_s)))) |
906 | goto ERROR6; |
921 | goto ERROR6; |
907 | |
922 | |
908 | res = psiconv_parse_layout_section(buf,lev,off,length,result, |
923 | res = psiconv_parse_layout_section(config,buf,lev,off,length,result, |
909 | styles_section,0); |
924 | styles_section,0); |
910 | |
925 | |
911 | psiconv_free_word_styles_section(styles_section); |
926 | psiconv_free_word_styles_section(styles_section); |
912 | return res; |
927 | return res; |
913 | |
928 | |
… | |
… | |
920 | ERROR3: |
935 | ERROR3: |
921 | free(styles_section->normal); |
936 | free(styles_section->normal); |
922 | ERROR2: |
937 | ERROR2: |
923 | free(styles_section); |
938 | free(styles_section); |
924 | ERROR1: |
939 | ERROR1: |
925 | psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed"); |
940 | psiconv_error(config,lev+1,off,"Reading of Styleless Layout Section failed"); |
926 | if (length) |
941 | if (length) |
927 | *length = 0; |
942 | *length = 0; |
928 | if (!res) |
943 | if (!res) |
929 | return -PSICONV_E_NOMEM; |
944 | return -PSICONV_E_NOMEM; |
930 | else |
945 | else |
931 | return res; |
946 | return res; |
932 | } |
947 | } |
933 | |
948 | |
934 | int psiconv_parse_embedded_object(const psiconv_buffer buf, int lev, |
949 | int psiconv_parse_embedded_object_section(const psiconv_config config, |
|
|
950 | const psiconv_buffer buf, int lev, |
935 | psiconv_u32 off, int *length, |
951 | psiconv_u32 off, int *length, |
936 | psiconv_object *result) |
952 | psiconv_embedded_object_section *result) |
937 | { |
953 | { |
938 | int res=0; |
954 | int res=0; |
939 | int len=0; |
955 | int len=0; |
940 | int leng,i; |
956 | int leng,i; |
941 | psiconv_section_table_section table; |
957 | psiconv_section_table_section table; |
942 | psiconv_section_table_entry entry; |
958 | psiconv_section_table_entry entry; |
943 | psiconv_u32 icon_sec=0,display_sec=0,table_sec=0; |
959 | psiconv_u32 icon_sec=0,display_sec=0,table_sec=0; |
|
|
960 | psiconv_buffer subbuf; |
944 | |
961 | |
945 | psiconv_progress(lev+1,off+len,"Going to read an Embedded Object"); |
962 | psiconv_progress(config,lev+1,off+len,"Going to read an Embedded Object"); |
946 | if (!(*result = malloc(sizeof(**result)))) |
963 | if (!(*result = malloc(sizeof(**result)))) |
947 | goto ERROR1; |
964 | goto ERROR1; |
948 | |
965 | |
949 | psiconv_progress(lev+2,off+len,"Going to read the Embedded Object Section"); |
966 | psiconv_progress(config,lev+2,off+len,"Going to read the Embedded Object Section"); |
950 | psiconv_parse_section_table_section(buf,lev+2,off+len,&leng,&table); |
967 | psiconv_parse_section_table_section(config,buf,lev+2,off+len,&leng,&table); |
951 | len += leng; |
968 | len += leng; |
952 | |
969 | |
953 | for (i = 0; i < psiconv_list_length(table); i++) { |
970 | for (i = 0; i < psiconv_list_length(table); i++) { |
954 | psiconv_progress(lev+2,off+len,"Going to read entry %d",i); |
971 | psiconv_progress(config,lev+2,off+len,"Going to read entry %d",i); |
955 | if (!(entry = psiconv_list_get(table,i))) |
972 | if (!(entry = psiconv_list_get(table,i))) |
956 | goto ERROR2; |
973 | goto ERROR2; |
957 | if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) { |
974 | if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) { |
958 | display_sec = entry->offset; |
975 | display_sec = entry->offset; |
959 | psiconv_debug(lev+3,off+len,"Found the Object Display Section at %08x", |
976 | psiconv_debug(config,lev+3,off+len,"Found the Object Display Section at %08x", |
960 | display_sec); |
977 | display_sec); |
961 | } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) { |
978 | } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) { |
962 | icon_sec = entry->offset; |
979 | icon_sec = entry->offset; |
963 | psiconv_debug(lev+3,off+len,"Found the Object Icon Section at %08x", |
980 | psiconv_debug(config,lev+3,off+len,"Found the Object Icon Section at %08x", |
964 | icon_sec); |
981 | icon_sec); |
965 | } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) { |
982 | } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) { |
966 | table_sec = entry->offset; |
983 | table_sec = entry->offset; |
967 | psiconv_debug(lev+3,off+len,"Found the Object Section Table Section at %08x", |
984 | psiconv_debug(config,lev+3,off+len,"Found the Object Section Table Section at %08x", |
968 | table_sec); |
985 | table_sec); |
969 | } else { |
986 | } else { |
970 | psiconv_warn(lev+3,off+len, |
987 | psiconv_warn(config,lev+3,off+len, |
971 | "Found unknown section in the Object Display Section " |
988 | "Found unknown section in the Object Display Section " |
972 | "(ignoring)"); |
989 | "(ignoring)"); |
973 | psiconv_debug(lev+3,off+len,"Section ID %08x, offset %08x", |
990 | psiconv_debug(config,lev+3,off+len,"Section ID %08x, offset %08x", |
974 | entry->id, entry->offset); |
991 | entry->id, entry->offset); |
975 | } |
992 | } |
976 | } |
993 | } |
977 | |
994 | |
978 | psiconv_progress(lev+2,off+len,"Looking for the Object Display Section"); |
995 | psiconv_progress(config,lev+2,off+len,"Looking for the Object Display Section"); |
979 | if (!icon_sec) { |
996 | if (!icon_sec) { |
980 | psiconv_warn(lev+2,off+len,"Object Display Section not found"); |
997 | psiconv_warn(config,lev+2,off+len,"Object Display Section not found"); |
981 | (*result)->display = NULL; |
998 | (*result)->display = NULL; |
982 | } else { |
999 | } else { |
983 | psiconv_debug(lev+2,off+len,"Object Display Section at offset %08x", |
1000 | psiconv_debug(config,lev+2,off+len,"Object Display Section at offset %08x", |
984 | display_sec); |
1001 | display_sec); |
985 | if ((res = psiconv_parse_object_display_section(buf,lev+2,display_sec,NULL, |
1002 | if ((res = psiconv_parse_object_display_section(config,buf,lev+2,display_sec,NULL, |
986 | &(*result)->display))) |
1003 | &(*result)->display))) |
987 | goto ERROR2; |
1004 | goto ERROR2; |
988 | } |
1005 | } |
989 | |
1006 | |
990 | psiconv_progress(lev+2,off+len,"Looking for the Object Icon Section"); |
1007 | psiconv_progress(config,lev+2,off+len,"Looking for the Object Icon Section"); |
991 | if (!icon_sec) { |
1008 | if (!icon_sec) { |
992 | psiconv_warn(lev+2,off+len,"Object Icon Section not found"); |
1009 | psiconv_warn(config,lev+2,off+len,"Object Icon Section not found"); |
993 | (*result)->icon = NULL; |
1010 | (*result)->icon = NULL; |
994 | } else { |
1011 | } else { |
995 | psiconv_debug(lev+2,off+len,"Object Icon Section at offset %08x",icon_sec); |
1012 | psiconv_debug(config,lev+2,off+len,"Object Icon Section at offset %08x",icon_sec); |
996 | if ((res = psiconv_parse_object_icon_section(buf,lev+2,icon_sec,NULL, |
1013 | if ((res = psiconv_parse_object_icon_section(config,buf,lev+2,icon_sec,NULL, |
997 | &(*result)->icon))) |
1014 | &(*result)->icon))) |
998 | goto ERROR2; |
1015 | goto ERROR3; |
|
|
1016 | } |
|
|
1017 | |
|
|
1018 | psiconv_progress(config,lev+2,off+len, |
|
|
1019 | "Looking for the Section Table Offset Section"); |
|
|
1020 | if (!table_sec) { |
|
|
1021 | psiconv_warn(config,lev+2,off+len, |
|
|
1022 | "Embedded Section Table Offset Section not found"); |
|
|
1023 | (*result)->object = NULL; |
|
|
1024 | } else { |
|
|
1025 | psiconv_progress(config,lev+2,off+len, |
|
|
1026 | "Extracting object: add %08x to all following offsets", |
|
|
1027 | table_sec); |
|
|
1028 | /* We can't determine the length of the object, so we just take it all */ |
|
|
1029 | if ((res = psiconv_buffer_subbuffer(&subbuf,buf,table_sec, |
|
|
1030 | psiconv_buffer_length(buf)-table_sec))) |
|
|
1031 | goto ERROR4; |
|
|
1032 | |
|
|
1033 | if (!((*result)->object = malloc(sizeof(*(*result)->object)))) |
|
|
1034 | goto ERROR5; |
|
|
1035 | |
|
|
1036 | /* We need to find the file type, but we don't have a normal header */ |
|
|
1037 | /* So we try to find the Application ID Section and hope for the best */ |
|
|
1038 | psiconv_progress(config,lev+3,0,"Trying to determine the file type"); |
|
|
1039 | (*result)->object->type = psiconv_determine_embedded_object_type |
|
|
1040 | (config,subbuf,lev+3,&res); |
|
|
1041 | switch ((*result)->object->type) { |
|
|
1042 | case psiconv_word_file: |
|
|
1043 | if ((res = psiconv_parse_word_file(config,subbuf,lev+3,0, |
|
|
1044 | ((psiconv_word_f *) &(*result)->object->file)))) |
|
|
1045 | goto ERROR6; |
|
|
1046 | break; |
|
|
1047 | case psiconv_texted_file: |
|
|
1048 | if ((res = psiconv_parse_texted_file(config,subbuf,lev+3,0, |
|
|
1049 | ((psiconv_texted_f *) &(*result)->object->file)))) |
|
|
1050 | goto ERROR6; |
|
|
1051 | break; |
|
|
1052 | case psiconv_sheet_file: |
|
|
1053 | if ((res = psiconv_parse_sheet_file(config,subbuf,lev+3,0, |
|
|
1054 | ((psiconv_sheet_f *) &(*result)->object->file)))) |
|
|
1055 | goto ERROR6; |
|
|
1056 | break; |
|
|
1057 | case psiconv_sketch_file: |
|
|
1058 | if ((res = psiconv_parse_sketch_file(config,subbuf,lev+3,0, |
|
|
1059 | ((psiconv_sketch_f *) &(*result)->object->file)))) |
|
|
1060 | goto ERROR6; |
|
|
1061 | break; |
|
|
1062 | default: |
|
|
1063 | psiconv_warn(config,lev+3,0,"Can't parse embedded object (still continuing)"); |
|
|
1064 | (*result)->object->file = NULL; |
999 | } |
1065 | } |
|
|
1066 | } |
|
|
1067 | |
|
|
1068 | psiconv_buffer_free(subbuf); |
|
|
1069 | psiconv_free_section_table_section(table); |
1000 | |
1070 | |
1001 | if (length) |
1071 | if (length) |
1002 | *length = len; |
1072 | *length = len; |
1003 | |
1073 | |
1004 | psiconv_progress(lev+1,off+len-1,"End of Embedded Object Section " |
1074 | psiconv_progress(config,lev+1,off+len-1,"End of Embedded Object Section " |
1005 | "(total length: %08x)",len); |
1075 | "(total length: %08x)",len); |
1006 | |
1076 | |
1007 | return res; |
1077 | return res; |
1008 | |
1078 | |
1009 | |
1079 | |
|
|
1080 | ERROR6: |
|
|
1081 | free((*result)->object); |
|
|
1082 | ERROR5: |
|
|
1083 | psiconv_buffer_free(subbuf); |
|
|
1084 | ERROR4: |
|
|
1085 | psiconv_free_object_icon_section((*result)->icon); |
|
|
1086 | ERROR3: |
|
|
1087 | psiconv_free_object_display_section((*result)->display); |
1010 | ERROR2: |
1088 | ERROR2: |
1011 | psiconv_free_section_table_section(table); |
1089 | psiconv_free_section_table_section(table); |
1012 | ERROR1: |
1090 | ERROR1: |
1013 | psiconv_warn(lev+1,off,"Reading Embedded Object failed"); |
1091 | psiconv_error(config,lev+1,off,"Reading Embedded Object failed"); |
1014 | |
1092 | |
1015 | if (length) |
1093 | if (length) |
1016 | *length = 0; |
1094 | *length = 0; |
1017 | |
1095 | |
1018 | if (res == 0) |
1096 | if (res == 0) |
1019 | return -PSICONV_E_NOMEM; |
1097 | return -PSICONV_E_NOMEM; |
1020 | else |
1098 | else |
1021 | return res; |
1099 | return res; |
1022 | } |
1100 | } |
1023 | |
1101 | |
|
|
1102 | psiconv_file_type_t psiconv_determine_embedded_object_type |
|
|
1103 | (const psiconv_config config, |
|
|
1104 | const psiconv_buffer buf,int lev, |
|
|
1105 | int *status) |
|
|
1106 | { |
|
|
1107 | psiconv_u32 off; |
|
|
1108 | psiconv_section_table_section table; |
|
|
1109 | int res,i; |
|
|
1110 | psiconv_file_type_t file_type = psiconv_unknown_file; |
|
|
1111 | psiconv_section_table_entry entry; |
|
|
1112 | psiconv_application_id_section applid; |
|
|
1113 | |
|
|
1114 | psiconv_progress(config,lev+1,0,"Going to determine embedded object file type"); |
|
|
1115 | psiconv_progress(config,lev+2,0,"Going to read the Section Table Offset Section"); |
|
|
1116 | off = psiconv_read_u32(config,buf,lev,0,&res); |
|
|
1117 | if (res) |
|
|
1118 | goto ERROR1; |
|
|
1119 | psiconv_debug(config,lev+2,0,"Offset: %08x",off); |
|
|
1120 | |
|
|
1121 | psiconv_progress(config,lev+2,off,"Going to read the Section Table Section"); |
|
|
1122 | if ((res = psiconv_parse_section_table_section(config,buf,lev+2,off,NULL,&table))) |
|
|
1123 | goto ERROR1; |
|
|
1124 | |
|
|
1125 | psiconv_progress(config,lev+2,off,"Going to search the Section Table Section " |
|
|
1126 | "for the Application ID Section"); |
|
|
1127 | for (i=0; i < psiconv_list_length(table); i++) { |
|
|
1128 | psiconv_progress(config,lev+3,off,"Going to read entry %d",i); |
|
|
1129 | if (!(entry = psiconv_list_get(table,i))) |
|
|
1130 | goto ERROR2; |
|
|
1131 | if (entry->id == PSICONV_ID_APPL_ID_SECTION) { |
|
|
1132 | psiconv_progress(config,lev+3,off, |
|
|
1133 | "Found the Application ID Section at offset %08x", |
|
|
1134 | entry->offset); |
|
|
1135 | off = entry->offset; |
|
|
1136 | break; |
|
|
1137 | } |
|
|
1138 | } |
|
|
1139 | if (i == psiconv_list_length(table)) { |
|
|
1140 | psiconv_error(config,lev+2,off,"No Application ID Section found"); |
|
|
1141 | res = PSICONV_E_PARSE; |
|
|
1142 | goto ERROR2; |
|
|
1143 | } |
|
|
1144 | |
|
|
1145 | psiconv_progress(config,lev+2,off,"Going to read the Application ID Section"); |
|
|
1146 | if ((res = psiconv_parse_application_id_section(config,buf,lev+2,off,NULL,&applid))) |
|
|
1147 | goto ERROR2; |
|
|
1148 | |
|
|
1149 | switch (applid->id) { |
|
|
1150 | case PSICONV_ID_WORD: file_type = psiconv_word_file; |
|
|
1151 | psiconv_debug(config,lev+2,off,"Found a Word file"); |
|
|
1152 | break; |
|
|
1153 | case PSICONV_ID_TEXTED: file_type = psiconv_texted_file; |
|
|
1154 | psiconv_debug(config,lev+2,off,"Found a TextEd file"); |
|
|
1155 | break; |
|
|
1156 | case PSICONV_ID_SKETCH: file_type = psiconv_sketch_file; |
|
|
1157 | psiconv_debug(config,lev+2,off,"Found a Sketch file"); |
|
|
1158 | break; |
|
|
1159 | case PSICONV_ID_SHEET: file_type = psiconv_sheet_file; |
|
|
1160 | psiconv_debug(config,lev+2,off,"Found a Sheet file"); |
|
|
1161 | break; |
|
|
1162 | default: psiconv_warn(config,lev+2,off,"Found an unknown file type"); |
|
|
1163 | psiconv_debug(config,lev+2,off,"Found ID %08x",applid->id); |
|
|
1164 | } |
|
|
1165 | |
|
|
1166 | ERROR2: |
|
|
1167 | psiconv_free_application_id_section(applid); |
|
|
1168 | ERROR1: |
|
|
1169 | psiconv_free_section_table_section(table); |
|
|
1170 | if (status) |
|
|
1171 | *status = res; |
|
|
1172 | return file_type; |
|
|
1173 | |
|
|
1174 | } |
|
|
1175 | |
1024 | int psiconv_parse_object_display_section(const psiconv_buffer buf,int lev, |
1176 | int psiconv_parse_object_display_section(const psiconv_config config, |
|
|
1177 | const psiconv_buffer buf,int lev, |
1025 | psiconv_u32 off, int *length, |
1178 | psiconv_u32 off, int *length, |
1026 | psiconv_object_display_section *result) |
1179 | psiconv_object_display_section *result) |
1027 | { |
1180 | { |
1028 | int res = 0; |
1181 | int res = 0; |
1029 | int len = 0; |
1182 | int len = 0; |
1030 | int leng; |
1183 | int leng; |
1031 | psiconv_u32 temp; |
1184 | psiconv_u32 temp; |
1032 | |
1185 | |
1033 | psiconv_progress(lev+1,off,"Going to read the Object Display Section"); |
1186 | psiconv_progress(config,lev+1,off,"Going to read the Object Display Section"); |
1034 | if (!(*result = malloc(sizeof(**result)))) |
1187 | if (!(*result = malloc(sizeof(**result)))) |
1035 | goto ERROR1; |
1188 | goto ERROR1; |
1036 | |
1189 | |
1037 | psiconv_progress(lev+2,off+len,"Going to read the display as icon flag " |
1190 | psiconv_progress(config,lev+2,off+len,"Going to read the display as icon flag " |
1038 | "(expecting 0x00 or 0x01)"); |
1191 | "(expecting 0x00 or 0x01)"); |
1039 | temp = psiconv_read_u8(buf,lev+2,off+len,&res); |
1192 | temp = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
1040 | if (res) |
1193 | if (res) |
1041 | goto ERROR2; |
1194 | goto ERROR2; |
1042 | if (temp == 0x00) { |
1195 | if (temp == 0x00) { |
1043 | (*result)->show_icon = psiconv_bool_true; |
1196 | (*result)->show_icon = psiconv_bool_true; |
1044 | psiconv_debug(lev+2,off+len,"Displayed as full document"); |
1197 | psiconv_debug(config,lev+2,off+len,"Displayed as icon"); |
1045 | } else if (temp == 0x01) { |
1198 | } else if (temp == 0x01) { |
1046 | (*result)->show_icon = psiconv_bool_false; |
1199 | (*result)->show_icon = psiconv_bool_false; |
1047 | psiconv_debug(lev+2,off+len,"Displayed as icon"); |
1200 | psiconv_debug(config,lev+2,off+len,"Displayed as full document"); |
1048 | } else { |
1201 | } else { |
1049 | psiconv_warn(lev+2,off+len,"Unknown Object Display Section Icon Flag"); |
1202 | psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section Icon Flag"); |
1050 | psiconv_debug(lev+2,off+len,"Icon flag found: %02x",temp); |
1203 | psiconv_debug(config,lev+2,off+len,"Icon flag found: %02x",temp); |
1051 | /* Improvise */ |
1204 | /* Improvise */ |
1052 | (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true); |
1205 | (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true); |
1053 | } |
1206 | } |
1054 | len ++; |
1207 | len ++; |
1055 | |
1208 | |
1056 | psiconv_progress(lev+2,off+len,"Going to read the icon width"); |
1209 | psiconv_progress(config,lev+2,off+len,"Going to read the display width"); |
1057 | (*result)->width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1210 | (*result)->width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1058 | if (res) |
1211 | if (res) |
1059 | goto ERROR2; |
1212 | goto ERROR2; |
1060 | psiconv_debug(lev+2,off+len,"Icon width: %f cm",(*result)->width); |
1213 | psiconv_debug(config,lev+2,off+len,"Display width: %f cm",(*result)->width); |
1061 | len += leng; |
1214 | len += leng; |
1062 | |
1215 | |
1063 | psiconv_progress(lev+2,off+len,"Going to read the icon height"); |
1216 | psiconv_progress(config,lev+2,off+len,"Going to read the display height"); |
1064 | (*result)->height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1217 | (*result)->height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1065 | if (res) |
1218 | if (res) |
1066 | goto ERROR2; |
1219 | goto ERROR2; |
1067 | psiconv_debug(lev+2,off+len,"Icon length: %f cm",(*result)->height); |
1220 | psiconv_debug(config,lev+2,off+len,"Display length: %f cm",(*result)->height); |
1068 | len += leng; |
1221 | len += leng; |
1069 | |
1222 | |
1070 | psiconv_progress(lev+2,off+len,"Going to read unknown long (%08x expected)", |
1223 | psiconv_progress(config,lev+2,off+len,"Going to read unknown long (%08x expected)", |
1071 | 0); |
1224 | 0); |
1072 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
1225 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
1073 | if (temp != 0) { |
1226 | if (temp != 0) { |
1074 | psiconv_warn(lev+2,off+len,"Unknown Object Display Section final long"); |
1227 | psiconv_warn(config,lev+2,off+len,"Unknown Object Display Section final long"); |
1075 | psiconv_debug(lev+2,off+len,"Long read: %08x",temp); |
1228 | psiconv_debug(config,lev+2,off+len,"Long read: %08x",temp); |
1076 | } |
1229 | } |
1077 | len += 4; |
1230 | len += 4; |
1078 | |
1231 | |
1079 | if (length) |
1232 | if (length) |
1080 | *length = len; |
1233 | *length = len; |
1081 | |
1234 | |
1082 | psiconv_progress(lev+1,off+len-1,"End of Object Display Section" |
1235 | psiconv_progress(config,lev+1,off+len-1,"End of Object Display Section " |
1083 | "(total length: %08x",len); |
1236 | "(total length: %08x",len); |
1084 | return res; |
1237 | return res; |
1085 | |
1238 | |
1086 | ERROR2: |
1239 | ERROR2: |
1087 | free(*result); |
1240 | free(*result); |
1088 | ERROR1: |
1241 | ERROR1: |
1089 | psiconv_warn(lev+1,off+len,"Reading of Object Display Section failed"); |
1242 | psiconv_error(config,lev+1,off+len,"Reading of Object Display Section failed"); |
1090 | if (length) |
1243 | if (length) |
1091 | *length=0; |
1244 | *length=0; |
1092 | if (!res) |
1245 | if (!res) |
1093 | return -PSICONV_E_NOMEM; |
1246 | return -PSICONV_E_NOMEM; |
1094 | else |
1247 | else |
1095 | return res; |
1248 | return res; |
1096 | } |
1249 | } |
1097 | |
1250 | |
1098 | int psiconv_parse_object_icon_section(const psiconv_buffer buf,int lev, |
1251 | int psiconv_parse_object_icon_section(const psiconv_config config, |
|
|
1252 | const psiconv_buffer buf,int lev, |
1099 | psiconv_u32 off, int *length, |
1253 | psiconv_u32 off, int *length, |
1100 | psiconv_object_icon_section *result) |
1254 | psiconv_object_icon_section *result) |
1101 | { |
1255 | { |
1102 | int res = 0; |
1256 | int res = 0; |
1103 | int len = 0; |
1257 | int len = 0; |
1104 | int leng; |
1258 | int leng; |
1105 | |
1259 | |
1106 | psiconv_progress(lev+1,off,"Going to read the Object Icon Section"); |
1260 | psiconv_progress(config,lev+1,off,"Going to read the Object Icon Section"); |
1107 | if (!(*result = malloc(sizeof(**result)))) |
1261 | if (!(*result = malloc(sizeof(**result)))) |
1108 | goto ERROR1; |
1262 | goto ERROR1; |
1109 | |
1263 | |
1110 | psiconv_progress(lev+2,off+len,"Going to read the icon name"); |
1264 | psiconv_progress(config,lev+2,off+len,"Going to read the icon name"); |
1111 | (*result)->icon_name = psiconv_read_string(buf,lev+2,off+len,&leng,&res); |
1265 | (*result)->icon_name = psiconv_read_string(config,buf,lev+2,off+len,&leng,&res); |
1112 | if (res) |
1266 | if (res) |
1113 | goto ERROR2; |
1267 | goto ERROR2; |
1114 | psiconv_debug(lev+2,off+len,"Icon name: %s",(*result)->icon_name); |
1268 | psiconv_debug(config,lev+2,off+len,"Icon name: %s",(*result)->icon_name); |
1115 | len += leng; |
1269 | len += leng; |
1116 | |
1270 | |
1117 | psiconv_progress(lev+2,off+len,"Going to read the icon width"); |
1271 | psiconv_progress(config,lev+2,off+len,"Going to read the icon width"); |
1118 | (*result)->icon_width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1272 | (*result)->icon_width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1119 | if (res) |
1273 | if (res) |
1120 | goto ERROR3; |
1274 | goto ERROR3; |
1121 | psiconv_debug(lev+2,off+len,"Icon width: %f cm",(*result)->icon_width); |
1275 | psiconv_debug(config,lev+2,off+len,"Icon width: %f cm",(*result)->icon_width); |
1122 | len += leng; |
1276 | len += leng; |
1123 | |
1277 | |
1124 | psiconv_progress(lev+2,off+len,"Going to read the icon height"); |
1278 | psiconv_progress(config,lev+2,off+len,"Going to read the icon height"); |
1125 | (*result)->icon_height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
1279 | (*result)->icon_height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
1126 | if (res) |
1280 | if (res) |
1127 | goto ERROR3; |
1281 | goto ERROR3; |
1128 | psiconv_debug(lev+2,off+len,"Icon length: %f cm",(*result)->icon_height); |
1282 | psiconv_debug(config,lev+2,off+len,"Icon length: %f cm",(*result)->icon_height); |
1129 | len += leng; |
1283 | len += leng; |
1130 | |
1284 | |
1131 | if (length) |
1285 | if (length) |
1132 | *length = len; |
1286 | *length = len; |
1133 | |
1287 | |
1134 | psiconv_progress(lev+1,off+len-1,"End of Object Icon Section" |
1288 | psiconv_progress(config,lev+1,off+len-1,"End of Object Icon Section" |
1135 | "(total length: %08x",len); |
1289 | "(total length: %08x",len); |
1136 | return res; |
1290 | return res; |
1137 | |
1291 | |
1138 | ERROR3: |
1292 | ERROR3: |
1139 | free((*result)->icon_name); |
1293 | free((*result)->icon_name); |
1140 | ERROR2: |
1294 | ERROR2: |
1141 | free(*result); |
1295 | free(*result); |
1142 | ERROR1: |
1296 | ERROR1: |
1143 | psiconv_warn(lev+1,off+len,"Reading of Object Icon Section failed"); |
1297 | psiconv_error(config,lev+1,off+len,"Reading of Object Icon Section failed"); |
1144 | if (length) |
1298 | if (length) |
1145 | *length=0; |
1299 | *length=0; |
1146 | if (!res) |
1300 | if (!res) |
1147 | return -PSICONV_E_NOMEM; |
1301 | return -PSICONV_E_NOMEM; |
1148 | else |
1302 | else |