… | |
… | |
29 | #ifdef DMALLOC |
29 | #ifdef DMALLOC |
30 | #include <dmalloc.h> |
30 | #include <dmalloc.h> |
31 | #endif |
31 | #endif |
32 | |
32 | |
33 | |
33 | |
34 | int psiconv_parse_color(const psiconv_buffer buf, int lev, psiconv_u32 off, |
34 | int psiconv_parse_color(const psiconv_config config, |
|
|
35 | const psiconv_buffer buf, int lev, psiconv_u32 off, |
35 | int *length, psiconv_color *result) |
36 | int *length, psiconv_color *result) |
36 | { |
37 | { |
37 | int res = 0; |
38 | int res = 0; |
38 | int len = 0; |
39 | int len = 0; |
39 | |
40 | |
40 | psiconv_progress(lev+1,off,"Going to parse color"); |
41 | psiconv_progress(config,lev+1,off,"Going to parse color"); |
41 | if (!(*result = malloc(sizeof(**result)))) |
42 | if (!(*result = malloc(sizeof(**result)))) |
42 | goto ERROR1; |
43 | goto ERROR1; |
43 | |
44 | |
44 | (*result)->red = psiconv_read_u8(buf,lev+2,off+len,&res); |
45 | (*result)->red = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
45 | if (res) |
46 | if (res) |
46 | goto ERROR2; |
47 | goto ERROR2; |
47 | (*result)->green = psiconv_read_u8(buf,lev+2,off+len+1,&res); |
48 | (*result)->green = psiconv_read_u8(config,buf,lev+2,off+len+1,&res); |
48 | if (res) |
49 | if (res) |
49 | goto ERROR2; |
50 | goto ERROR2; |
50 | (*result)->blue = psiconv_read_u8(buf,lev+2,off+len+2,&res); |
51 | (*result)->blue = psiconv_read_u8(config,buf,lev+2,off+len+2,&res); |
51 | if (res) |
52 | if (res) |
52 | goto ERROR2; |
53 | goto ERROR2; |
53 | len += 3; |
54 | len += 3; |
54 | |
55 | |
55 | psiconv_debug(lev+2,off,"Color: red %02x, green %02x, blue %02x", |
56 | psiconv_debug(config,lev+2,off,"Color: red %02x, green %02x, blue %02x", |
56 | (*result)->red, (*result)->green, (*result)->blue); |
57 | (*result)->red, (*result)->green, (*result)->blue); |
57 | if (length) |
58 | if (length) |
58 | *length = len; |
59 | *length = len; |
59 | |
60 | |
60 | psiconv_progress(lev+1,off+len-1,"End of color (total length: %08x)",len); |
61 | psiconv_progress(config,lev+1,off+len-1,"End of color (total length: %08x)",len); |
61 | return 0; |
62 | return 0; |
62 | |
63 | |
63 | ERROR2: |
64 | ERROR2: |
64 | free(*result); |
65 | free(*result); |
65 | ERROR1: |
66 | ERROR1: |
66 | psiconv_warn(lev+1,off,"Reading of Color failed"); |
67 | psiconv_warn(config,lev+1,off,"Reading of Color failed"); |
67 | if (length) |
68 | if (length) |
68 | *length = 0; |
69 | *length = 0; |
69 | if (res == 0) |
70 | if (res == 0) |
70 | return -PSICONV_E_NOMEM; |
71 | return -PSICONV_E_NOMEM; |
71 | else |
72 | else |
72 | return res; |
73 | return res; |
73 | } |
74 | } |
74 | |
75 | |
75 | |
76 | |
76 | |
77 | |
77 | int psiconv_parse_font(const psiconv_buffer buf, int lev, psiconv_u32 off, |
78 | int psiconv_parse_font(const psiconv_config config, |
|
|
79 | const psiconv_buffer buf, int lev, psiconv_u32 off, |
78 | int *length, psiconv_font *result) |
80 | int *length, psiconv_font *result) |
79 | { |
81 | { |
80 | int res = 0; |
82 | int res = 0; |
81 | int strlength,i; |
|
|
82 | char *str_copy; |
83 | char *str_copy; |
|
|
84 | int len=0; |
83 | int len; |
85 | int leng; |
84 | |
86 | |
85 | psiconv_progress(lev+1,off,"Going to parse font"); |
87 | psiconv_progress(config,lev+1,off,"Going to parse font"); |
86 | if (!(*result = malloc(sizeof(**result)))) |
88 | if (!(*result = malloc(sizeof(**result)))) |
87 | goto ERROR1; |
89 | goto ERROR1; |
88 | |
90 | |
89 | strlength = psiconv_read_u8(buf,lev+2,off,&res); |
91 | (*result)->name = psiconv_read_short_string(config,buf,lev+2,off+len, |
|
|
92 | &leng,&res); |
90 | if (res) |
93 | if (res) |
91 | goto ERROR2; |
|
|
92 | if (!((*result)->name = malloc(strlength))) { |
|
|
93 | goto ERROR2; |
|
|
94 | } |
|
|
95 | for (i = 0; (i < strlength-1) && !res; i++) |
|
|
96 | (*result)->name[i] = psiconv_read_u8(buf,lev+2,off + 1 + i,&res); |
|
|
97 | if (res) |
|
|
98 | goto ERROR3; |
94 | goto ERROR2; |
99 | (*result)->name[strlength-1] = 0; |
95 | len += leng; |
|
|
96 | |
100 | (*result)->screenfont = psiconv_read_u8(buf,lev+2,off + strlength,&res); |
97 | (*result)->screenfont = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
101 | if (res) |
98 | if (res) |
102 | goto ERROR3; |
99 | goto ERROR3; |
103 | |
100 | |
104 | if (!(str_copy = psiconv_make_printable((*result)->name))) |
101 | if (!(str_copy = psiconv_make_printable((*result)->name))) |
105 | goto ERROR3; |
102 | goto ERROR3; |
106 | |
103 | |
107 | psiconv_debug(lev+2,off+1,"Found font `%s', displayed with screen font %02x", |
104 | psiconv_debug(config,lev+2,off+len, |
|
|
105 | "Found font `%s', displayed with screen font %02x", |
108 | str_copy,(*result)->screenfont); |
106 | str_copy,(*result)->screenfont); |
109 | free(str_copy); |
107 | free(str_copy); |
110 | len = strlength + 1; |
108 | len ++; |
|
|
109 | |
111 | if (length) |
110 | if (length) |
112 | *length = len; |
111 | *length = len; |
113 | |
112 | |
114 | psiconv_progress(lev+1,off + len - 1,"End of font (total length: %08x)",len); |
113 | psiconv_progress(config,lev+1,off + len - 1, |
|
|
114 | "End of font (total length: %08x)",len); |
115 | return 0; |
115 | return 0; |
116 | |
116 | |
117 | ERROR3: |
117 | ERROR3: |
118 | free ((*result)->name); |
118 | free ((*result)->name); |
119 | ERROR2: |
119 | ERROR2: |
120 | free (*result); |
120 | free (*result); |
121 | ERROR1: |
121 | ERROR1: |
122 | psiconv_warn(lev+1,off,"Reading of Font failed"); |
122 | psiconv_warn(config,lev+1,off,"Reading of Font failed"); |
123 | if (length) |
123 | if (length) |
124 | *length = 0; |
124 | *length = 0; |
125 | if (!res) |
125 | if (!res) |
126 | return -PSICONV_E_NOMEM; |
126 | return -PSICONV_E_NOMEM; |
127 | else |
127 | else |
128 | return res; |
128 | return res; |
129 | } |
129 | } |
130 | |
130 | |
131 | int psiconv_parse_border(const psiconv_buffer buf,int lev,psiconv_u32 off, |
131 | int psiconv_parse_border(const psiconv_config config, |
|
|
132 | const psiconv_buffer buf,int lev,psiconv_u32 off, |
132 | int *length, psiconv_border *result) |
133 | int *length, psiconv_border *result) |
133 | { |
134 | { |
134 | int res = 0; |
135 | int res = 0; |
135 | int len = 0; |
136 | int len = 0; |
136 | psiconv_u32 temp; |
137 | psiconv_u32 temp; |
137 | int leng; |
138 | int leng; |
138 | |
139 | |
139 | psiconv_progress(lev+1,off,"Going to parse border data"); |
140 | psiconv_progress(config,lev+1,off,"Going to parse border data"); |
140 | if (!(*result = malloc(sizeof(**result)))) { |
141 | if (!(*result = malloc(sizeof(**result)))) { |
141 | goto ERROR1; |
142 | goto ERROR1; |
142 | } |
143 | } |
143 | |
144 | |
144 | psiconv_progress(lev+2,off+len,"Going to read border kind"); |
145 | psiconv_progress(config,lev+2,off+len,"Going to read border kind"); |
145 | temp = psiconv_read_u8(buf,lev+2,off+len,&res); |
146 | temp = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
146 | if (res) |
147 | if (res) |
147 | goto ERROR2; |
148 | goto ERROR2; |
148 | if (temp == 0x00) |
149 | if (temp == 0x00) |
149 | (*result)->kind = psiconv_border_none; |
150 | (*result)->kind = psiconv_border_none; |
150 | else if (temp == 0x01) |
151 | else if (temp == 0x01) |
… | |
… | |
158 | else if (temp == 0x05) |
159 | else if (temp == 0x05) |
159 | (*result)->kind = psiconv_border_dotdashed; |
160 | (*result)->kind = psiconv_border_dotdashed; |
160 | else if (temp == 0x06) |
161 | else if (temp == 0x06) |
161 | (*result)->kind = psiconv_border_dotdotdashed; |
162 | (*result)->kind = psiconv_border_dotdotdashed; |
162 | else { |
163 | else { |
163 | psiconv_warn(lev+2,off,"Unknown border kind (defaults to `none')"); |
164 | psiconv_warn(config,lev+2,off,"Unknown border kind (defaults to `none')"); |
164 | (*result)->kind = psiconv_border_none; |
165 | (*result)->kind = psiconv_border_none; |
165 | } |
166 | } |
166 | psiconv_debug(lev+2,off+len,"Kind: %02x",temp); |
167 | psiconv_debug(config,lev+2,off+len,"Kind: %02x",temp); |
167 | len ++; |
168 | len ++; |
168 | |
169 | |
169 | psiconv_progress(lev+2,off+len,"Going to read border thickness"); |
170 | psiconv_progress(config,lev+2,off+len,"Going to read border thickness"); |
170 | (*result)->thickness = psiconv_read_size(buf,lev+2,off+len,&leng,&res); |
171 | (*result)->thickness = psiconv_read_size(config,buf,lev+2,off+len,&leng,&res); |
171 | if (res) |
172 | if (res) |
172 | goto ERROR2; |
173 | goto ERROR2; |
173 | #if 0 |
174 | #if 0 |
174 | /* This seems no longer necessary to test? */ |
175 | /* This seems no longer necessary to test? */ |
175 | if (((*result)->kind != psiconv_border_solid) && |
176 | if (((*result)->kind != psiconv_border_solid) && |
176 | ((*result)->kind != psiconv_border_double) && |
177 | ((*result)->kind != psiconv_border_double) && |
177 | ((*result)->thickness != 0.0) && |
178 | ((*result)->thickness != 0.0) && |
178 | (fabs((*result)->thickness - 1/20) >= 1/1000)) { |
179 | (fabs((*result)->thickness - 1/20) >= 1/1000)) { |
179 | psiconv_warn(lev+2,off, |
180 | psiconv_warn(config,lev+2,off, |
180 | "Border thickness specified for unlikely border type"); |
181 | "Border thickness specified for unlikely border type"); |
181 | } |
182 | } |
182 | #endif |
183 | #endif |
183 | psiconv_debug(lev+2,off+len,"Thickness: %f",(*result)->thickness); |
184 | psiconv_debug(config,lev+2,off+len,"Thickness: %f",(*result)->thickness); |
184 | len += leng; |
185 | len += leng; |
185 | |
186 | |
186 | psiconv_progress(lev+2,off+len,"Going to read the border color"); |
187 | psiconv_progress(config,lev+2,off+len,"Going to read the border color"); |
187 | if ((psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color))) |
188 | if ((psiconv_parse_color(config,buf,lev+2,off+len,&leng,&(*result)->color))) |
188 | goto ERROR2; |
189 | goto ERROR2; |
189 | len += leng; |
190 | len += leng; |
190 | |
191 | |
191 | psiconv_progress(lev+2,off+len,"Going to read the final unknown byte " |
192 | psiconv_progress(config,lev+2,off+len,"Going to read the final unknown byte " |
192 | "(0x00 or 0x01 expected)"); |
193 | "(0x00 or 0x01 expected)"); |
193 | temp = psiconv_read_u8(buf,lev+2,off + len,&res); |
194 | temp = psiconv_read_u8(config,buf,lev+2,off + len,&res); |
194 | if (res) |
195 | if (res) |
195 | goto ERROR3; |
196 | goto ERROR3; |
196 | if ((temp != 0x01) && (temp != 0x00)) { |
197 | if ((temp != 0x01) && (temp != 0x00)) { |
197 | psiconv_warn(lev+2,off,"Unknown last byte in border specification"); |
198 | psiconv_warn(config,lev+2,off,"Unknown last byte in border specification"); |
198 | psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x or %02x", |
199 | psiconv_debug(config,lev+2,off+len, "Last byte: read %02x, expected %02x or %02x", |
199 | temp,0x00,0x01); |
200 | temp,0x00,0x01); |
200 | } |
201 | } |
201 | len ++; |
202 | len ++; |
202 | |
203 | |
203 | if (length) |
204 | if (length) |
204 | *length = len; |
205 | *length = len; |
205 | |
206 | |
206 | psiconv_progress(lev+1,off + len - 1, |
207 | psiconv_progress(config,lev+1,off + len - 1, |
207 | "End of border (total length: %08x)",len); |
208 | "End of border (total length: %08x)",len); |
208 | |
209 | |
209 | return 0; |
210 | return 0; |
210 | |
211 | |
211 | ERROR3: |
212 | ERROR3: |
212 | psiconv_free_color((*result)->color); |
213 | psiconv_free_color((*result)->color); |
213 | ERROR2: |
214 | ERROR2: |
214 | free (result); |
215 | free (result); |
215 | ERROR1: |
216 | ERROR1: |
216 | psiconv_warn(lev+1,off,"Reading of Border failed"); |
217 | psiconv_warn(config,lev+1,off,"Reading of Border failed"); |
217 | if (length) |
218 | if (length) |
218 | *length = 0; |
219 | *length = 0; |
219 | if (!res) |
220 | if (!res) |
220 | return -PSICONV_E_NOMEM; |
221 | return -PSICONV_E_NOMEM; |
221 | else |
222 | else |
222 | return res; |
223 | return res; |
223 | } |
224 | } |
224 | |
225 | |
225 | int psiconv_parse_bullet(const psiconv_buffer buf,int lev,psiconv_u32 off, |
226 | int psiconv_parse_bullet(const psiconv_config config, |
|
|
227 | const psiconv_buffer buf,int lev,psiconv_u32 off, |
226 | int *length, psiconv_bullet *result) |
228 | int *length, psiconv_bullet *result) |
227 | { |
229 | { |
228 | int res = 0; |
230 | int res = 0; |
229 | int len = 0; |
231 | int len = 0; |
230 | int leng; |
232 | int leng; |
… | |
… | |
232 | |
234 | |
233 | if (!(*result = malloc(sizeof(**result)))) |
235 | if (!(*result = malloc(sizeof(**result)))) |
234 | goto ERROR1; |
236 | goto ERROR1; |
235 | (*result)->on = psiconv_bool_true; |
237 | (*result)->on = psiconv_bool_true; |
236 | |
238 | |
237 | psiconv_progress(lev+1,off,"Going to parse bullet data"); |
239 | psiconv_progress(config,lev+1,off,"Going to parse bullet data"); |
238 | psiconv_progress(lev+2,off+len,"Going to read bullet length"); |
240 | psiconv_progress(config,lev+2,off+len,"Going to read bullet length"); |
239 | bullet_length = psiconv_read_u8(buf,lev+2,off+len,&res); |
241 | bullet_length = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
240 | if (res) |
242 | if (res) |
241 | goto ERROR2; |
243 | goto ERROR2; |
242 | psiconv_debug(lev+2,off+len,"Length: %02x",bullet_length); |
244 | psiconv_debug(config,lev+2,off+len,"Length: %02x",bullet_length); |
243 | len ++; |
245 | len ++; |
244 | |
246 | |
245 | psiconv_progress(lev+2,off+len,"Going to read bullet font size"); |
247 | psiconv_progress(config,lev+2,off+len,"Going to read bullet font size"); |
246 | (*result)->font_size = psiconv_read_size(buf,lev+2,off+len, &leng,&res); |
248 | (*result)->font_size = psiconv_read_size(config,buf,lev+2,off+len, &leng,&res); |
247 | if (res) |
249 | if (res) |
248 | goto ERROR2; |
250 | goto ERROR2; |
249 | len +=leng; |
251 | len +=leng; |
250 | |
252 | |
251 | psiconv_progress(lev+2,off+len,"Going to read bullet character"); |
253 | psiconv_progress(config,lev+2,off+len,"Going to read bullet character"); |
252 | (*result)->character = psiconv_read_u8(buf,lev+2,off+len,&res); |
254 | (*result)->character = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
253 | if (res) |
255 | if (res) |
254 | goto ERROR2; |
256 | goto ERROR2; |
255 | psiconv_debug(lev+2,off+len,"Character: %02x",(*result)->character); |
257 | psiconv_debug(config,lev+2,off+len,"Character: %02x",(*result)->character); |
256 | len ++; |
258 | len ++; |
257 | |
259 | |
258 | psiconv_progress(lev+2,off+len,"Going to read indent on/off"); |
260 | psiconv_progress(config,lev+2,off+len,"Going to read indent on/off"); |
259 | if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng,&(*result)->indent))) |
261 | if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,&(*result)->indent))) |
260 | goto ERROR2; |
262 | goto ERROR2; |
261 | psiconv_debug(lev+2,off+len,"Indent on: %02x",(*result)->indent); |
263 | psiconv_debug(config,lev+2,off+len,"Indent on: %02x",(*result)->indent); |
262 | len += leng; |
264 | len += leng; |
263 | |
265 | |
264 | psiconv_progress(lev+2,off+len,"Going to read bullet color"); |
266 | psiconv_progress(config,lev+2,off+len,"Going to read bullet color"); |
265 | if ((res = psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color))) |
267 | if ((res = psiconv_parse_color(config,buf,lev+2,off+len,&leng,&(*result)->color))) |
266 | goto ERROR2; |
268 | goto ERROR2; |
267 | len += leng; |
269 | len += leng; |
268 | |
270 | |
269 | psiconv_progress(lev+2,off+len,"Going to read bullet font"); |
271 | psiconv_progress(config,lev+2,off+len,"Going to read bullet font"); |
270 | if ((res = psiconv_parse_font(buf,lev+2,off+len,&leng,&(*result)->font))) |
272 | if ((res = psiconv_parse_font(config,buf,lev+2,off+len,&leng,&(*result)->font))) |
271 | goto ERROR3; |
273 | goto ERROR3; |
272 | len += leng; |
274 | len += leng; |
273 | |
275 | |
274 | if (len != bullet_length + 1) { |
276 | if (len != bullet_length + 1) { |
275 | psiconv_warn(lev+2,off,"Bullet data structure length mismatch"); |
277 | psiconv_warn(config,lev+2,off,"Bullet data structure length mismatch"); |
276 | psiconv_debug(lev+2,off,"Length: specified %02x, found %02x", |
278 | psiconv_debug(config,lev+2,off,"Length: specified %02x, found %02x", |
277 | bullet_length,len-1); |
279 | bullet_length,len-1); |
278 | } |
280 | } |
279 | |
281 | |
280 | psiconv_progress(lev+1,off + len - 1, |
282 | psiconv_progress(config,lev+1,off + len - 1, |
281 | "End of bullet data (total length: %08x)",len); |
283 | "End of bullet data (total length: %08x)",len); |
282 | |
284 | |
283 | if (length) |
285 | if (length) |
284 | *length = len; |
286 | *length = len; |
285 | return 0; |
287 | return 0; |
… | |
… | |
287 | ERROR3: |
289 | ERROR3: |
288 | psiconv_free_color((*result)->color); |
290 | psiconv_free_color((*result)->color); |
289 | ERROR2: |
291 | ERROR2: |
290 | free (result); |
292 | free (result); |
291 | ERROR1: |
293 | ERROR1: |
292 | psiconv_warn(lev+1,off,"Reading of Bullet failed"); |
294 | psiconv_warn(config,lev+1,off,"Reading of Bullet failed"); |
293 | if (length) |
295 | if (length) |
294 | *length = 0; |
296 | *length = 0; |
295 | if (!res) |
297 | if (!res) |
296 | return -PSICONV_E_NOMEM; |
298 | return -PSICONV_E_NOMEM; |
297 | else |
299 | else |
298 | return res; |
300 | return res; |
299 | } |
301 | } |
300 | |
302 | |
301 | int psiconv_parse_tab(const psiconv_buffer buf, int lev, psiconv_u32 off, |
303 | int psiconv_parse_tab(const psiconv_config config, |
|
|
304 | const psiconv_buffer buf, int lev, psiconv_u32 off, |
302 | int *length, psiconv_tab *result) |
305 | int *length, psiconv_tab *result) |
303 | { |
306 | { |
304 | int res = 0; |
307 | int res = 0; |
305 | int len = 0; |
308 | int len = 0; |
306 | int leng; |
309 | int leng; |
307 | psiconv_u8 temp; |
310 | psiconv_u8 temp; |
308 | |
311 | |
309 | psiconv_progress(lev+1,off,"Going to parse tab"); |
312 | psiconv_progress(config,lev+1,off,"Going to parse tab"); |
310 | if (!(*result = malloc(sizeof(**result)))) |
313 | if (!(*result = malloc(sizeof(**result)))) |
311 | goto ERROR1; |
314 | goto ERROR1; |
312 | |
315 | |
313 | psiconv_progress(lev+2,off,"Going to read tab location"); |
316 | psiconv_progress(config,lev+2,off,"Going to read tab location"); |
314 | (*result)->location = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
317 | (*result)->location = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
315 | if (res) |
318 | if (res) |
316 | goto ERROR2; |
319 | goto ERROR2; |
317 | len += leng; |
320 | len += leng; |
318 | |
321 | |
319 | psiconv_progress(lev+2,off+len,"Going to read the tab kind"); |
322 | psiconv_progress(config,lev+2,off+len,"Going to read the tab kind"); |
320 | temp = psiconv_read_u8(buf,lev+2,off+len,&res); |
323 | temp = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
321 | if (res) |
324 | if (res) |
322 | goto ERROR2; |
325 | goto ERROR2; |
323 | if (temp == 1) |
326 | if (temp == 1) |
324 | (*result)->kind = psiconv_tab_left; |
327 | (*result)->kind = psiconv_tab_left; |
325 | else if (temp == 2) |
328 | else if (temp == 2) |
326 | (*result)->kind = psiconv_tab_centre; |
329 | (*result)->kind = psiconv_tab_centre; |
327 | else if (temp == 3) |
330 | else if (temp == 3) |
328 | (*result)->kind = psiconv_tab_right; |
331 | (*result)->kind = psiconv_tab_right; |
329 | else { |
332 | else { |
330 | psiconv_warn(lev+2,off+len,"Unknown tab kind argument"); |
333 | psiconv_warn(config,lev+2,off+len,"Unknown tab kind argument"); |
331 | psiconv_debug(lev+2,off+len,"Kind found: %02x (defaulted to left tab)", |
334 | psiconv_debug(config,lev+2,off+len,"Kind found: %02x (defaulted to left tab)", |
332 | temp); |
335 | temp); |
333 | (*result)->kind = psiconv_tab_left; |
336 | (*result)->kind = psiconv_tab_left; |
334 | } |
337 | } |
335 | psiconv_debug(lev+2,off+len,"Kind: %02x",temp); |
338 | psiconv_debug(config,lev+2,off+len,"Kind: %02x",temp); |
336 | len ++; |
339 | len ++; |
337 | |
340 | |
338 | if (length) |
341 | if (length) |
339 | *length = len; |
342 | *length = len; |
340 | |
343 | |
341 | psiconv_progress(lev+1,off+len-1,"End of tab (total length: %08x)",len); |
344 | psiconv_progress(config,lev+1,off+len-1,"End of tab (total length: %08x)",len); |
342 | return 0; |
345 | return 0; |
343 | |
346 | |
344 | ERROR2: |
347 | ERROR2: |
345 | free (result); |
348 | free (result); |
346 | ERROR1: |
349 | ERROR1: |
347 | psiconv_warn(lev+1,off,"Reading of Tab failed"); |
350 | psiconv_warn(config,lev+1,off,"Reading of Tab failed"); |
348 | if (length) |
351 | if (length) |
349 | *length = 0; |
352 | *length = 0; |
350 | if (!res) |
353 | if (!res) |
351 | return -PSICONV_E_NOMEM; |
354 | return -PSICONV_E_NOMEM; |
352 | else |
355 | else |
353 | return res; |
356 | return res; |
354 | } |
357 | } |
355 | |
358 | |
356 | int psiconv_parse_paragraph_layout_list(const psiconv_buffer buf, int lev, |
359 | int psiconv_parse_paragraph_layout_list(const psiconv_config config, |
|
|
360 | const psiconv_buffer buf, int lev, |
357 | psiconv_u32 off, int *length, |
361 | psiconv_u32 off, int *length, |
358 | psiconv_paragraph_layout result) |
362 | psiconv_paragraph_layout result) |
359 | { |
363 | { |
360 | int res=0; |
364 | int res=0; |
361 | int len=0; |
365 | int len=0; |
… | |
… | |
365 | psiconv_tab temp_tab; |
369 | psiconv_tab temp_tab; |
366 | psiconv_color temp_color; |
370 | psiconv_color temp_color; |
367 | psiconv_border temp_border; |
371 | psiconv_border temp_border; |
368 | psiconv_bullet temp_bullet; |
372 | psiconv_bullet temp_bullet; |
369 | |
373 | |
370 | psiconv_progress(lev+1,off,"Going to read paragraph layout list"); |
374 | psiconv_progress(config,lev+1,off,"Going to read paragraph layout list"); |
371 | |
375 | |
372 | psiconv_progress(lev+2,off,"Going to read the list length"); |
376 | psiconv_progress(config,lev+2,off,"Going to read the list length"); |
373 | list_length = psiconv_read_u32(buf,lev+2,off + len,&res); |
377 | list_length = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
374 | if (res) |
378 | if (res) |
375 | goto ERROR1; |
379 | goto ERROR1; |
376 | psiconv_debug(lev+2,off,"Length in bytes: %08x",list_length); |
380 | psiconv_debug(config,lev+2,off,"Length in bytes: %08x",list_length); |
377 | len += 4; |
381 | len += 4; |
378 | |
382 | |
379 | nr = 0; |
383 | nr = 0; |
380 | while(len - 4 < list_length) { |
384 | while(len - 4 < list_length) { |
381 | psiconv_progress(lev+2,off+len,"Going to read element %d",nr); |
385 | psiconv_progress(config,lev+2,off+len,"Going to read element %d",nr); |
382 | psiconv_progress(lev+3,off+len,"Going to read the element id"); |
386 | psiconv_progress(config,lev+3,off+len,"Going to read the element id"); |
383 | id = psiconv_read_u8(buf,lev+2,off+len,&res); |
387 | id = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
384 | if (res) |
388 | if (res) |
385 | goto ERROR1; |
389 | goto ERROR1; |
386 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
390 | psiconv_debug(config,lev+3,off+len,"Id: %02x",id); |
387 | len ++; |
391 | len ++; |
388 | switch(id) { |
392 | switch(id) { |
389 | case 0x01: |
393 | case 0x01: |
390 | psiconv_progress(lev+3,off+len,"Going to read background color"); |
394 | psiconv_progress(config,lev+3,off+len,"Going to read background color"); |
391 | if ((res = psiconv_parse_color(buf,lev+3,off+len,&leng,&temp_color))) |
395 | if ((res = psiconv_parse_color(config,buf,lev+3,off+len,&leng,&temp_color))) |
392 | goto ERROR1; |
396 | goto ERROR1; |
393 | psiconv_free_color(result->back_color); |
397 | psiconv_free_color(result->back_color); |
394 | result->back_color = temp_color; |
398 | result->back_color = temp_color; |
395 | len += leng; |
399 | len += leng; |
396 | break; |
400 | break; |
397 | case 0x02: |
401 | case 0x02: |
398 | psiconv_progress(lev+3,off+len ,"Going to read indent left"); |
402 | psiconv_progress(config,lev+3,off+len ,"Going to read indent left"); |
399 | result->indent_left = psiconv_read_length(buf,lev+3,off+len,&leng,&res); |
403 | result->indent_left = psiconv_read_length(config,buf,lev+3,off+len,&leng,&res); |
400 | if (res) |
404 | if (res) |
401 | goto ERROR1; |
405 | goto ERROR1; |
402 | len += leng; |
406 | len += leng; |
403 | break; |
407 | break; |
404 | case 0x03: |
408 | case 0x03: |
405 | psiconv_progress(lev+3,off+len,"Going to read indent right"); |
409 | psiconv_progress(config,lev+3,off+len,"Going to read indent right"); |
406 | result->indent_right = psiconv_read_length(buf,lev+2,off+len,&leng, |
410 | result->indent_right = psiconv_read_length(config,buf,lev+2,off+len,&leng, |
407 | &res); |
411 | &res); |
408 | if (res) |
412 | if (res) |
409 | goto ERROR1; |
413 | goto ERROR1; |
410 | len += leng; |
414 | len += leng; |
411 | break; |
415 | break; |
412 | case 0x04: |
416 | case 0x04: |
413 | psiconv_progress(lev+3,off+len,"Going to read indent left first line"); |
417 | psiconv_progress(config,lev+3,off+len,"Going to read indent left first line"); |
414 | result->indent_first = psiconv_read_length(buf,lev+2,off+len, &leng, |
418 | result->indent_first = psiconv_read_length(config,buf,lev+2,off+len, &leng, |
415 | &res); |
419 | &res); |
416 | if (res) |
420 | if (res) |
417 | goto ERROR1; |
421 | goto ERROR1; |
418 | len += leng; |
422 | len += leng; |
419 | break; |
423 | break; |
420 | case 0x05: |
424 | case 0x05: |
421 | psiconv_progress(lev+3,off+len,"Going to read horizontal justify"); |
425 | psiconv_progress(config,lev+3,off+len,"Going to read horizontal justify"); |
422 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
426 | temp = psiconv_read_u8(config,buf,lev+3,off+len,&res); |
423 | if (res) |
427 | if (res) |
424 | goto ERROR1; |
428 | goto ERROR1; |
425 | if (temp == 0x00) |
429 | if (temp == 0x00) |
426 | result->justify_hor = psiconv_justify_left; |
430 | result->justify_hor = psiconv_justify_left; |
427 | else if (temp == 0x01) |
431 | else if (temp == 0x01) |
… | |
… | |
429 | else if (temp == 0x02) |
433 | else if (temp == 0x02) |
430 | result->justify_hor = psiconv_justify_right; |
434 | result->justify_hor = psiconv_justify_right; |
431 | else if (temp == 0x03) |
435 | else if (temp == 0x03) |
432 | result->justify_hor = psiconv_justify_full; |
436 | result->justify_hor = psiconv_justify_full; |
433 | else { |
437 | else { |
434 | psiconv_warn(lev+3,off+len, "Unknown horizontal justify argument " |
438 | psiconv_warn(config,lev+3,off+len, "Unknown horizontal justify argument " |
435 | "in paragraph layout codes list"); |
439 | "in paragraph layout codes list"); |
436 | result->justify_hor = psiconv_justify_left; |
440 | result->justify_hor = psiconv_justify_left; |
437 | } |
441 | } |
438 | psiconv_debug(lev+3,off+len,"Justify: %02x",temp); |
442 | psiconv_debug(config,lev+3,off+len,"Justify: %02x",temp); |
439 | len ++; |
443 | len ++; |
440 | break; |
444 | break; |
441 | case 0x06: |
445 | case 0x06: |
442 | psiconv_progress(lev+3,off+len,"Going to read vertical justify"); |
446 | psiconv_progress(config,lev+3,off+len,"Going to read vertical justify"); |
443 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
447 | temp = psiconv_read_u8(config,buf,lev+3,off+len,&res); |
444 | if (res) |
448 | if (res) |
445 | goto ERROR1; |
449 | goto ERROR1; |
446 | if (temp == 0x00) |
450 | if (temp == 0x00) |
447 | result->justify_ver = psiconv_justify_top; |
451 | result->justify_ver = psiconv_justify_top; |
448 | else if (temp == 0x01) |
452 | else if (temp == 0x01) |
449 | result->justify_ver = psiconv_justify_middle; |
453 | result->justify_ver = psiconv_justify_middle; |
450 | else if (temp == 0x02) |
454 | else if (temp == 0x02) |
451 | result->justify_ver = psiconv_justify_bottom; |
455 | result->justify_ver = psiconv_justify_bottom; |
452 | else { |
456 | else { |
453 | psiconv_warn(lev+3,off+len, "Unknown vertical justify argument " |
457 | psiconv_warn(config,lev+3,off+len, "Unknown vertical justify argument " |
454 | "in paragraph layout codes list"); |
458 | "in paragraph layout codes list"); |
455 | result->justify_ver = psiconv_justify_bottom; |
459 | result->justify_ver = psiconv_justify_bottom; |
456 | } |
460 | } |
457 | psiconv_debug(lev+3,off+len,"Justify: %02x",temp); |
461 | psiconv_debug(config,lev+3,off+len,"Justify: %02x",temp); |
458 | len ++; |
462 | len ++; |
459 | break; |
463 | break; |
460 | case 0x07: |
464 | case 0x07: |
461 | psiconv_progress(lev+3,off+len,"Going to read linespacing distance"); |
465 | psiconv_progress(config,lev+3,off+len,"Going to read linespacing distance"); |
462 | result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
466 | result->linespacing = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res); |
463 | if (res) |
467 | if (res) |
464 | goto ERROR1; |
468 | goto ERROR1; |
465 | len += leng; |
469 | len += leng; |
466 | break; |
470 | break; |
467 | case 0x08: |
471 | case 0x08: |
468 | psiconv_progress(lev+3,off+len,"Going to read linespacing exact"); |
472 | psiconv_progress(config,lev+3,off+len,"Going to read linespacing exact"); |
469 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
473 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
470 | &result->linespacing_exact))) |
474 | &result->linespacing_exact))) |
471 | goto ERROR1; |
475 | goto ERROR1; |
472 | len += leng; |
476 | len += leng; |
473 | break; |
477 | break; |
474 | case 0x09: |
478 | case 0x09: |
475 | psiconv_progress(lev+3,off+len,"Going to read top space"); |
479 | psiconv_progress(config,lev+3,off+len,"Going to read top space"); |
476 | result->space_above = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
480 | result->space_above = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res); |
477 | if (res) |
481 | if (res) |
478 | goto ERROR1; |
482 | goto ERROR1; |
479 | len += leng; |
483 | len += leng; |
480 | break; |
484 | break; |
481 | case 0x0a: |
485 | case 0x0a: |
482 | psiconv_progress(lev+3,off+len,"Going to read bottom space"); |
486 | psiconv_progress(config,lev+3,off+len,"Going to read bottom space"); |
483 | result->space_below = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
487 | result->space_below = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res); |
484 | if (res) |
488 | if (res) |
485 | goto ERROR1; |
489 | goto ERROR1; |
486 | len += leng; |
490 | len += leng; |
487 | break; |
491 | break; |
488 | case 0x0b: |
492 | case 0x0b: |
489 | psiconv_progress(lev+3,off+len,"Going to read on one page"); |
493 | psiconv_progress(config,lev+3,off+len,"Going to read on one page"); |
490 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
494 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
491 | &result->keep_together))) |
495 | &result->keep_together))) |
492 | goto ERROR1; |
496 | goto ERROR1; |
493 | len += leng; |
497 | len += leng; |
494 | break; |
498 | break; |
495 | case 0x0c: |
499 | case 0x0c: |
496 | psiconv_progress(lev+3,off+len,"Going to read together with"); |
500 | psiconv_progress(config,lev+3,off+len,"Going to read together with"); |
497 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
501 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
498 | &result->keep_with_next))) |
502 | &result->keep_with_next))) |
499 | goto ERROR1; |
503 | goto ERROR1; |
500 | len += leng; |
504 | len += leng; |
501 | break; |
505 | break; |
502 | case 0x0d: |
506 | case 0x0d: |
503 | psiconv_progress(lev+3,off+len,"Going to read on next page"); |
507 | psiconv_progress(config,lev+3,off+len,"Going to read on next page"); |
504 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
508 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
505 | &result->on_next_page))) |
509 | &result->on_next_page))) |
506 | goto ERROR1; |
510 | goto ERROR1; |
507 | len += leng; |
511 | len += leng; |
508 | break; |
512 | break; |
509 | case 0x0e: |
513 | case 0x0e: |
510 | psiconv_progress(lev+3,off+len,"Going to read no widow protection"); |
514 | psiconv_progress(config,lev+3,off+len,"Going to read no widow protection"); |
511 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
515 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
512 | &result->no_widow_protection))) |
516 | &result->no_widow_protection))) |
513 | goto ERROR1; |
517 | goto ERROR1; |
514 | len += leng; |
518 | len += leng; |
515 | break; |
519 | break; |
516 | case 0x0f: |
520 | case 0x0f: |
517 | psiconv_progress(lev+3,off+len,"Going to read wrap to fit cell limits"); |
521 | psiconv_progress(config,lev+3,off+len,"Going to read wrap to fit cell limits"); |
518 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
522 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
519 | &result->wrap_to_fit_cell))) |
523 | &result->wrap_to_fit_cell))) |
520 | goto ERROR1; |
524 | goto ERROR1; |
521 | len += leng; |
525 | len += leng; |
522 | break; |
526 | break; |
523 | case 0x10: |
527 | case 0x10: |
524 | psiconv_progress(lev+3,off+len,"Going to read border distance to text"); |
528 | psiconv_progress(config,lev+3,off+len,"Going to read border distance to text"); |
525 | result->border_distance = psiconv_read_length(buf,lev+3, |
529 | result->border_distance = psiconv_read_length(config,buf,lev+3, |
526 | off+len,&leng,&res); |
530 | off+len,&leng,&res); |
527 | if (res) |
531 | if (res) |
528 | goto ERROR1; |
532 | goto ERROR1; |
529 | len += leng; |
533 | len += leng; |
530 | break; |
534 | break; |
531 | case 0x11: |
535 | case 0x11: |
532 | psiconv_progress(lev+3,off+len,"Going to read top border"); |
536 | psiconv_progress(config,lev+3,off+len,"Going to read top border"); |
533 | if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) |
537 | if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border))) |
534 | goto ERROR1; |
538 | goto ERROR1; |
535 | psiconv_free_border(result->top_border); |
539 | psiconv_free_border(result->top_border); |
536 | result->top_border = temp_border; |
540 | result->top_border = temp_border; |
537 | len += leng; |
541 | len += leng; |
538 | break; |
542 | break; |
539 | case 0x12: |
543 | case 0x12: |
540 | psiconv_progress(lev+3,off+len,"Going to read bottom border"); |
544 | psiconv_progress(config,lev+3,off+len,"Going to read bottom border"); |
541 | if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) |
545 | if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border))) |
542 | goto ERROR1; |
546 | goto ERROR1; |
543 | psiconv_free_border(result->bottom_border); |
547 | psiconv_free_border(result->bottom_border); |
544 | result->bottom_border = temp_border; |
548 | result->bottom_border = temp_border; |
545 | len += leng; |
549 | len += leng; |
546 | break; |
550 | break; |
547 | case 0x13: |
551 | case 0x13: |
548 | psiconv_progress(lev+3,off+len,"Going to read left border"); |
552 | psiconv_progress(config,lev+3,off+len,"Going to read left border"); |
549 | if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) |
553 | if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border))) |
550 | goto ERROR1; |
554 | goto ERROR1; |
551 | psiconv_free_border(result->left_border); |
555 | psiconv_free_border(result->left_border); |
552 | result->left_border = temp_border; |
556 | result->left_border = temp_border; |
553 | len += leng; |
557 | len += leng; |
554 | break; |
558 | break; |
555 | case 0x14: |
559 | case 0x14: |
556 | psiconv_progress(lev+3,off+len,"Going to read right border"); |
560 | psiconv_progress(config,lev+3,off+len,"Going to read right border"); |
557 | if ((res = psiconv_parse_border(buf,lev+3,off+len,&leng,&temp_border))) |
561 | if ((res = psiconv_parse_border(config,buf,lev+3,off+len,&leng,&temp_border))) |
558 | goto ERROR1; |
562 | goto ERROR1; |
559 | psiconv_free_border(result->right_border); |
563 | psiconv_free_border(result->right_border); |
560 | result->right_border = temp_border; |
564 | result->right_border = temp_border; |
561 | len += leng; |
565 | len += leng; |
562 | break; |
566 | break; |
563 | case 0x15: |
567 | case 0x15: |
564 | psiconv_progress(lev+3,off+len,"Going to read bullet"); |
568 | psiconv_progress(config,lev+3,off+len,"Going to read bullet"); |
565 | if ((res = psiconv_parse_bullet(buf,lev+3,off+len,&leng,&temp_bullet))) |
569 | if ((res = psiconv_parse_bullet(config,buf,lev+3,off+len,&leng,&temp_bullet))) |
566 | goto ERROR1; |
570 | goto ERROR1; |
567 | psiconv_free_bullet(result->bullet); |
571 | psiconv_free_bullet(result->bullet); |
568 | result->bullet = temp_bullet; |
572 | result->bullet = temp_bullet; |
569 | len += leng; |
573 | len += leng; |
570 | break; |
574 | break; |
571 | case 0x16: |
575 | case 0x16: |
572 | psiconv_progress(lev+3,off+len,"Going to read standard tabs"); |
576 | psiconv_progress(config,lev+3,off+len,"Going to read standard tabs"); |
573 | result->tabs->normal = psiconv_read_length(buf,lev+3,off+len,&leng, |
577 | result->tabs->normal = psiconv_read_length(config,buf,lev+3,off+len,&leng, |
574 | &res); |
578 | &res); |
575 | if (res) |
579 | if (res) |
576 | goto ERROR1; |
580 | goto ERROR1; |
577 | len += leng; |
581 | len += leng; |
578 | break; |
582 | break; |
579 | case 0x17: |
583 | case 0x17: |
580 | psiconv_progress(lev+3,off+len,"Going to read extra tab"); |
584 | psiconv_progress(config,lev+3,off+len,"Going to read extra tab"); |
581 | if ((res = psiconv_parse_tab(buf,lev+3,off+len,&leng,&temp_tab))) |
585 | if ((res = psiconv_parse_tab(config,buf,lev+3,off+len,&leng,&temp_tab))) |
582 | goto ERROR1; |
586 | goto ERROR1; |
583 | if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) { |
587 | if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) { |
584 | psiconv_free_tab(temp_tab); |
588 | psiconv_free_tab(temp_tab); |
585 | goto ERROR1; |
589 | goto ERROR1; |
586 | } |
590 | } |
587 | psiconv_free_tab(temp_tab); |
591 | psiconv_free_tab(temp_tab); |
588 | len += leng; |
592 | len += leng; |
589 | break; |
593 | break; |
590 | default: |
594 | default: |
591 | psiconv_warn(lev+3,off+len, |
595 | psiconv_warn(config,lev+3,off+len, |
592 | "Unknown code in paragraph layout codes list"); |
596 | "Unknown code in paragraph layout codes list"); |
593 | psiconv_debug(lev+3,off+len,"Code: %02x",id); |
597 | psiconv_debug(config,lev+3,off+len,"Code: %02x",id); |
594 | len ++; |
598 | len ++; |
595 | break; |
599 | break; |
596 | } |
600 | } |
597 | nr ++; |
601 | nr ++; |
598 | } |
602 | } |
599 | |
603 | |
600 | if (len - 4 != list_length) { |
604 | if (len - 4 != list_length) { |
601 | psiconv_warn(lev+2,off+len, |
605 | psiconv_warn(config,lev+2,off+len, |
602 | "Read past end of paragraph layout codes list. I probably lost track" |
606 | "Read past end of paragraph layout codes list. I probably lost track" |
603 | "somewhere!"); |
607 | "somewhere!"); |
604 | psiconv_debug(lev+2,off+len,"Read %d characters instead of %d", |
608 | psiconv_debug(config,lev+2,off+len,"Read %d characters instead of %d", |
605 | len-4,list_length); |
609 | len-4,list_length); |
606 | res = PSICONV_E_PARSE; |
610 | res = PSICONV_E_PARSE; |
607 | goto ERROR1; |
611 | goto ERROR1; |
608 | } |
612 | } |
609 | |
613 | |
610 | len = list_length + 4; |
614 | len = list_length + 4; |
611 | |
615 | |
612 | psiconv_progress(lev+1,off+len, |
616 | psiconv_progress(config,lev+1,off+len, |
613 | "End of paragraph layout list (total length: %08x)",len); |
617 | "End of paragraph layout list (total length: %08x)",len); |
614 | |
618 | |
615 | if (length) |
619 | if (length) |
616 | *length = len; |
620 | *length = len; |
617 | return 0; |
621 | return 0; |
618 | |
622 | |
619 | ERROR1: |
623 | ERROR1: |
620 | psiconv_warn(lev+1,off,"Reading of paragraph_layout_list failed"); |
624 | psiconv_warn(config,lev+1,off,"Reading of paragraph_layout_list failed"); |
621 | if (length) |
625 | if (length) |
622 | *length = 0; |
626 | *length = 0; |
623 | if (!res) |
627 | if (!res) |
624 | return -PSICONV_E_NOMEM; |
628 | return -PSICONV_E_NOMEM; |
625 | else |
629 | else |
626 | return res; |
630 | return res; |
627 | } |
631 | } |
628 | |
632 | |
629 | int psiconv_parse_character_layout_list(const psiconv_buffer buf, int lev, |
633 | int psiconv_parse_character_layout_list(const psiconv_config config, |
|
|
634 | const psiconv_buffer buf, int lev, |
630 | psiconv_u32 off, int *length, |
635 | psiconv_u32 off, int *length, |
631 | psiconv_character_layout result) |
636 | psiconv_character_layout result) |
632 | { |
637 | { |
633 | int res=0; |
638 | int res=0; |
634 | int len=0; |
639 | int len=0; |
… | |
… | |
636 | psiconv_u8 id; |
641 | psiconv_u8 id; |
637 | psiconv_u32 temp; |
642 | psiconv_u32 temp; |
638 | psiconv_color temp_color; |
643 | psiconv_color temp_color; |
639 | psiconv_font temp_font; |
644 | psiconv_font temp_font; |
640 | |
645 | |
641 | psiconv_progress(lev+1,off,"Going to read character layout codes"); |
646 | psiconv_progress(config,lev+1,off,"Going to read character layout codes"); |
642 | |
647 | |
643 | psiconv_progress(lev+2,off,"Going to read the list length"); |
648 | psiconv_progress(config,lev+2,off,"Going to read the list length"); |
644 | list_length = psiconv_read_u32(buf,lev+2,off + len,&res); |
649 | list_length = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
645 | if (res) |
650 | if (res) |
646 | goto ERROR1; |
651 | goto ERROR1; |
647 | psiconv_debug(lev+2,off,"Length in bytes: %08x",list_length); |
652 | psiconv_debug(config,lev+2,off,"Length in bytes: %08x",list_length); |
648 | len += 4; |
653 | len += 4; |
649 | |
654 | |
650 | nr = 0; |
655 | nr = 0; |
651 | while(len-4 < list_length) { |
656 | while(len-4 < list_length) { |
652 | psiconv_progress(lev+2,off+len,"Going to read element %d",nr); |
657 | psiconv_progress(config,lev+2,off+len,"Going to read element %d",nr); |
653 | psiconv_progress(lev+3,off+len,"Going to read the element id"); |
658 | psiconv_progress(config,lev+3,off+len,"Going to read the element id"); |
654 | id = psiconv_read_u8(buf,lev+2,off+len,&res); |
659 | id = psiconv_read_u8(config,buf,lev+2,off+len,&res); |
655 | if (res) |
660 | if (res) |
656 | goto ERROR1; |
661 | goto ERROR1; |
657 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
662 | psiconv_debug(config,lev+3,off+len,"Id: %02x",id); |
658 | len ++; |
663 | len ++; |
659 | switch(id) { |
664 | switch(id) { |
660 | case 0x18: |
665 | case 0x18: |
661 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
666 | psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting"); |
662 | len ++; |
667 | len ++; |
663 | break; |
668 | break; |
664 | case 0x19: |
669 | case 0x19: |
665 | psiconv_progress(lev+3,off+len,"Going to read text color"); |
670 | psiconv_progress(config,lev+3,off+len,"Going to read text color"); |
666 | if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) |
671 | if ((res = psiconv_parse_color(config,buf,lev+3,off+len, &leng,&temp_color))) |
667 | goto ERROR1; |
672 | goto ERROR1; |
668 | psiconv_free_color(result->color); |
673 | psiconv_free_color(result->color); |
669 | result->color = temp_color; |
674 | result->color = temp_color; |
670 | len += leng; |
675 | len += leng; |
671 | break; |
676 | break; |
672 | case 0x1a: |
677 | case 0x1a: |
673 | psiconv_progress(lev+3,off+len,"Going to read background color (?)"); |
678 | psiconv_progress(config,lev+3,off+len,"Going to read background color (?)"); |
674 | if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) |
679 | if ((res = psiconv_parse_color(config,buf,lev+2,off+len, &leng,&temp_color))) |
675 | goto ERROR1; |
680 | goto ERROR1; |
676 | psiconv_free_color(result->back_color); |
681 | psiconv_free_color(result->back_color); |
677 | result->back_color = temp_color; |
682 | result->back_color = temp_color; |
678 | len += leng; |
683 | len += leng; |
679 | break; |
684 | break; |
680 | case 0x1b: |
685 | case 0x1b: |
681 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
686 | psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting"); |
682 | len ++; |
687 | len ++; |
683 | break; |
688 | break; |
684 | case 0x1c: |
689 | case 0x1c: |
685 | psiconv_progress(lev+3,off+len,"Going to read font size"); |
690 | psiconv_progress(config,lev+3,off+len,"Going to read font size"); |
686 | result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
691 | result->font_size = psiconv_read_size(config,buf,lev+3,off+len,&leng,&res); |
687 | if (res) |
692 | if (res) |
688 | goto ERROR1; |
693 | goto ERROR1; |
689 | len += leng; |
694 | len += leng; |
690 | break; |
695 | break; |
691 | case 0x1d: |
696 | case 0x1d: |
692 | psiconv_progress(lev+3,off+len,"Going to read italic"); |
697 | psiconv_progress(config,lev+3,off+len,"Going to read italic"); |
693 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,&result->italic))) |
698 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,&result->italic))) |
694 | goto ERROR1; |
699 | goto ERROR1; |
695 | len += leng; |
700 | len += leng; |
696 | break; |
701 | break; |
697 | case 0x1e: |
702 | case 0x1e: |
698 | psiconv_progress(lev+3,off+len,"Going to read bold"); |
703 | psiconv_progress(config,lev+3,off+len,"Going to read bold"); |
699 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,&result->bold))) |
704 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng,&result->bold))) |
700 | goto ERROR1; |
705 | goto ERROR1; |
701 | len += leng; |
706 | len += leng; |
702 | break; |
707 | break; |
703 | case 0x1f: |
708 | case 0x1f: |
704 | psiconv_progress(lev+3,off+len,"Going to read super_sub"); |
709 | psiconv_progress(config,lev+3,off+len,"Going to read super_sub"); |
705 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
710 | temp = psiconv_read_u8(config,buf,lev+3,off+len,&res); |
706 | if (res) |
711 | if (res) |
707 | goto ERROR1; |
712 | goto ERROR1; |
708 | if (temp == 0x00) |
713 | if (temp == 0x00) |
709 | result->super_sub = psiconv_normalscript; |
714 | result->super_sub = psiconv_normalscript; |
710 | else if (temp == 0x01) |
715 | else if (temp == 0x01) |
711 | result->super_sub = psiconv_superscript; |
716 | result->super_sub = psiconv_superscript; |
712 | else if (temp == 0x02) |
717 | else if (temp == 0x02) |
713 | result->super_sub = psiconv_subscript; |
718 | result->super_sub = psiconv_subscript; |
714 | else { |
719 | else { |
715 | psiconv_warn(lev+3,off+len, |
720 | psiconv_warn(config,lev+3,off+len, |
716 | "Unknown super_sub argument in character layout codes list"); |
721 | "Unknown super_sub argument in character layout codes list"); |
717 | } |
722 | } |
718 | psiconv_debug(lev+3,off+len,"Super_sub: %02x",temp); |
723 | psiconv_debug(config,lev+3,off+len,"Super_sub: %02x",temp); |
719 | len ++; |
724 | len ++; |
720 | break; |
725 | break; |
721 | case 0x20: |
726 | case 0x20: |
722 | psiconv_progress(lev+3,off+len,"Going to read underline"); |
727 | psiconv_progress(config,lev+3,off+len,"Going to read underline"); |
723 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
728 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
724 | &result->underline))) |
729 | &result->underline))) |
725 | goto ERROR1; |
730 | goto ERROR1; |
726 | len += leng; |
731 | len += leng; |
727 | break; |
732 | break; |
728 | case 0x21: |
733 | case 0x21: |
729 | psiconv_progress(lev+3,off+len,"Going to read strikethrough"); |
734 | psiconv_progress(config,lev+3,off+len,"Going to read strikethrough"); |
730 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
735 | if ((res = psiconv_parse_bool(config,buf,lev+3,off+len,&leng, |
731 | &result->strikethrough))) |
736 | &result->strikethrough))) |
732 | goto ERROR1; |
737 | goto ERROR1; |
733 | len += leng; |
738 | len += leng; |
734 | break; |
739 | break; |
735 | case 0x22: |
740 | case 0x22: |
736 | psiconv_progress(lev+3,off+len,"Going to read font"); |
741 | psiconv_progress(config,lev+3,off+len,"Going to read font"); |
737 | if ((res = psiconv_parse_font(buf,lev+3,off+len, &leng, &temp_font))) |
742 | if ((res = psiconv_parse_font(config,buf,lev+3,off+len, &leng, &temp_font))) |
738 | goto ERROR1; |
743 | goto ERROR1; |
739 | psiconv_free_font(result->font); |
744 | psiconv_free_font(result->font); |
740 | result->font = temp_font; |
745 | result->font = temp_font; |
741 | len += leng; |
746 | len += leng; |
742 | break; |
747 | break; |
743 | case 0x23: |
748 | case 0x23: |
744 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
749 | psiconv_progress(config,lev+3,off+len,"Going to skip an unknown setting"); |
745 | len ++; |
750 | len ++; |
746 | break; |
751 | break; |
747 | case 0x24: |
752 | case 0x24: |
748 | psiconv_progress(lev+3,off+len, |
753 | psiconv_progress(config,lev+3,off+len, |
749 | "Going to read unknown code 0x24 (%02x expected)", 0); |
754 | "Going to read unknown code 0x24 (%02x expected)", 0); |
750 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
755 | temp = psiconv_read_u8(config,buf,lev+3,off+len,&res); |
751 | if (res) |
756 | if (res) |
752 | goto ERROR1; |
757 | goto ERROR1; |
753 | if (temp != 0) { |
758 | if (temp != 0) { |
754 | psiconv_warn(lev+3,off+len, |
759 | psiconv_warn(config,lev+3,off+len, |
755 | "Unknown code 0x24 value != 0x0 (0x%02x)", temp); |
760 | "Unknown code 0x24 value != 0x0 (0x%02x)", temp); |
756 | } |
761 | } |
757 | len ++; |
762 | len ++; |
758 | break; |
763 | break; |
759 | default: |
764 | default: |
760 | psiconv_warn(lev+3,off+len,"Unknown code in character layout list"); |
765 | psiconv_warn(config,lev+3,off+len,"Unknown code in character layout list"); |
761 | psiconv_debug(lev+3,off+len,"Code: %02x",id); |
766 | psiconv_debug(config,lev+3,off+len,"Code: %02x",id); |
762 | len ++; |
767 | len ++; |
763 | break; |
768 | break; |
764 | } |
769 | } |
765 | nr ++; |
770 | nr ++; |
766 | } |
771 | } |
767 | |
772 | |
768 | if (len - 4 != list_length) { |
773 | if (len - 4 != list_length) { |
769 | psiconv_warn(lev+2,off+len, |
774 | psiconv_warn(config,lev+2,off+len, |
770 | "Read past end of character layout codes list. I probably lost track" |
775 | "Read past end of character layout codes list. I probably lost track" |
771 | "somewhere!"); |
776 | "somewhere!"); |
772 | psiconv_debug(lev+2,off+len,"Read %d characters instead of %d", |
777 | psiconv_debug(config,lev+2,off+len,"Read %d characters instead of %d", |
773 | len-4,list_length); |
778 | len-4,list_length); |
774 | res = PSICONV_E_PARSE; |
779 | res = PSICONV_E_PARSE; |
775 | goto ERROR1; |
780 | goto ERROR1; |
776 | } |
781 | } |
777 | |
782 | |
778 | len = list_length + 4; |
783 | len = list_length + 4; |
779 | |
784 | |
780 | psiconv_progress(lev+1,off+len, |
785 | psiconv_progress(config,lev+1,off+len, |
781 | "End of character layout list (total length: %08x)",len); |
786 | "End of character layout list (total length: %08x)",len); |
782 | |
787 | |
783 | if (length) |
788 | if (length) |
784 | *length = len; |
789 | *length = len; |
785 | return res; |
790 | return res; |
786 | |
791 | |
787 | ERROR1: |
792 | ERROR1: |
788 | psiconv_warn(lev+1,off,"Reading of character_layout_list failed"); |
793 | psiconv_warn(config,lev+1,off,"Reading of character_layout_list failed"); |
789 | if (length) |
794 | if (length) |
790 | *length = 0; |
795 | *length = 0; |
791 | if (!res) |
796 | if (!res) |
792 | return -PSICONV_E_NOMEM; |
797 | return -PSICONV_E_NOMEM; |
793 | else |
798 | else |