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

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

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

Revision 196 Revision 231
… …
37 int res; 37 int res;
38 38
39 psiconv_progress(config,lev,0,"Writing word status section"); 39 psiconv_progress(config,lev,0,"Writing word status section");
40 40
41 if (!value) { 41 if (!value) {
42 psiconv_error(config,0,psiconv_buffer_length(buf),"Null word status section"); 42 psiconv_error(config,lev,0,"Null word status section");
43 return -PSICONV_E_GENERATE; 43 res = -PSICONV_E_GENERATE;
44 goto ERROR;
44 } 45 }
45 46
46 if ((res = psiconv_write_u8(config,buf,lev+1,0x02))) 47 if ((res = psiconv_write_u8(config,buf,lev+1,0x02)))
47 return res; 48 goto ERROR;
48 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_tabs?0x01:0x00) | 49 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_tabs?0x01:0x00) |
49 (value->show_spaces?0x02:0x00) | 50 (value->show_spaces?0x02:0x00) |
50 (value->show_paragraph_ends?0x04:0x00) | 51 (value->show_paragraph_ends?0x04:0x00) |
51 (value->show_line_breaks?0x08:0x00) | 52 (value->show_line_breaks?0x08:0x00) |
52 (value->show_hard_minus?0x20:0x00) | 53 (value->show_hard_minus?0x20:0x00) |
53 (value->show_hard_space?0x40:0x00)))) 54 (value->show_hard_space?0x40:0x00))))
54 return res; 55 goto ERROR;
55 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_full_pictures?0x01:0x00) | 56 if ((res = psiconv_write_u8(config,buf,lev+1,(value->show_full_pictures?0x01:0x00) |
56 (value->show_full_graphs?0x02:0x00)))) 57 (value->show_full_graphs?0x02:0x00))))
57 return res; 58 goto ERROR;
58 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_top_toolbar))) 59 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_top_toolbar)))
59 return res; 60 goto ERROR;
60 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_side_toolbar))) 61 if ((res = psiconv_write_bool(config,buf,lev+1,value->show_side_toolbar)))
61 return res; 62 goto ERROR;
62 if ((res = psiconv_write_u8(config,buf,lev+1,(value->fit_lines_to_screen?0x08:0x00)))) 63 if ((res = psiconv_write_u8(config,buf,lev+1,(value->fit_lines_to_screen?0x08:0x00))))
63 return res; 64 goto ERROR;
64 if ((res = psiconv_write_u32(config,buf,lev+1,value->cursor_position))) 65 if ((res = psiconv_write_u32(config,buf,lev+1,value->cursor_position)))
66 goto ERROR;
67 if ((res = psiconv_write_u32(config,buf,lev+1,value->display_size)))
68 goto ERROR;
69 psiconv_progress(config,lev,0,"End of word status section");
70 return 0;
71
72ERROR:
73 psiconv_error(config,lev,0,"Writing of word status section failed");
65 return res; 74 return res;
66 return psiconv_write_u32(config,buf,lev+1,value->display_size);
67} 75}
68 76
69int psiconv_write_word_styles_section(const psiconv_config config, 77int psiconv_write_word_styles_section(const psiconv_config config,
70 psiconv_buffer buf, int lev, 78 psiconv_buffer buf, int lev,
71 psiconv_word_styles_section value) 79 psiconv_word_styles_section value)
72{ 80{
73 int res,i; 81 int res,i,j;
74 psiconv_word_style style; 82 psiconv_word_style style;
75 psiconv_paragraph_layout basepara; 83 psiconv_paragraph_layout basepara;
76 psiconv_character_layout basechar; 84 psiconv_character_layout basechar;
77 psiconv_font font; 85 psiconv_font font;
86 psiconv_u32 buflen;
78 87
79 psiconv_progress(config,lev,0,"Writing word styles section"); 88 psiconv_progress(config,lev,0,"Writing word styles section");
80 89
81 if (!value || !value->normal || !value->styles) { 90 if (!value || !value->normal || !value->styles) {
82 psiconv_error(config,0,psiconv_buffer_length(buf),"Null word styles section"); 91 psiconv_error(config,lev,0,"Null word styles section");
83 res = -PSICONV_E_GENERATE; 92 res = -PSICONV_E_GENERATE;
84 goto ERROR1; 93 goto ERROR1;
85 } 94 }
86 95
87 if (!(basepara=psiconv_basic_paragraph_layout())) { 96 if (!(basepara=psiconv_basic_paragraph_layout())) {
… …
93 res = -PSICONV_E_NOMEM; 102 res = -PSICONV_E_NOMEM;
94 goto ERROR2; 103 goto ERROR2;
95 } 104 }
96 105
97 106
98 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,value->normal->paragraph, 107 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,
108 value->normal->paragraph,
99 basepara))) 109 basepara)))
100 goto ERROR3; 110 goto ERROR3;
101 /* Always generate the font for Normal */ 111 /* Always generate the font for Normal */
102 font = basechar->font; 112 font = basechar->font;
103 basechar->font = NULL; 113 basechar->font = NULL;
104 res = psiconv_write_character_layout_list(config,buf,lev+1,value->normal->character, 114 res = psiconv_write_character_layout_list(config,buf,lev+1,
115 value->normal->character,
105 basechar); 116 basechar);
106 basechar->font = font; 117 basechar->font = font;
107 if (res) 118 if (res)
108 goto ERROR3; 119 goto ERROR3;
109 if ((res = psiconv_write_u32(config,buf,lev+1,psiconv_unicode_to_char(config,value->normal->hotkey)))) 120 buflen = psiconv_buffer_length(buf);
121 if ((res = psiconv_unicode_write_char(config,buf,lev+1,
122 value->normal->hotkey)))
110 goto ERROR3; 123 goto ERROR3;
111 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles)))) 124 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++)
125 if ((res = psiconv_write_u8(config,buf,lev+1,0)))
126 goto ERROR3;
127
128 if ((res = psiconv_write_u8(config,buf,lev+1,
129 psiconv_list_length(value->styles))))
112 goto ERROR3; 130 goto ERROR3;
113 131
114 132
115 133
116 for (i = 0; i < psiconv_list_length(value->styles); i++) { 134 for (i = 0; i < psiconv_list_length(value->styles); i++) {
117 if (!(style = psiconv_list_get(value->styles,i))) { 135 if (!(style = psiconv_list_get(value->styles,i))) {
118 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 136 psiconv_error(config,lev,0,"Massive memory corruption");
119 res = -PSICONV_E_NOMEM; 137 res = -PSICONV_E_NOMEM;
120 goto ERROR3; 138 goto ERROR3;
121 } 139 }
122 if ((res = psiconv_write_u32(config,buf,lev+1,psiconv_unicode_to_char(config,style->hotkey)))) 140 buflen = psiconv_buffer_length(buf);
141 if ((res = psiconv_unicode_write_char(config,buf,lev+1,style->hotkey)))
123 goto ERROR3; 142 goto ERROR3;
143 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++)
144 if ((res = psiconv_write_u8(config,buf,lev+1,0)))
145 goto ERROR3;
124 } 146 }
125 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles)))) 147 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles))))
126 goto ERROR3; 148 goto ERROR3;
127 for (i = 0; i < psiconv_list_length(value->styles); i++) { 149 for (i = 0; i < psiconv_list_length(value->styles); i++) {
128 if (!(style = psiconv_list_get(value->styles,i))) { 150 if (!(style = psiconv_list_get(value->styles,i))) {
129 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 151 psiconv_error(config,lev,0,"Massive memory corruption");
130 res = -PSICONV_E_NOMEM; 152 res = -PSICONV_E_NOMEM;
131 goto ERROR3; 153 goto ERROR3;
132 } 154 }
133 if (!style->name) { 155 if (!style->name) {
134 psiconv_error(config,0,psiconv_buffer_length(buf),"Null style name"); 156 psiconv_error(config,lev,0,"Null style name");
135 res = -PSICONV_E_GENERATE; 157 res = -PSICONV_E_GENERATE;
136 goto ERROR3; 158 goto ERROR3;
137 } 159 }
138 if ((res = psiconv_write_string(config,buf,lev+1,style->name))) 160 if ((res = psiconv_write_string(config,buf,lev+1,style->name)))
139 goto ERROR3; 161 goto ERROR3;
… …
158ERROR3: 180ERROR3:
159 psiconv_free_character_layout(basechar); 181 psiconv_free_character_layout(basechar);
160ERROR2: 182ERROR2:
161 psiconv_free_paragraph_layout(basepara); 183 psiconv_free_paragraph_layout(basepara);
162ERROR1: 184ERROR1:
185 if (res)
186 psiconv_error(config,lev,0,"Writing of word styles section failed");
187 else
188 psiconv_progress(config,lev,0,"End of word styles section");
163 return res; 189 return res;
164} 190}
Legend:
Removed from v.196  
changed lines
  Added in v.231
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26