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

Contents of /psiconv/trunk/lib/psiconv/generate_common.c

Parent Directory Parent Directory | Revision Log Revision Log


Revision 231 - (show annotations)
Wed Feb 25 20:57:10 2004 UTC (20 years, 1 month ago) by frodo
File MIME type: text/plain
File size: 22516 byte(s)
(Frodo) Progress information while generating update

Much better progress information now, and better error reporting.

1 /*
2 generate_common.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl>
4
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
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18 */
19
20 #include "config.h"
21 #include "compat.h"
22 #include <stdlib.h>
23 #include <string.h>
24
25 #include "generate_routines.h"
26 #include "error.h"
27
28 #ifdef DMALLOC
29 #include <dmalloc.h>
30 #endif
31
32 static int psiconv_write_layout_section(const psiconv_config config,
33 psiconv_buffer buf, int lev,
34 const psiconv_text_and_layout value,
35 const psiconv_word_styles_section styles,
36 int with_styles);
37
38 /* Maybe use a psiconv_header_section variable instead? */
39 int psiconv_write_header_section(const psiconv_config config,
40 psiconv_buffer buf,int lev,psiconv_u32 uid1,
41 psiconv_u32 uid2, psiconv_u32 uid3)
42 {
43 int res;
44 psiconv_progress(config,lev,0,"Writing header section");
45 if ((res = psiconv_write_u32(config,buf,lev+1,uid1)))
46 goto ERROR;
47 if ((res = psiconv_write_u32(config,buf,lev+1,uid2)))
48 goto ERROR;
49 if ((res = psiconv_write_u32(config,buf,lev+1,uid3)))
50 goto ERROR;
51 if ((res = psiconv_write_u32(config,buf,lev+1,
52 psiconv_checkuid(uid1,uid2,uid3))))
53 goto ERROR;
54 psiconv_progress(config,lev,0,"End of header section");
55 return 0;
56
57 ERROR:
58 psiconv_error(config,lev,0,"Writing of header section failed");
59 return res;
60 }
61
62 int psiconv_write_section_table_section(const psiconv_config config,
63 psiconv_buffer buf,int lev,
64 const psiconv_section_table_section value)
65 {
66 int res,i;
67 psiconv_section_table_entry entry;
68
69 psiconv_progress(config,lev,0,"Writing section table section");
70 if (!value) {
71 psiconv_error(config,lev,0,"Null section table section");
72 res = -PSICONV_E_GENERATE;
73 goto ERROR;
74 }
75
76 if ((res = psiconv_write_u8(config,buf,lev+1,2 * psiconv_list_length(value))))
77 goto ERROR;
78 for (i = 0; i < psiconv_list_length(value); i++) {
79 if (!(entry = psiconv_list_get(value,i))) {
80 psiconv_error(config,lev+1,0,"Massive memory corruption");
81 res = -PSICONV_E_NOMEM;
82 goto ERROR;
83 }
84 if ((res = psiconv_write_u32(config,buf,lev+1,entry->id)))
85 goto ERROR;
86 if ((res = psiconv_write_offset(config,buf,lev+1,entry->offset)))
87 goto ERROR;
88 }
89 psiconv_progress(config,lev,0,"End of section table section");
90 return -PSICONV_E_OK;
91
92 ERROR:
93 psiconv_error(config,lev,0,"Writing of section table section failed");
94 return res;
95 }
96
97 int psiconv_write_application_id_section(const psiconv_config config,
98 psiconv_buffer buf,int lev,psiconv_u32 id,
99 const psiconv_string_t text)
100 {
101 int res;
102 psiconv_progress(config,lev,0,"Writing application id section");
103 if ((res = psiconv_write_u32(config,buf,lev+1,id)))
104 goto ERROR;
105 if ((res = psiconv_write_string(config,buf,lev+1,text)))
106 goto ERROR;
107 psiconv_progress(config,lev,0,"End of application id section");
108 return 0;
109 ERROR:
110 psiconv_error(config,lev,0,"Writing of application id section failed");
111 return res;
112 }
113
114 int psiconv_write_text_section(const psiconv_config config,
115 psiconv_buffer buf,int lev,
116 const psiconv_text_and_layout value)
117 {
118 int res;
119 psiconv_buffer extra_buf = NULL;
120 int i,j;
121 psiconv_paragraph paragraph;
122
123 psiconv_progress(config,lev,0,"Writing text section");
124 if (!value) {
125 psiconv_error(config,lev+1,0,"Null text section");
126 res = -PSICONV_E_GENERATE;
127 goto ERROR;
128 }
129
130 if (psiconv_list_length(value)) {
131 if (!(extra_buf = psiconv_buffer_new())) {
132 res = -PSICONV_E_NOMEM;
133 goto ERROR;
134 }
135 for (i = 0; i < psiconv_list_length(value); i++) {
136 if (!(paragraph = psiconv_list_get(value,i))) {
137 psiconv_error(config,lev+1,0,"Massive memory corruption");
138 res = -PSICONV_E_NOMEM;
139 goto ERROR;
140 }
141 for (j = 0; j < psiconv_unicode_strlen(paragraph->text); j++)
142 if ((res = psiconv_unicode_write_char(config,extra_buf,lev+1,
143 paragraph->text[j])))
144 goto ERROR;
145 psiconv_unicode_write_char(config,extra_buf,lev+1,0x06);
146 }
147 if ((res = psiconv_write_X(config,buf,lev+1,psiconv_buffer_length(extra_buf))))
148 goto ERROR;
149 res = psiconv_buffer_concat(buf,extra_buf);
150 } else
151 /* Hack: empty text sections are just not allowed */
152 if ((res = psiconv_write_u16(config,buf,lev+1,0x0602)))
153 goto ERROR;
154
155 psiconv_progress(config,lev,0,"End of text section");
156 return 0;
157
158 ERROR:
159 if (extra_buf)
160 psiconv_buffer_free(extra_buf);
161 psiconv_error(config,lev,0,"Writing of text section failed");
162 return res;
163 }
164
165 int psiconv_write_layout_section(const psiconv_config config,
166 psiconv_buffer buf,int lev,
167 const psiconv_text_and_layout value,
168 const psiconv_word_styles_section styles,
169 int with_styles)
170 {
171 typedef struct psiconv_paragraph_type_list_s
172 {
173 psiconv_character_layout character;
174 psiconv_paragraph_layout paragraph;
175 psiconv_u8 style;
176 psiconv_u8 nr;
177 } *psiconv_paragraph_type_list;
178 psiconv_u32 obj_id;
179 psiconv_list paragraph_type_list; /* Of psiconv_paragraph_type_list_s */
180 psiconv_paragraph_type_list paragraph_type;
181 struct psiconv_paragraph_type_list_s new_type;
182 psiconv_buffer buf_types,buf_elements,buf_inlines,buf_objects;
183 psiconv_paragraph paragraph;
184 psiconv_in_line_layout in_line = NULL;
185 psiconv_word_style style;
186 psiconv_character_layout para_charlayout;
187 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen;
188
189 psiconv_progress(config,lev,0,"Writing layout section");
190 if (!value) {
191 psiconv_error(config,lev,0,"Null text section");
192 res = -PSICONV_E_GENERATE;
193 goto ERROR1;
194 }
195
196 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) {
197 res = -PSICONV_E_NOMEM;
198 goto ERROR1;
199 }
200
201 if (!(buf_types = psiconv_buffer_new())) {
202 res = -PSICONV_E_NOMEM;
203 goto ERROR2;
204 }
205
206 if (!(buf_elements = psiconv_buffer_new())) {
207 res = -PSICONV_E_NOMEM;
208 goto ERROR3;
209 }
210
211 if (!(buf_inlines = psiconv_buffer_new())) {
212 res = -PSICONV_E_NOMEM;
213 goto ERROR4;
214 }
215
216 if (!(buf_objects = psiconv_buffer_new())) {
217 res = -PSICONV_E_NOMEM;
218 goto ERROR5;
219 }
220
221 for (i = 0; i < psiconv_list_length(value); i++) {
222 if (!(paragraph = psiconv_list_get(value,i))) {
223 psiconv_error(config,lev+1,0,"Massive memory corruption");
224 res = -PSICONV_E_NOMEM;
225 goto ERROR6;
226 }
227 if ((res = psiconv_write_u32(config,buf_elements,lev+1,
228 psiconv_unicode_strlen(paragraph->text)+1)))
229 goto ERROR6;
230
231 /* We need it for the next if-statement */
232 if (psiconv_list_length(paragraph->in_lines) == 1)
233 if (!(in_line = psiconv_list_get(paragraph->in_lines,1)))
234 goto ERROR6;
235
236 if ((psiconv_list_length(paragraph->in_lines) > 1) ||
237 ((psiconv_list_length(paragraph->in_lines) == 1) &&
238 (in_line->object != NULL))) {
239 /* Inline layouts, or an object, so we generate a paragraph element
240 and inline elements */
241 if ((res = psiconv_write_u8(config,buf_elements,lev+1,0x00)))
242 goto ERROR6;
243 if (!(style = psiconv_get_style(styles,paragraph->base_style))) {
244 psiconv_error(config,lev+1,0,"Unknown style");
245 res = -PSICONV_E_GENERATE;
246 goto ERROR6;
247 }
248 if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,lev+1,
249 paragraph->base_paragraph,
250 style->paragraph)))
251 goto ERROR6;
252 if (with_styles)
253 if ((res = psiconv_write_u8(config,buf_elements,lev+1,paragraph->base_style)))
254 goto ERROR6;
255 if ((res = psiconv_write_u32(config,buf_elements,lev+1,
256 psiconv_list_length(paragraph->in_lines))))
257 goto ERROR6;
258
259 /* Generate the inlines. NB: Against what are all settings relative?!? */
260 paralen = 0;
261 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) {
262 nr_of_inlines ++;
263 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) {
264 psiconv_error(config,lev,0,"Massive memory corruption");
265 res = -PSICONV_E_NOMEM;
266 goto ERROR6;
267 }
268 if ((res = psiconv_write_u8(config,buf_inlines,lev+1,in_line->object?0x01:0x00)))
269 goto ERROR6;
270 thislen = in_line->length;
271 paralen += thislen;
272 /* If this is the last in_line, we need to make sure that the
273 complete length of all inlines equals the text length */
274 if (j == psiconv_list_length(paragraph->in_lines)-1) {
275 if (paralen > psiconv_unicode_strlen(paragraph->text)+1) {
276 res = -PSICONV_E_GENERATE;
277 goto ERROR6;
278 }
279 thislen += psiconv_unicode_strlen(paragraph->text)+1-paralen;
280 }
281 if ((res = psiconv_write_u32(config,buf_inlines,lev+1,thislen)))
282 goto ERROR6;
283 if ((res = psiconv_write_character_layout_list(config,buf_inlines,lev+1,
284 in_line->layout,
285 style->character)))
286 goto ERROR6;
287 if (in_line->object) {
288 if ((res = psiconv_write_u32(config,buf_inlines,lev+1,PSICONV_ID_OBJECT)))
289 goto ERROR6;
290 obj_id = psiconv_buffer_unique_id();
291 if ((res = psiconv_buffer_add_reference(buf_inlines,obj_id)))
292 goto ERROR6;
293 if ((res = psiconv_buffer_add_target(buf_objects,obj_id)))
294 goto ERROR6;
295 if ((res = psiconv_write_embedded_object_section(config,buf_objects,lev+1,
296 in_line->object)))
297 goto ERROR6;
298 if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_width)))
299 goto ERROR6;
300 if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_height)))
301 goto ERROR6;
302 }
303 }
304 } else {
305 /* No inline layouts (or only 1), so we generate a paragraph type list */
306 para_type = 0;
307 /* Set para_charlayout to the correct character-level layout */
308 if (psiconv_list_length(paragraph->in_lines) == 0)
309 para_charlayout = paragraph->base_character;
310 else {
311 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) {
312 psiconv_error(config,lev,0,"Massive memory corruption");
313 res = -PSICONV_E_NOMEM;
314 goto ERROR6;
315 }
316 para_charlayout = in_line->layout;
317 }
318 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) {
319 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) {
320 psiconv_error(config,lev,0,"Massive memory corruption");
321 res = -PSICONV_E_NOMEM;
322 goto ERROR6;
323 }
324 if ((paragraph->base_style == paragraph_type->style) &&
325 !psiconv_compare_character_layout(para_charlayout,
326 paragraph_type->character) &&
327 !psiconv_compare_paragraph_layout(paragraph->base_paragraph,
328 paragraph_type->paragraph)) {
329 para_type = paragraph_type->nr;
330 break;
331 }
332 }
333 if (!para_type) {
334 /* We need to add a new entry */
335 para_type = new_type.nr = j+1;
336 /* No need to copy them, we won't change them anyway */
337 new_type.paragraph = paragraph->base_paragraph;
338 new_type.character = para_charlayout;
339 new_type.style = paragraph->base_style;
340 paragraph_type = &new_type;
341 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type)))
342 goto ERROR6;
343 if ((res = psiconv_write_u32(config,buf_types,lev+1,paragraph_type->nr)))
344 goto ERROR6;
345 if (!(style = psiconv_get_style(styles,paragraph_type->style))) {
346 psiconv_error(config,lev,0,"Unknown style");
347 res = -PSICONV_E_GENERATE;
348 goto ERROR6;
349 }
350 if ((res = psiconv_write_paragraph_layout_list(config,buf_types,lev+1,
351 paragraph_type->paragraph,style->paragraph)))
352 goto ERROR6;
353 if (with_styles)
354 if ((res = psiconv_write_u8(config,buf_types,lev+1,paragraph_type->style)))
355 goto ERROR6;
356 if ((res = psiconv_write_character_layout_list(config,buf_types,lev+1,
357 paragraph_type->character,style->character)))
358 goto ERROR6;
359 }
360 if ((res = psiconv_write_u8(config,buf_elements,lev+1,para_type)))
361 goto ERROR6;
362 }
363 }
364
365 /* HACK: special case: no paragraphs at all. We need to improvize. */
366 if (!psiconv_list_length(value)) {
367 if ((res = psiconv_write_u32(config,buf_types,lev+1,1)))
368 goto ERROR6;
369 if ((res = psiconv_write_u32(config,buf_types,lev+1,0)))
370 goto ERROR6;
371 if (with_styles)
372 if ((res = psiconv_write_u8(config,buf_types,lev+1,0)))
373 goto ERROR6;
374 if ((res = psiconv_write_u32(config,buf_types,lev+1,0)))
375 goto ERROR6;
376
377 if ((res = psiconv_write_u32(config,buf_elements,lev+1,1)))
378 goto ERROR6;
379 if ((res = psiconv_write_u8(config,buf_elements,lev+1,1)))
380 goto ERROR6;
381 pel_length = 1;
382 ptl_length = 1;
383 } else {
384 pel_length = psiconv_list_length(value);
385 ptl_length = psiconv_list_length(paragraph_type_list);
386 }
387
388 /* Now append everything */
389 if ((res = psiconv_write_u16(config,buf,lev+1,with_styles?0x0001:0x0000)))
390 goto ERROR6;
391 if ((res = psiconv_write_u8(config,buf,lev+1, ptl_length)))
392 goto ERROR6;
393 if ((res = psiconv_buffer_concat(buf,buf_types)))
394 goto ERROR6;
395 if ((res = psiconv_write_u32(config,buf,lev+1,pel_length)))
396 goto ERROR6;
397 if ((res = psiconv_buffer_concat(buf,buf_elements)))
398 goto ERROR6;
399 if ((res = psiconv_write_u32(config,buf,lev+1,nr_of_inlines)))
400 goto ERROR6;
401 if ((res = psiconv_buffer_concat(buf,buf_inlines)))
402 goto ERROR6;
403 if ((res = psiconv_buffer_concat(buf,buf_objects)))
404 goto ERROR6;
405
406 ERROR6:
407 psiconv_buffer_free(buf_objects);
408 ERROR5:
409 psiconv_buffer_free(buf_inlines);
410 ERROR4:
411 psiconv_buffer_free(buf_elements);
412 ERROR3:
413 psiconv_buffer_free(buf_types);
414 ERROR2:
415 psiconv_list_free(paragraph_type_list);
416 ERROR1:
417 if (res)
418 psiconv_error(config,lev,0,"Writing of layout section failed");
419 else
420 psiconv_progress(config,lev,0,"End of layout section");
421 return res;
422 }
423
424 int psiconv_write_styled_layout_section(const psiconv_config config,
425 psiconv_buffer buf,int lev,
426 psiconv_text_and_layout result,
427 psiconv_word_styles_section styles)
428 {
429 int res;
430
431 psiconv_progress(config,lev,0,"Writing styled layout section");
432 res = psiconv_write_layout_section(config,buf,lev+1,result,styles,1);
433 if (res)
434 psiconv_error(config,lev,0,"Writing of styles layout section failed");
435 else
436 psiconv_progress(config,lev,0,"End of styled layout section");
437 return res;
438 }
439
440 int psiconv_write_styleless_layout_section(const psiconv_config config,
441 psiconv_buffer buf,int lev,
442 const psiconv_text_and_layout value,
443 const psiconv_character_layout base_char,
444 const psiconv_paragraph_layout base_para)
445 {
446 int res = 0;
447 psiconv_word_styles_section styles_section;
448
449 psiconv_progress(config,lev,0,"Writing styleless layout section");
450 if (!(styles_section = malloc(sizeof(*styles_section))))
451 goto ERROR1;
452 if (!(styles_section->normal = malloc(sizeof(*styles_section->normal))))
453 goto ERROR2;
454 if (!(styles_section->normal->character =
455 psiconv_clone_character_layout(base_char)))
456 goto ERROR3;
457 if (!(styles_section->normal->paragraph =
458 psiconv_clone_paragraph_layout(base_para)))
459 goto ERROR4;
460 styles_section->normal->hotkey = 0;
461 if (!(styles_section->normal->name = psiconv_unicode_empty_string()))
462 goto ERROR5;
463 if (!(styles_section->styles = psiconv_list_new(sizeof(
464 struct psiconv_word_style_s))))
465 goto ERROR6;
466
467 res = psiconv_write_layout_section(config,buf,lev+1,value,styles_section,0);
468 psiconv_free_word_styles_section(styles_section);
469 psiconv_progress(config,lev,0,"End of styleless layout section");
470 return res;
471
472 ERROR6:
473 free(styles_section->normal->name);
474 ERROR5:
475 psiconv_free_paragraph_layout(styles_section->normal->paragraph);
476 ERROR4:
477 psiconv_free_character_layout(styles_section->normal->character);
478 ERROR3:
479 free(styles_section->normal);
480 ERROR2:
481 free(styles_section);
482 ERROR1:
483 psiconv_error(config,lev,0,"Writing of styleless layout section failed");
484 if (!res)
485 return -PSICONV_E_NOMEM;
486 else
487 return res;
488 }
489
490
491 int psiconv_write_embedded_object_section(const psiconv_config config,
492 psiconv_buffer buf,int lev,
493 const psiconv_embedded_object_section value)
494 {
495 int res;
496 psiconv_u32 display_id,icon_id,table_id;
497 psiconv_buffer extra_buf;
498
499 psiconv_progress(config,lev,0,"Writing embedded object section");
500 if (!value) {
501 psiconv_error(config,lev,0,"Null Object");
502 res = -PSICONV_E_GENERATE;
503 goto ERROR1;
504 }
505
506 if (!(extra_buf = psiconv_buffer_new())) {
507 res = -PSICONV_E_NOMEM;
508 goto ERROR1;
509 }
510
511 display_id = psiconv_buffer_unique_id();
512 icon_id = psiconv_buffer_unique_id();
513 table_id = psiconv_buffer_unique_id();
514 if ((res = psiconv_write_u8(config,buf,lev+1,0x06)))
515 goto ERROR2;
516 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_DISPLAY_SECTION)))
517 goto ERROR2;
518 if ((res = psiconv_buffer_add_reference(buf,display_id)))
519 goto ERROR2;
520 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_ICON_SECTION)))
521 goto ERROR2;
522 if ((res = psiconv_buffer_add_reference(buf,icon_id)))
523 goto ERROR2;
524 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION)))
525 goto ERROR2;
526 if ((res = psiconv_buffer_add_reference(buf,table_id)))
527 goto ERROR2;
528
529 if ((res = psiconv_buffer_add_target(buf,display_id)))
530 goto ERROR2;
531 if ((res = psiconv_write_object_display_section(config,buf,lev+1,value->display)))
532 goto ERROR2;
533 if ((res = psiconv_buffer_add_target(buf,icon_id)))
534 goto ERROR2;
535 if ((res = psiconv_write_object_icon_section(config,buf,lev+1,value->icon)))
536 goto ERROR2;
537 if ((res = psiconv_buffer_add_target(buf,table_id)))
538 goto ERROR2;
539 switch(value->object->type) {
540 case psiconv_word_file:
541 if ((res = psiconv_write_word_file(config,extra_buf,lev+1,
542 (psiconv_word_f) value->object->file)))
543 goto ERROR2;
544 break;
545 case psiconv_sketch_file:
546 if ((res = psiconv_write_sketch_file(config,extra_buf,lev+1,
547 (psiconv_sketch_f) value->object->file)))
548 goto ERROR2;
549 break;
550 /*
551 case psiconv_sheet_file:
552 if ((res = psiconv_write_sheet_file(config,extra_buf,lev+1,
553 (psiconv_sheet_f) value->object->file)))
554 goto ERROR2;
555 break;
556 */
557 default:
558 psiconv_error(config,lev,0,"Unknown or unsupported object type");
559 res = -PSICONV_E_GENERATE;
560 goto ERROR2;
561 }
562
563 if ((res = psiconv_buffer_resolve(extra_buf)))
564 goto ERROR2;
565 if ((res = psiconv_buffer_concat(buf,extra_buf)))
566 goto ERROR2;
567 psiconv_buffer_free(extra_buf);
568
569 psiconv_progress(config,lev,0,"End of embedded object section");
570 return 0;
571
572 ERROR2:
573 psiconv_buffer_free(extra_buf);
574 ERROR1:
575 psiconv_error(config,lev,0,"Writing of embedded object section failed");
576 return res;
577 }
578
579
580 int psiconv_write_object_display_section(const psiconv_config config,
581 psiconv_buffer buf,int lev,
582 const psiconv_object_display_section value)
583 {
584 int res;
585
586 psiconv_progress(config,lev,0,"Writing object display section");
587
588 if (!value) {
589 psiconv_error(config,lev,0,"Null Object Display Section");
590 res = -PSICONV_E_GENERATE;
591 goto ERROR1;
592 }
593
594 if ((res = psiconv_write_u8(config,buf,lev+1,value->show_icon?0x00:0x01)))
595 goto ERROR1;
596 if ((res = psiconv_write_length(config,buf,lev+1,value->width)))
597 goto ERROR1;
598 if ((res = psiconv_write_length(config,buf,lev+1,value->height)))
599 goto ERROR1;
600 if ((res = psiconv_write_u32(config,buf,lev+1,0x00000000)))
601 goto ERROR1;
602
603 psiconv_progress(config,lev,0,"End of object display section");
604
605 return 0;
606
607 ERROR1:
608 psiconv_error(config,lev,0,"Writing of object display section failed");
609 return res;
610 }
611
612 int psiconv_write_object_icon_section(const psiconv_config config,
613 psiconv_buffer buf,int lev,
614 const psiconv_object_icon_section value)
615 {
616 int res;
617
618 psiconv_progress(config,lev,0,"Writing object icon section");
619
620 if (!value) {
621 psiconv_error(config,lev,0,"Null Object Icon Section");
622 res = -PSICONV_E_GENERATE;
623 goto ERROR1;
624 }
625
626 if ((res = psiconv_write_string(config,buf,lev+1,value->icon_name)))
627 goto ERROR1;
628 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_width)))
629 goto ERROR1;
630 if ((res = psiconv_write_length(config,buf,lev+1,value->icon_height)))
631 goto ERROR1;
632
633 psiconv_progress(config,lev,0,"End of object icon section");
634 return 0;
635
636 ERROR1:
637 psiconv_error(config,lev,0,"Writing of object icon section failed");
638 return res;
639 }

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