/[public]/psiconv/trunk/lib/psiconv/parse_word.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_word.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 64 Revision 184
… …
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21#include "compat.h"
22
21#include <stdlib.h> 23#include <stdlib.h>
24
22#include "parse_routines.h" 25#include "parse_routines.h"
26#include "error.h"
23 27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
31
24int psiconv_parse_word_status_section(const psiconv_buffer buf, int lev, 32int psiconv_parse_word_status_section(const psiconv_config config,
33 const psiconv_buffer buf, int lev,
25 psiconv_u32 off, int *length, 34 psiconv_u32 off, int *length,
26 psiconv_word_status_section *result) 35 psiconv_word_status_section *result)
27{ 36{
28 int res=0; 37 int res=0;
29 int len=0; 38 int len=0;
30 psiconv_u32 temp; 39 psiconv_u32 temp;
31 int leng; 40 int leng;
32 41
33 psiconv_progress(lev+1,off,"Going to read the word status section"); 42 psiconv_progress(config,lev+1,off,"Going to read the word status section");
34 if (!(*result = malloc(sizeof(**result)))) 43 if (!(*result = malloc(sizeof(**result))))
35 goto ERROR1; 44 goto ERROR1;
36 45
37 psiconv_progress(lev+2,off+len, 46 psiconv_progress(config,lev+2,off+len,
38 "Going to read the initial byte (%02x expected)",0x02); 47 "Going to read the initial byte (%02x expected)",0x02);
39 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 48 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
40 if (res) 49 if (res)
41 goto ERROR2; 50 goto ERROR2;
42 if (temp != 0x02) { 51 if (temp != 0x02) {
43 psiconv_warn(lev+2,off+len, 52 psiconv_warn(config,lev+2,off+len,
44 "Word status section initial byte unknown value (ignored)"); 53 "Word status section initial byte unknown value (ignored)");
45 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp); 54 psiconv_debug(config,lev+2,off+len,"Initial byte: %02x",temp);
46 } 55 }
47 len ++; 56 len ++;
48 57
49 psiconv_progress(lev+2,off+len, 58 psiconv_progress(config,lev+2,off+len,
50 "Going to read the first byte of display flags"); 59 "Going to read the first byte of display flags");
51 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 60 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
52 if (res) 61 if (res)
53 goto ERROR2; 62 goto ERROR2;
54 63
55 (*result)->show_tabs = temp&0x01 ? psiconv_bool_true : psiconv_bool_false; 64 (*result)->show_tabs = temp&0x01 ? psiconv_bool_true : psiconv_bool_false;
56 psiconv_debug(lev+2,off+len,"Show tabs: %02x",(*result)->show_tabs); 65 psiconv_debug(config,lev+2,off+len,"Show tabs: %02x",(*result)->show_tabs);
57 (*result)->show_spaces = temp&0x02 ? psiconv_bool_true : psiconv_bool_false; 66 (*result)->show_spaces = temp&0x02 ? psiconv_bool_true : psiconv_bool_false;
58 psiconv_debug(lev+2,off+len,"Show spaces: %02x",(*result)->show_spaces); 67 psiconv_debug(config,lev+2,off+len,"Show spaces: %02x",(*result)->show_spaces);
59 (*result)->show_paragraph_ends = temp &0x04 ? psiconv_bool_true : 68 (*result)->show_paragraph_ends = temp &0x04 ? psiconv_bool_true :
60 psiconv_bool_false; 69 psiconv_bool_false;
61 psiconv_debug(lev+2,off+len,"Show paragraph ends: %02x", 70 psiconv_debug(config,lev+2,off+len,"Show paragraph ends: %02x",
62 (*result)->show_paragraph_ends); 71 (*result)->show_paragraph_ends);
63 (*result)->show_line_breaks = temp & 0x08 ? psiconv_bool_true : 72 (*result)->show_line_breaks = temp & 0x08 ? psiconv_bool_true :
64 psiconv_bool_false; 73 psiconv_bool_false;
65 psiconv_debug(lev+2,off+len,"Show line breaks: %02x", 74 psiconv_debug(config,lev+2,off+len,"Show line breaks: %02x",
66 (*result)->show_line_breaks); 75 (*result)->show_line_breaks);
67 (*result)->show_hard_minus = temp & 0x20 ? psiconv_bool_true : 76 (*result)->show_hard_minus = temp & 0x20 ? psiconv_bool_true :
68 psiconv_bool_false; 77 psiconv_bool_false;
69 psiconv_debug(lev+2,off+len,"Show hard minus: %02x", 78 psiconv_debug(config,lev+2,off+len,"Show hard minus: %02x",
70 (*result)->show_hard_minus); 79 (*result)->show_hard_minus);
71 (*result)->show_hard_space = temp & 0x40 ? psiconv_bool_true : 80 (*result)->show_hard_space = temp & 0x40 ? psiconv_bool_true :
72 psiconv_bool_false; 81 psiconv_bool_false;
73 psiconv_debug(lev+2,off+len,"Show hard space: %02x", 82 psiconv_debug(config,lev+2,off+len,"Show hard space: %02x",
74 (*result)->show_hard_space); 83 (*result)->show_hard_space);
75 if (temp & 0x90) { 84 if (temp & 0x90) {
76 psiconv_warn(lev+2,off+len,"Word status section first byte of display " 85 psiconv_warn(config,lev+2,off+len,"Word status section first byte of display "
77 "flags contains unknown flags (ignored)"); 86 "flags contains unknown flags (ignored)");
78 psiconv_debug(lev+2,off+len,"Unknown flags: %02x",temp & 0x90); 87 psiconv_debug(config,lev+2,off+len,"Unknown flags: %02x",temp & 0x90);
79 } 88 }
80 len ++; 89 len ++;
81 90
82 psiconv_progress(lev+2,off+len,"Going to read second byte of display flags"); 91 psiconv_progress(config,lev+2,off+len,"Going to read second byte of display flags");
83 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 92 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
84 if (res) 93 if (res)
85 goto ERROR2; 94 goto ERROR2;
86 95
87 (*result)->show_full_pictures = temp & 0x01 ? psiconv_bool_true : 96 (*result)->show_full_pictures = temp & 0x01 ? psiconv_bool_true :
88 psiconv_bool_false; 97 psiconv_bool_false;
89 psiconv_debug(lev+2,off+len,"Show full pictures: %02x", 98 psiconv_debug(config,lev+2,off+len,"Show full pictures: %02x",
90 (*result)->show_full_pictures); 99 (*result)->show_full_pictures);
91 (*result)->show_full_graphs = temp & 0x02 ? psiconv_bool_true : 100 (*result)->show_full_graphs = temp & 0x02 ? psiconv_bool_true :
92 psiconv_bool_false; 101 psiconv_bool_false;
93 psiconv_debug(lev+2,off+len,"Show full graphs: %02x", 102 psiconv_debug(config,lev+2,off+len,"Show full graphs: %02x",
94 (*result)->show_full_graphs); 103 (*result)->show_full_graphs);
95 if (temp & 0xfc) { 104 if (temp & 0xfc) {
96 psiconv_warn(lev+2,off+len,"Word status section second byte of display " 105 psiconv_warn(config,lev+2,off+len,"Word status section second byte of display "
97 "flags contains unknown flags (ignored)"); 106 "flags contains unknown flags (ignored)");
98 psiconv_debug(lev+2,off+len,"Unknown flags: %02x",temp & 0xfc); 107 psiconv_debug(config,lev+2,off+len,"Unknown flags: %02x",temp & 0xfc);
99 } 108 }
100 len ++; 109 len ++;
101 110
102 psiconv_progress(lev+2,off+len,"Going to read top toolbar setting"); 111 psiconv_progress(config,lev+2,off+len,"Going to read top toolbar setting");
103 if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng, 112 if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,
104 &(*result)->show_top_toolbar))) 113 &(*result)->show_top_toolbar)))
105 goto ERROR2; 114 goto ERROR2;
106 len += leng; 115 len += leng;
107 116
108 psiconv_progress(lev+2,off+len,"Going to read side toolbar setting"); 117 psiconv_progress(config,lev+2,off+len,"Going to read side toolbar setting");
109 if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng, 118 if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,
110 &(*result)->show_side_toolbar))) 119 &(*result)->show_side_toolbar)))
111 goto ERROR2; 120 goto ERROR2;
112 len += leng; 121 len += leng;
113 122
114 psiconv_progress(lev+2,off+len,"Going to read operational flags"); 123 psiconv_progress(config,lev+2,off+len,"Going to read operational flags");
115 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 124 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
116 if (res) 125 if (res)
117 goto ERROR2; 126 goto ERROR2;
118 (*result)->fit_lines_to_screen = temp & 0x08 ? psiconv_bool_true : 127 (*result)->fit_lines_to_screen = temp & 0x08 ? psiconv_bool_true :
119 psiconv_bool_false; 128 psiconv_bool_false;
120 psiconv_debug(lev+2,off+len,"Fit lines to screen: %02x", 129 psiconv_debug(config,lev+2,off+len,"Fit lines to screen: %02x",
121 (*result)->fit_lines_to_screen); 130 (*result)->fit_lines_to_screen);
122 if (temp & 0xf7) { 131 if (temp & 0xf7) {
123 psiconv_warn(lev+2,off+len,"Word status section operational flags " 132 psiconv_warn(config,lev+2,off+len,"Word status section operational flags "
124 "contains unknown flags (ignored)"); 133 "contains unknown flags (ignored)");
125 psiconv_debug(lev+2,off+len,"Unknown flags: %02x",temp & 0xfc); 134 psiconv_debug(config,lev+2,off+len,"Unknown flags: %02x",temp & 0xfc);
126 } 135 }
127 len ++; 136 len ++;
128 137
129 psiconv_progress(lev+2,off+len,"Going to read cursor position"); 138 psiconv_progress(config,lev+2,off+len,"Going to read cursor position");
130 (*result)->cursor_position = psiconv_read_u32(buf,lev+2,off + len,&res); 139 (*result)->cursor_position = psiconv_read_u32(config,buf,lev+2,off + len,&res);
131 if (res) 140 if (res)
132 goto ERROR2; 141 goto ERROR2;
133 psiconv_debug(lev+2,off+len,"Cursor position: %08x", 142 psiconv_debug(config,lev+2,off+len,"Cursor position: %08x",
134 (*result)->cursor_position); 143 (*result)->cursor_position);
135 len += 0x04; 144 len += 0x04;
136 145
137 psiconv_progress(lev+2,off+len,"Going to read display size"); 146 psiconv_progress(config,lev+2,off+len,"Going to read display size");
138 (*result)->cursor_position = psiconv_read_u32(buf,lev+2,off + len,&res); 147 (*result)->display_size = psiconv_read_u32(config,buf,lev+2,off + len,&res);
139 if (res) 148 if (res)
140 goto ERROR2; 149 goto ERROR2;
141 psiconv_debug(lev+2,off+len,"Display size: %08x", 150 psiconv_debug(config,lev+2,off+len,"Display size: %08x",
142 (*result)->cursor_position); 151 (*result)->display_size);
143 len += 0x04; 152 len += 0x04;
144 153
145 if (length) 154 if (length)
146 *length = len; 155 *length = len;
147 156
148 psiconv_progress(lev,off+len-1, 157 psiconv_progress(config,lev,off+len-1,
149 "End of word status section (total length: %08x)", len); 158 "End of word status section (total length: %08x)", len);
150 return 0; 159 return 0;
151 160
152ERROR2: 161ERROR2:
153 free (*result); 162 free (*result);
154ERROR1: 163ERROR1:
155 psiconv_warn(lev+1,off,"Reading of Word Status Section failed"); 164 psiconv_error(config,lev+1,off,"Reading of Word Status Section failed");
156 if (length) 165 if (length)
157 *length = 0; 166 *length = 0;
158 if (!res) 167 if (!res)
159 return -PSICONV_E_NOMEM; 168 return -PSICONV_E_NOMEM;
160 else 169 else
161 return res; 170 return res;
162} 171}
163 172
164int psiconv_parse_word_styles_section(const psiconv_buffer buf, int lev, 173int psiconv_parse_word_styles_section(const psiconv_config config,
174 const psiconv_buffer buf, int lev,
165 psiconv_u32 off, int *length, 175 psiconv_u32 off, int *length,
166 psiconv_word_styles_section *result) 176 psiconv_word_styles_section *result)
167{ 177{
168 int res=0; 178 int res=0;
169 int len=0; 179 int len=0;
170 int leng,i,nr,j; 180 int leng,i,nr,j;
171 psiconv_word_style style; 181 psiconv_word_style style;
172 psiconv_u32 temp; 182 psiconv_u32 temp;
173 183
174 psiconv_progress(lev+1,off,"Going to read the word styles section"); 184 psiconv_progress(config,lev+1,off,"Going to read the word styles section");
175 if (!(*result = malloc(sizeof(**result)))) 185 if (!(*result = malloc(sizeof(**result))))
176 goto ERROR1; 186 goto ERROR1;
177 187
178 psiconv_progress(lev+2,off+len,"Going to read style normal"); 188 psiconv_progress(config,lev+2,off+len,"Going to read style normal");
179 if (!(style = malloc(sizeof(*style)))) 189 if (!(style = malloc(sizeof(*style))))
180 goto ERROR2; 190 goto ERROR2;
181 style->name = NULL; 191 style->name = NULL;
182 if (!(style->paragraph = psiconv_basic_paragraph_layout())) 192 if (!(style->paragraph = psiconv_basic_paragraph_layout()))
183 goto ERROR2_1; 193 goto ERROR2_1;
184 psiconv_progress(lev+3,off+len,"Going to read the paragraph codes"); 194 psiconv_progress(config,lev+3,off+len,"Going to read the paragraph codes");
185 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+3,off+len,&leng, 195 if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+3,off+len,&leng,
186 style->paragraph))) 196 style->paragraph)))
187 goto ERROR2_2; 197 goto ERROR2_2;
188 len += leng; 198 len += leng;
189 psiconv_progress(lev+3,off+len,"Going to read the character codes"); 199 psiconv_progress(config,lev+3,off+len,"Going to read the character codes");
190 if (!(style->character = psiconv_basic_character_layout())) 200 if (!(style->character = psiconv_basic_character_layout()))
191 goto ERROR2_2; 201 goto ERROR2_2;
192 if ((res = psiconv_parse_character_layout_list(buf,lev+3,off+len,&leng, 202 if ((res = psiconv_parse_character_layout_list(config,buf,lev+3,off+len,&leng,
193 style->character))) 203 style->character)))
194 goto ERROR2_3; 204 goto ERROR2_3;
195 len += leng; 205 len += leng;
196 psiconv_progress(lev+3,off+len,"Going to read the hotkey"); 206 psiconv_progress(config,lev+3,off+len,"Going to read the hotkey");
197 temp = psiconv_read_u32(buf,lev+3,off+len,&res); 207 temp = psiconv_read_u32(config,buf,lev+3,off+len,&res);
198 if (res) 208 if (res)
199 goto ERROR2_3; 209 goto ERROR2_3;
200 if (temp & 0xffffff00) { 210 if (temp & 0xffffff00) {
201 psiconv_warn(lev+3,off+len, 211 psiconv_warn(config,lev+3,off+len,
202 "Normal style hotkey has unknown value (ignored)"); 212 "Normal style hotkey has unknown value (ignored)");
203 psiconv_debug(lev+3,off+len,"Hotkey value %08x",temp); 213 psiconv_debug(config,lev+3,off+len,"Hotkey value %08x",temp);
204 temp = 0; 214 temp = 0;
205 } 215 }
206 style->hotkey = temp & 0x000000ff; 216 style->hotkey = temp & 0x000000ff;
207 if ((style->hotkey >= 32) && (style->hotkey < 127)) 217 if ((style->hotkey >= 32) && (style->hotkey < 127))
208 psiconv_debug(lev+3,off+len,"Hotkey: %c",style->hotkey); 218 psiconv_debug(config,lev+3,off+len,"Hotkey: %c",style->hotkey);
209 else if (style->hotkey == 0x00) 219 else if (style->hotkey == 0x00)
210 psiconv_debug(lev+3,off+len,"Hotkey: <none>"); 220 psiconv_debug(config,lev+3,off+len,"Hotkey: <none>");
211 else 221 else
212 psiconv_debug(lev+3,off+len,"Hotkey: %02x",style->hotkey); 222 psiconv_debug(config,lev+3,off+len,"Hotkey: %02x",style->hotkey);
213 (*result)->normal = style; 223 (*result)->normal = style;
214 len += 0x04; 224 len += 0x04;
215 225
216 psiconv_progress(lev+2,off+len,"Going to read hotkeys list"); 226 psiconv_progress(config,lev+2,off+len,"Going to read hotkeys list");
217 if (!((*result)->styles = psiconv_list_new(sizeof(*style)))) 227 if (!((*result)->styles = psiconv_list_new(sizeof(*style))))
218 goto ERROR3; 228 goto ERROR3;
219 if (!(style = malloc(sizeof(*style)))) { 229 if (!(style = malloc(sizeof(*style)))) {
220 goto ERROR3_1; 230 goto ERROR3_1;
221 } 231 }
222 232
223 psiconv_progress(lev+3,off+len,"Going to read the number of entries"); 233 psiconv_progress(config,lev+3,off+len,"Going to read the number of entries");
224 nr = psiconv_read_u8(buf,lev+3,off+len,&res); 234 nr = psiconv_read_u8(config,buf,lev+3,off+len,&res);
225 if (res) 235 if (res)
226 goto ERROR3_2; 236 goto ERROR3_2;
227 len ++; 237 len ++;
228 psiconv_debug(lev+3,off+len,"Nummer of hotkeys: %02x",nr); 238 psiconv_debug(config,lev+3,off+len,"Nummer of hotkeys: %02x",nr);
229 for (i = 0; i < nr; i ++) { 239 for (i = 0; i < nr; i ++) {
230 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 240 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
231 if (res) 241 if (res)
232 goto ERROR3_2; 242 goto ERROR3_2;
233 if (temp & 0xffffff00) { 243 if (temp & 0xffffff00) {
234 psiconv_warn(lev+3,off+len,"Style hotkey has unknown value (ignored)"); 244 psiconv_warn(config,lev+3,off+len,"Style hotkey has unknown value (ignored)");
235 psiconv_debug(lev+3,off+len,"Hotkey %d value %08x",i,temp); 245 psiconv_debug(config,lev+3,off+len,"Hotkey %d value %08x",i,temp);
236 temp = 0; 246 temp = 0;
237 } 247 }
238 style->hotkey = temp & 0x000000ff; 248 style->hotkey = temp & 0x000000ff;
239 if ((style->hotkey >= 32) && (style->hotkey < 127)) 249 if ((style->hotkey >= 32) && (style->hotkey < 127))
240 psiconv_debug(lev+3,off+len,"Hotkey %d: %c",i,style->hotkey); 250 psiconv_debug(config,lev+3,off+len,"Hotkey %d: %c",i,style->hotkey);
241 else if (style->hotkey == 0x00) 251 else if (style->hotkey == 0x00)
242 psiconv_debug(lev+3,off+len,"Hotkey %d: <none>",i); 252 psiconv_debug(config,lev+3,off+len,"Hotkey %d: <none>",i);
243 else 253 else
244 psiconv_debug(lev+3,off+len,"Hotkey %d: %02x",i,style->hotkey); 254 psiconv_debug(config,lev+3,off+len,"Hotkey %d: %02x",i,style->hotkey);
245 if ((res = psiconv_list_add((*result)->styles,style))) 255 if ((res = psiconv_list_add((*result)->styles,style)))
246 goto ERROR3_2; 256 goto ERROR3_2;
247 len += 0x04; 257 len += 0x04;
248 } 258 }
249 free(style); 259 free(style);
250 260
251 psiconv_progress(lev+2,off+len,"Going to read all other styles"); 261 psiconv_progress(config,lev+2,off+len,"Going to read all other styles");
252 psiconv_progress(lev+2,off+len,"Going to read the number of styles"); 262 psiconv_progress(config,lev+2,off+len,"Going to read the number of styles");
253 nr = psiconv_read_u8(buf,lev+3,off+len,&res); 263 nr = psiconv_read_u8(config,buf,lev+3,off+len,&res);
254 if (res) 264 if (res)
255 goto ERROR4; 265 goto ERROR4;
256 if (nr != psiconv_list_length((*result)->styles)) { 266 if (nr != psiconv_list_length((*result)->styles)) {
257 psiconv_warn(lev+3,off+len,"Number of styles and hotkeys do not match"); 267 psiconv_warn(config,lev+3,off+len,"Number of styles and hotkeys do not match");
258 psiconv_debug(lev+3,off+len,"%d hotkeys, %d styles", 268 psiconv_debug(config,lev+3,off+len,"%d hotkeys, %d styles",
259 psiconv_list_length((*result)->styles), nr); 269 psiconv_list_length((*result)->styles), nr);
260 } 270 }
261 len ++; 271 len ++;
262 272
263 for (i = 0; i < nr; i++) { 273 for (i = 0; i < nr; i++) {
264 psiconv_progress(lev+2,off+len,"Next style: %d",i); 274 psiconv_progress(config,lev+2,off+len,"Next style: %d",i);
265 if (i >= psiconv_list_length((*result)->styles)) { 275 if (i >= psiconv_list_length((*result)->styles)) {
266 if (!(style = malloc(sizeof(*style)))) 276 if (!(style = malloc(sizeof(*style))))
267 goto ERROR5; 277 goto ERROR5;
268 style->hotkey = 0; 278 style->hotkey = 0;
269 if (!(psiconv_list_add((*result)->styles,style))) { 279 if (psiconv_list_add((*result)->styles,style)) {
270 free(style); 280 free(style);
271 goto ERROR5; 281 goto ERROR5;
272 } 282 }
273 psiconv_debug(lev+3,off+len,"New entry added in list"); 283 psiconv_debug(config,lev+3,off+len,"New entry added in list");
274 free(style); 284 free(style);
275 } 285 }
276 if (!(style = psiconv_list_get((*result)->styles,i))) 286 if (!(style = psiconv_list_get((*result)->styles,i)))
277 goto ERROR5; 287 goto ERROR5;
278 psiconv_progress(lev+3,off+len,"Going to read the style name"); 288 psiconv_progress(config,lev+3,off+len,"Going to read the style name");
279 style->name = psiconv_read_string(buf,lev+3,off+len,&leng,&res); 289 style->name = psiconv_read_string(config,buf,lev+3,off+len,&leng,&res);
280 if (res) 290 if (res)
281 goto ERROR5; 291 goto ERROR5;
282 len += leng; 292 len += leng;
283 psiconv_progress(lev+3,off+len, 293 psiconv_progress(config,lev+3,off+len,
284 "Going to read whether this style is built-in"); 294 "Going to read whether this style is built-in");
285 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 295 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
286 if (res) 296 if (res)
287 goto ERROR6; 297 goto ERROR6;
288 298
289 if (temp == PSICONV_ID_STYLE_BUILT_IN) { 299 if (temp == PSICONV_ID_STYLE_BUILT_IN) {
290 style->built_in = psiconv_bool_true; 300 style->built_in = psiconv_bool_true;
291 psiconv_debug(lev+3,off+len,"Built-in style"); 301 psiconv_debug(config,lev+3,off+len,"Built-in style");
292 } else if (temp == PSICONV_ID_STYLE_REMOVABLE) { 302 } else if (temp == PSICONV_ID_STYLE_REMOVABLE) {
293 style->built_in = psiconv_bool_false; 303 style->built_in = psiconv_bool_false;
294 psiconv_debug(lev+3,off+len,"Removable style"); 304 psiconv_debug(config,lev+3,off+len,"Removable style");
295 } else { 305 } else {
296 psiconv_warn(lev+3,off+len, 306 psiconv_warn(config,lev+3,off+len,
297 "Word styles section unknown style id (treated as built-in)"); 307 "Word styles section unknown style id (treated as built-in)");
298 psiconv_debug(lev+3,off+len,"Unknown id: %08x",temp); 308 psiconv_debug(config,lev+3,off+len,"Unknown id: %08x",temp);
299 style->built_in = psiconv_bool_false; 309 style->built_in = psiconv_bool_false;
300 } 310 }
301 len += 4; 311 len += 4;
302 psiconv_progress(lev+3,off+len,"Going to read outline level"); 312 psiconv_progress(config,lev+3,off+len,"Going to read outline level");
303 style->outline_level = psiconv_read_u32(buf,lev+3,off+len,&res); 313 style->outline_level = psiconv_read_u32(config,buf,lev+3,off+len,&res);
304 if (res) 314 if (res)
305 goto ERROR6; 315 goto ERROR6;
306 psiconv_debug(lev+3,off+len,"Outline Level: %08x", style->outline_level); 316 psiconv_debug(config,lev+3,off+len,"Outline Level: %08x", style->outline_level);
307 len += 4; 317 len += 4;
308 psiconv_progress(lev+3,off+len,"Going to read the character codes"); 318 psiconv_progress(config,lev+3,off+len,"Going to read the character codes");
309 if (!(style->character = psiconv_basic_character_layout())) 319 if (!(style->character = psiconv_clone_character_layout((*result)->normal->character)))
310 goto ERROR6; 320 goto ERROR6;
311 if ((res = psiconv_parse_character_layout_list(buf,lev+3,off+len,&leng, 321 if ((res = psiconv_parse_character_layout_list(config,buf,lev+3,off+len,&leng,
312 style->character))) 322 style->character)))
313 goto ERROR7; 323 goto ERROR7;
314 len += leng; 324 len += leng;
315 psiconv_progress(lev+3,off+len,"Going to read the paragraph codes"); 325 psiconv_progress(config,lev+3,off+len,"Going to read the paragraph codes");
316 if (!(style->paragraph = psiconv_basic_paragraph_layout())) 326 if (!(style->paragraph = psiconv_clone_paragraph_layout((*result)->normal->paragraph)))
317 goto ERROR7; 327 goto ERROR7;
318 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+3,off+len,&leng, 328 if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+3,off+len,&leng,
319 style->paragraph))) 329 style->paragraph)))
320 goto ERROR8; 330 goto ERROR8;
321 len += leng; 331 len += leng;
322 } 332 }
323 333
334 psiconv_progress(config,lev+2,off+len,"Reading trailing bytes");
335 for (i = 0; i < psiconv_list_length((*result)->styles); i++) {
336 temp = psiconv_read_u8(config,buf,lev+3,off+len,&res);
337 if (res)
338 goto ERROR4;
339 if (temp != 0xff) {
340 psiconv_warn(config,lev+3,off+len,"Unknown trailing style byte");
341 psiconv_debug(config,lev+3,off+len,"Trailing byte: %02x expected, read %02x",
342 0xff,temp);
343 } else
344 psiconv_debug(config,lev+3,off+len,"Read trailing byte 0xff");
345 len++;
346 }
347
324 if (length) 348 if (length)
325 *length = len; 349 *length = len;
326 350
327 psiconv_progress(lev,off+len-1, 351 psiconv_progress(config,lev,off+len-1,
328 "End of word styles section (total length: %08x)", len); 352 "End of word styles section (total length: %08x)", len);
329 353
330 return res; 354 return res;
331 355
332 356
… …
351ERROR6: 375ERROR6:
352 free(style->name); 376 free(style->name);
353ERROR5: 377ERROR5:
354 for (j = 0; j < i ;j++) { 378 for (j = 0; j < i ;j++) {
355 if (!(style = psiconv_list_get((*result)->styles,j))) { 379 if (!(style = psiconv_list_get((*result)->styles,j))) {
356 psiconv_warn(lev+1,off,"Massive memory corruption"); 380 psiconv_error(config,lev+1,off,"Massive memory corruption");
357 goto ERROR4; 381 goto ERROR4;
358 } 382 }
359 psiconv_free_character_layout(style->character); 383 psiconv_free_character_layout(style->character);
360 psiconv_free_paragraph_layout(style->paragraph); 384 psiconv_free_paragraph_layout(style->paragraph);
361 free(style->name); 385 free(style->name);
… …
365ERROR3: 389ERROR3:
366 psiconv_free_word_style((*result)->normal); 390 psiconv_free_word_style((*result)->normal);
367ERROR2: 391ERROR2:
368 free (*result); 392 free (*result);
369ERROR1: 393ERROR1:
370 psiconv_warn(lev+1,off,"Reading of Word Status Section failed"); 394 psiconv_error(config,lev+1,off,"Reading of Word Status Section failed");
371 if (length) 395 if (length)
372 *length = 0; 396 *length = 0;
373 if (!res) 397 if (!res)
374 return -PSICONV_E_NOMEM; 398 return -PSICONV_E_NOMEM;
375 else 399 else
Legend:
Removed from v.64  
changed lines
  Added in v.184
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26