/[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 217 Revision 233
… …
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())) {
97 psiconv_error(config,lev+1,0,"Out of memory error");
88 res = -PSICONV_E_NOMEM; 98 res = -PSICONV_E_NOMEM;
89 goto ERROR1; 99 goto ERROR1;
90 } 100 }
91 101
92 if (!(basechar=psiconv_basic_character_layout())) { 102 if (!(basechar=psiconv_basic_character_layout())) {
103 psiconv_error(config,lev+1,0,"Out of memory error");
93 res = -PSICONV_E_NOMEM; 104 res = -PSICONV_E_NOMEM;
94 goto ERROR2; 105 goto ERROR2;
95 } 106 }
96 107
97 108
98 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,value->normal->paragraph, 109 if ((res = psiconv_write_paragraph_layout_list(config,buf,lev+1,
110 value->normal->paragraph,
99 basepara))) 111 basepara)))
100 goto ERROR3; 112 goto ERROR3;
101 /* Always generate the font for Normal */ 113 /* Always generate the font for Normal */
102 font = basechar->font; 114 font = basechar->font;
103 basechar->font = NULL; 115 basechar->font = NULL;
104 res = psiconv_write_character_layout_list(config,buf,lev+1,value->normal->character, 116 res = psiconv_write_character_layout_list(config,buf,lev+1,
117 value->normal->character,
105 basechar); 118 basechar);
106 basechar->font = font; 119 basechar->font = font;
107 if (res) 120 if (res)
108 goto ERROR3; 121 goto ERROR3;
122 buflen = psiconv_buffer_length(buf);
109 if ((res = psiconv_unicode_write_char(config,buf,lev+1, 123 if ((res = psiconv_unicode_write_char(config,buf,lev+1,
110 value->normal->hotkey))) 124 value->normal->hotkey)))
111 goto ERROR3; 125 goto ERROR3;
112 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles)))) 126 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++)
127 if ((res = psiconv_write_u8(config,buf,lev+1,0)))
128 goto ERROR3;
129
130 if ((res = psiconv_write_u8(config,buf,lev+1,
131 psiconv_list_length(value->styles))))
113 goto ERROR3; 132 goto ERROR3;
114 133
115 134
116 135
117 for (i = 0; i < psiconv_list_length(value->styles); i++) { 136 for (i = 0; i < psiconv_list_length(value->styles); i++) {
118 if (!(style = psiconv_list_get(value->styles,i))) { 137 if (!(style = psiconv_list_get(value->styles,i))) {
119 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 138 psiconv_error(config,lev,0,"Data structure corruption");
120 res = -PSICONV_E_NOMEM; 139 res = -PSICONV_E_NOMEM;
121 goto ERROR3; 140 goto ERROR3;
122 } 141 }
142 buflen = psiconv_buffer_length(buf);
123 if ((res = psiconv_unicode_write_char(config,buf,lev+1,style->hotkey))) 143 if ((res = psiconv_unicode_write_char(config,buf,lev+1,style->hotkey)))
124 goto ERROR3; 144 goto ERROR3;
145 for (j = psiconv_buffer_length(buf) - buflen; j < 4; j++)
146 if ((res = psiconv_write_u8(config,buf,lev+1,0)))
147 goto ERROR3;
125 } 148 }
126 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles)))) 149 if ((res = psiconv_write_u8(config,buf,lev+1,psiconv_list_length(value->styles))))
127 goto ERROR3; 150 goto ERROR3;
128 for (i = 0; i < psiconv_list_length(value->styles); i++) { 151 for (i = 0; i < psiconv_list_length(value->styles); i++) {
129 if (!(style = psiconv_list_get(value->styles,i))) { 152 if (!(style = psiconv_list_get(value->styles,i))) {
130 psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); 153 psiconv_error(config,lev,0,"Data structure corruption");
131 res = -PSICONV_E_NOMEM; 154 res = -PSICONV_E_NOMEM;
132 goto ERROR3; 155 goto ERROR3;
133 } 156 }
134 if (!style->name) { 157 if (!style->name) {
135 psiconv_error(config,0,psiconv_buffer_length(buf),"Null style name"); 158 psiconv_error(config,lev,0,"Null style name");
136 res = -PSICONV_E_GENERATE; 159 res = -PSICONV_E_GENERATE;
137 goto ERROR3; 160 goto ERROR3;
138 } 161 }
139 if ((res = psiconv_write_string(config,buf,lev+1,style->name))) 162 if ((res = psiconv_write_string(config,buf,lev+1,style->name)))
140 goto ERROR3; 163 goto ERROR3;
… …
159ERROR3: 182ERROR3:
160 psiconv_free_character_layout(basechar); 183 psiconv_free_character_layout(basechar);
161ERROR2: 184ERROR2:
162 psiconv_free_paragraph_layout(basepara); 185 psiconv_free_paragraph_layout(basepara);
163ERROR1: 186ERROR1:
187 if (res)
188 psiconv_error(config,lev,0,"Writing of word styles section failed");
189 else
190 psiconv_progress(config,lev,0,"End of word styles section");
164 return res; 191 return res;
165} 192}
Legend:
Removed from v.217  
changed lines
  Added in v.233
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26