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

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

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

Revision 89 Revision 170
… …
23#include <string.h> 23#include <string.h>
24 24
25#include "generate_routines.h" 25#include "generate_routines.h"
26#include "error.h" 26#include "error.h"
27 27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
31
28static int psiconv_write_layout_section(psiconv_buffer buf, 32static int psiconv_write_layout_section(const psiconv_config config,
33 psiconv_buffer buf,
29 const psiconv_text_and_layout value, 34 const psiconv_text_and_layout value,
30 const psiconv_word_styles_section styles, 35 const psiconv_word_styles_section styles,
31 int with_styles); 36 int with_styles);
32 37
33/* Maybe use a psiconv_header_section variable instead? */ 38/* Maybe use a psiconv_header_section variable instead? */
34int psiconv_write_header_section(psiconv_buffer buf,psiconv_u32 uid1, 39int psiconv_write_header_section(const psiconv_config config,
40 psiconv_buffer buf,psiconv_u32 uid1,
35 psiconv_u32 uid2, psiconv_u32 uid3) 41 psiconv_u32 uid2, psiconv_u32 uid3)
36{ 42{
37 int res; 43 int res;
38 if ((res = psiconv_write_u32(buf,uid1))) 44 if ((res = psiconv_write_u32(config,buf,uid1)))
39 return res; 45 return res;
40 if ((res = psiconv_write_u32(buf,uid2))) 46 if ((res = psiconv_write_u32(config,buf,uid2)))
41 return res; 47 return res;
42 if ((res = psiconv_write_u32(buf,uid3))) 48 if ((res = psiconv_write_u32(config,buf,uid3)))
43 return res; 49 return res;
44 return psiconv_write_u32(buf,psiconv_checkuid(uid1,uid2,uid3)); 50 return psiconv_write_u32(config,buf,psiconv_checkuid(uid1,uid2,uid3));
45} 51}
46 52
47int psiconv_write_section_table_section(psiconv_buffer buf, 53int psiconv_write_section_table_section(const psiconv_config config,
54 psiconv_buffer buf,
48 const psiconv_section_table_section value) 55 const psiconv_section_table_section value)
49{ 56{
50 int res,i; 57 int res,i;
51 psiconv_section_table_entry entry; 58 psiconv_section_table_entry entry;
52 59
53 if (!value) { 60 if (!value) {
54 psiconv_warn(0,psiconv_buffer_length(buf),"Null section table section"); 61 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null section table section");
55 return -PSICONV_E_GENERATE; 62 return -PSICONV_E_GENERATE;
56 } 63 }
57 64
58 if ((res = psiconv_write_u8(buf,2 * psiconv_list_length(value)))) 65 if ((res = psiconv_write_u8(config,buf,2 * psiconv_list_length(value))))
59 return res; 66 return res;
60 for (i = 0; i < psiconv_list_length(value); i++) { 67 for (i = 0; i < psiconv_list_length(value); i++) {
61 if (!(entry = psiconv_list_get(value,i))) { 68 if (!(entry = psiconv_list_get(value,i))) {
62 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 69 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
63 return -PSICONV_E_NOMEM; 70 return -PSICONV_E_NOMEM;
64 } 71 }
65 if ((res = psiconv_write_u32(buf,entry->id))) 72 if ((res = psiconv_write_u32(config,buf,entry->id)))
66 return res; 73 return res;
67 if ((res = psiconv_write_offset(buf,entry->offset))) 74 if ((res = psiconv_write_offset(config,buf,entry->offset)))
68 return res; 75 return res;
69 } 76 }
70 return -PSICONV_E_OK; 77 return -PSICONV_E_OK;
71} 78}
72 79
73int psiconv_write_application_id_section(psiconv_buffer buf,psiconv_u32 id, 80int psiconv_write_application_id_section(const psiconv_config config,
81 psiconv_buffer buf,psiconv_u32 id,
74 const psiconv_string_t text) 82 const psiconv_string_t text)
75{ 83{
76 int res; 84 int res;
77 if ((res = psiconv_write_u32(buf,id))) 85 if ((res = psiconv_write_u32(config,buf,id)))
78 return res; 86 return res;
79 return psiconv_write_string(buf,text); 87 return psiconv_write_string(config,buf,text);
80} 88}
81 89
82int psiconv_write_text_section(psiconv_buffer buf, 90int psiconv_write_text_section(const psiconv_config config,
91 psiconv_buffer buf,
83 const psiconv_text_and_layout value) 92 const psiconv_text_and_layout value)
84{ 93{
85 int res; 94 int res;
86 psiconv_buffer extra_buf; 95 psiconv_buffer extra_buf;
87 int i,j; 96 int i,j;
88 psiconv_paragraph paragraph; 97 psiconv_paragraph paragraph;
89 98
90 if (!value) { 99 if (!value) {
91 psiconv_warn(0,psiconv_buffer_length(buf),"Null text section"); 100 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null text section");
92 return -PSICONV_E_GENERATE; 101 return -PSICONV_E_GENERATE;
93 } 102 }
94 103
95 if (psiconv_list_length(value)) { 104 if (psiconv_list_length(value)) {
96 if (!(extra_buf = psiconv_buffer_new())) 105 if (!(extra_buf = psiconv_buffer_new()))
97 return -PSICONV_E_NOMEM; 106 return -PSICONV_E_NOMEM;
98 for (i = 0; i < psiconv_list_length(value); i++) { 107 for (i = 0; i < psiconv_list_length(value); i++) {
99 if (!(paragraph = psiconv_list_get(value,i))) { 108 if (!(paragraph = psiconv_list_get(value,i))) {
100 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 109 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
101 res = -PSICONV_E_OTHER; 110 res = -PSICONV_E_OTHER;
102 goto ERROR; 111 goto ERROR;
103 } 112 }
104 for (j = 0; j < strlen(paragraph->text); j++) 113 for (j = 0; j < strlen(paragraph->text); j++)
105 if ((res = psiconv_write_u8(extra_buf,paragraph->text[j]))) 114 if ((res = psiconv_write_u8(config,extra_buf,paragraph->text[j])))
106 goto ERROR; 115 goto ERROR;
107 psiconv_write_u8(extra_buf,0x06); 116 psiconv_write_u8(config,extra_buf,0x06);
108 } 117 }
109 if ((res = psiconv_write_X(buf,psiconv_buffer_length(extra_buf)))) 118 if ((res = psiconv_write_X(config,buf,psiconv_buffer_length(extra_buf))))
110 goto ERROR; 119 goto ERROR;
111 res = psiconv_buffer_concat(buf,extra_buf); 120 res = psiconv_buffer_concat(buf,extra_buf);
112 } else 121 } else
113 /* Hack: empty text sections are just not allowed */ 122 /* Hack: empty text sections are just not allowed */
114 return psiconv_write_u16(buf,0x0602); 123 return psiconv_write_u16(config,buf,0x0602);
115 124
116ERROR: 125ERROR:
117 psiconv_buffer_free(extra_buf); 126 psiconv_buffer_free(extra_buf);
118 return res; 127 return res;
119} 128}
120 129
121int psiconv_write_layout_section(psiconv_buffer buf, 130int psiconv_write_layout_section(const psiconv_config config,
131 psiconv_buffer buf,
122 const psiconv_text_and_layout value, 132 const psiconv_text_and_layout value,
123 const psiconv_word_styles_section styles, 133 const psiconv_word_styles_section styles,
124 int with_styles) 134 int with_styles)
125{ 135{
126 typedef struct psiconv_paragraph_type_list_s 136 typedef struct psiconv_paragraph_type_list_s
… …
128 psiconv_character_layout character; 138 psiconv_character_layout character;
129 psiconv_paragraph_layout paragraph; 139 psiconv_paragraph_layout paragraph;
130 psiconv_u8 style; 140 psiconv_u8 style;
131 psiconv_u8 nr; 141 psiconv_u8 nr;
132 } *psiconv_paragraph_type_list; 142 } *psiconv_paragraph_type_list;
143 psiconv_u32 obj_id;
133 psiconv_list paragraph_type_list; /* Of psiconv_paragraph_type_list_s */ 144 psiconv_list paragraph_type_list; /* Of psiconv_paragraph_type_list_s */
134 psiconv_paragraph_type_list paragraph_type; 145 psiconv_paragraph_type_list paragraph_type;
135 struct psiconv_paragraph_type_list_s new_type; 146 struct psiconv_paragraph_type_list_s new_type;
136 psiconv_buffer buf_types,buf_elements,buf_inlines; 147 psiconv_buffer buf_types,buf_elements,buf_inlines,buf_objects;
137 psiconv_paragraph paragraph; 148 psiconv_paragraph paragraph;
138 psiconv_in_line_layout in_line; 149 psiconv_in_line_layout in_line = NULL;
139 psiconv_word_style style; 150 psiconv_word_style style;
140 psiconv_character_layout para_charlayout; 151 psiconv_character_layout para_charlayout;
141 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen; 152 int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen;
142 153
143 if (!value) { 154 if (!value) {
144 psiconv_warn(0,psiconv_buffer_length(buf),"Null text section"); 155 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null text section");
145 return -PSICONV_E_GENERATE; 156 return -PSICONV_E_GENERATE;
146 } 157 }
147 158
148 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) { 159 if (!(paragraph_type_list = psiconv_list_new(sizeof(new_type)))) {
149 res = -PSICONV_E_NOMEM; 160 res = -PSICONV_E_NOMEM;
… …
163 if (!(buf_inlines = psiconv_buffer_new())) { 174 if (!(buf_inlines = psiconv_buffer_new())) {
164 res = -PSICONV_E_NOMEM; 175 res = -PSICONV_E_NOMEM;
165 goto ERROR4; 176 goto ERROR4;
166 } 177 }
167 178
179 if (!(buf_objects = psiconv_buffer_new())) {
180 res = -PSICONV_E_NOMEM;
181 goto ERROR5;
182 }
183
168 for (i = 0; i < psiconv_list_length(value); i++) { 184 for (i = 0; i < psiconv_list_length(value); i++) {
169 if (!(paragraph = psiconv_list_get(value,i))) { 185 if (!(paragraph = psiconv_list_get(value,i))) {
170 psiconv_warn(0,psiconv_buffer_length(buf),"Massive memory corruption"); 186 psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption");
171 res = -PSICONV_E_OTHER; 187 res = -PSICONV_E_OTHER;
172 goto ERROR5; 188 goto ERROR6;
173 } 189 }
174 if ((res = psiconv_write_u32(buf_elements,strlen(paragraph->text)+1))) 190 if ((res = psiconv_write_u32(config,buf_elements,strlen(paragraph->text)+1)))
175 goto ERROR5; 191 goto ERROR6;
176 192
193 /* We need it for the next if-statement */
194 if (psiconv_list_length(paragraph->in_lines) == 1)
195 if (!(in_line = psiconv_list_get(paragraph->in_lines,1)))
196 goto ERROR6;
197
177 if (psiconv_list_length(paragraph->in_lines) > 1) { 198 if ((psiconv_list_length(paragraph->in_lines) > 1) ||
199 ((psiconv_list_length(paragraph->in_lines) == 1) &&
200 (in_line->object != NULL))) {
178 /* Inline layouts, so we generate a paragraph element and inline 201 /* Inline layouts, or an object, so we generate a paragraph element
179 elements */ 202 and inline elements */
180 if ((res = psiconv_write_u8(buf_elements,0x00))) 203 if ((res = psiconv_write_u8(config,buf_elements,0x00)))
181 goto ERROR5; 204 goto ERROR6;
182 if (!(style = psiconv_get_style(styles,paragraph->base_style))) { 205 if (!(style = psiconv_get_style(styles,paragraph->base_style))) {
183 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 206 psiconv_warn(config,0,psiconv_buffer_length(buf),"Unknown style");
184 res = -PSICONV_E_GENERATE; 207 res = -PSICONV_E_GENERATE;
185 goto ERROR5; 208 goto ERROR6;
186 } 209 }
187 if ((res = psiconv_write_paragraph_layout_list(buf_elements, 210 if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,
188 paragraph->base_paragraph, 211 paragraph->base_paragraph,
189 style->paragraph))) 212 style->paragraph)))
190 goto ERROR5; 213 goto ERROR6;
191 if (with_styles) 214 if (with_styles)
192 if ((res = psiconv_write_u8(buf_elements,paragraph->base_style))) 215 if ((res = psiconv_write_u8(config,buf_elements,paragraph->base_style)))
193 goto ERROR5; 216 goto ERROR6;
194 if ((res = psiconv_write_u32(buf_elements, 217 if ((res = psiconv_write_u32(config,buf_elements,
195 psiconv_list_length(paragraph->in_lines)))) 218 psiconv_list_length(paragraph->in_lines))))
196 goto ERROR5; 219 goto ERROR6;
197 220
198 /* Generate the inlines. NB: Against what are all settings relative?!? */ 221 /* Generate the inlines. NB: Against what are all settings relative?!? */
199 paralen = 0; 222 paralen = 0;
200 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) { 223 for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) {
201 nr_of_inlines ++; 224 nr_of_inlines ++;
202 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) { 225 if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) {
203 psiconv_warn(0,psiconv_buffer_length(buf), 226 psiconv_warn(config,0,psiconv_buffer_length(buf),
204 "Massive memory corruption"); 227 "Massive memory corruption");
205 res = -PSICONV_E_OTHER; 228 res = -PSICONV_E_OTHER;
206 goto ERROR5; 229 goto ERROR6;
207 } 230 }
208 if ((res = psiconv_write_u8(buf_inlines,0x00))) 231 if ((res = psiconv_write_u8(config,buf_inlines,in_line->object?0x01:0x00)))
209 goto ERROR5; 232 goto ERROR6;
210 thislen = in_line->length; 233 thislen = in_line->length;
211 paralen += thislen; 234 paralen += thislen;
212 /* If this is the last in_line, we need to make sure that the 235 /* If this is the last in_line, we need to make sure that the
213 complete length of all inlines equals the text length */ 236 complete length of all inlines equals the text length */
214 if (j == psiconv_list_length(paragraph->in_lines)-1) { 237 if (j == psiconv_list_length(paragraph->in_lines)-1) {
215 if (paralen > strlen(paragraph->text)+1) { 238 if (paralen > strlen(paragraph->text)+1) {
216 res = -PSICONV_E_GENERATE; 239 res = -PSICONV_E_GENERATE;
217 goto ERROR5; 240 goto ERROR6;
218 } 241 }
219 thislen += strlen(paragraph->text)+1-paralen; 242 thislen += strlen(paragraph->text)+1-paralen;
220 } 243 }
221 if ((res = psiconv_write_u32(buf_inlines,thislen))) 244 if ((res = psiconv_write_u32(config,buf_inlines,thislen)))
222 goto ERROR5; 245 goto ERROR6;
223 if ((res = psiconv_write_character_layout_list(buf_inlines, 246 if ((res = psiconv_write_character_layout_list(config,buf_inlines,
224 in_line->layout, 247 in_line->layout,
225 style->character))) 248 style->character)))
226 goto ERROR5; 249 goto ERROR6;
250 if (in_line->object) {
251 if ((res = psiconv_write_u32(config,buf_inlines,PSICONV_ID_OBJECT)))
252 goto ERROR6;
253 obj_id = psiconv_buffer_unique_id();
254 if ((res = psiconv_buffer_add_reference(buf_inlines,obj_id)))
255 goto ERROR6;
256 if ((res = psiconv_buffer_add_target(buf_objects,obj_id)))
257 goto ERROR6;
258 if ((res = psiconv_write_embedded_object_section(config,buf_objects,
259 in_line->object)))
260 goto ERROR6;
261 if ((res = psiconv_write_length(config,buf_inlines,in_line->object_width)))
262 goto ERROR6;
263 if ((res = psiconv_write_length(config,buf_inlines,in_line->object_height)))
264 goto ERROR6;
265 }
227 } 266 }
228 } else { 267 } else {
229 /* No inline layouts (or only 1), so we generate a paragraph type list */ 268 /* No inline layouts (or only 1), so we generate a paragraph type list */
230 para_type = 0; 269 para_type = 0;
231 /* Set para_charlayout to the correct character-level layout */ 270 /* Set para_charlayout to the correct character-level layout */
232 if (psiconv_list_length(paragraph->in_lines) == 0) 271 if (psiconv_list_length(paragraph->in_lines) == 0)
233 para_charlayout = paragraph->base_character; 272 para_charlayout = paragraph->base_character;
234 else { 273 else {
235 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) { 274 if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) {
236 psiconv_warn(0,psiconv_buffer_length(buf), 275 psiconv_warn(config,0,psiconv_buffer_length(buf),
237 "Massive memory corruption"); 276 "Massive memory corruption");
238 res = -PSICONV_E_OTHER; 277 res = -PSICONV_E_OTHER;
239 goto ERROR5; 278 goto ERROR6;
240 } 279 }
241 para_charlayout = in_line->layout; 280 para_charlayout = in_line->layout;
242 } 281 }
243 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) { 282 for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) {
244 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) { 283 if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) {
245 psiconv_warn(0,psiconv_buffer_length(buf), 284 psiconv_warn(config,0,psiconv_buffer_length(buf),
246 "Massive memory corruption"); 285 "Massive memory corruption");
247 res = -PSICONV_E_OTHER; 286 res = -PSICONV_E_OTHER;
248 goto ERROR5; 287 goto ERROR6;
249 } 288 }
250 if ((paragraph->base_style == paragraph_type->style) && 289 if ((paragraph->base_style == paragraph_type->style) &&
251 !psiconv_compare_character_layout(para_charlayout, 290 !psiconv_compare_character_layout(para_charlayout,
252 paragraph_type->character) && 291 paragraph_type->character) &&
253 !psiconv_compare_paragraph_layout(paragraph->base_paragraph, 292 !psiconv_compare_paragraph_layout(paragraph->base_paragraph,
… …
263 new_type.paragraph = paragraph->base_paragraph; 302 new_type.paragraph = paragraph->base_paragraph;
264 new_type.character = para_charlayout; 303 new_type.character = para_charlayout;
265 new_type.style = paragraph->base_style; 304 new_type.style = paragraph->base_style;
266 paragraph_type = &new_type; 305 paragraph_type = &new_type;
267 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type))) 306 if ((res = psiconv_list_add(paragraph_type_list,paragraph_type)))
268 goto ERROR5; 307 goto ERROR6;
269 if ((res = psiconv_write_u32(buf_types,paragraph_type->nr))) 308 if ((res = psiconv_write_u32(config,buf_types,paragraph_type->nr)))
270 goto ERROR5; 309 goto ERROR6;
271 if (!(style = psiconv_get_style(styles,paragraph_type->style))) { 310 if (!(style = psiconv_get_style(styles,paragraph_type->style))) {
272 psiconv_warn(0,psiconv_buffer_length(buf),"Unknown style"); 311 psiconv_warn(config,0,psiconv_buffer_length(buf),"Unknown style");
273 res = -PSICONV_E_GENERATE; 312 res = -PSICONV_E_GENERATE;
274 goto ERROR5; 313 goto ERROR6;
275 } 314 }
276 if ((res = psiconv_write_paragraph_layout_list(buf_types, 315 if ((res = psiconv_write_paragraph_layout_list(config,buf_types,
277 paragraph_type->paragraph,style->paragraph))) 316 paragraph_type->paragraph,style->paragraph)))
278 goto ERROR5; 317 goto ERROR6;
279 if (with_styles) 318 if (with_styles)
280 if ((res = psiconv_write_u8(buf_types,paragraph_type->style))) 319 if ((res = psiconv_write_u8(config,buf_types,paragraph_type->style)))
281 goto ERROR5; 320 goto ERROR6;
282 if ((res = psiconv_write_character_layout_list(buf_types, 321 if ((res = psiconv_write_character_layout_list(config,buf_types,
283 paragraph_type->character,style->character))) 322 paragraph_type->character,style->character)))
284 goto ERROR5; 323 goto ERROR6;
285 } 324 }
286 if ((res = psiconv_write_u8(buf_elements,para_type))) 325 if ((res = psiconv_write_u8(config,buf_elements,para_type)))
287 goto ERROR5; 326 goto ERROR6;
288 } 327 }
289 } 328 }
290 329
291 /* HACK: special case: no paragraphs at all. We need to improvize. */ 330 /* HACK: special case: no paragraphs at all. We need to improvize. */
292 if (!psiconv_list_length(value)) { 331 if (!psiconv_list_length(value)) {
293 if ((res = psiconv_write_u32(buf_types,1))) 332 if ((res = psiconv_write_u32(config,buf_types,1)))
294 goto ERROR5; 333 goto ERROR6;
295 if ((res = psiconv_write_u32(buf_types,0))) 334 if ((res = psiconv_write_u32(config,buf_types,0)))
296 goto ERROR5; 335 goto ERROR6;
297 if (with_styles) 336 if (with_styles)
298 if ((res = psiconv_write_u8(buf_types,0))) 337 if ((res = psiconv_write_u8(config,buf_types,0)))
299 goto ERROR5; 338 goto ERROR6;
300 if ((res = psiconv_write_u32(buf_types,0))) 339 if ((res = psiconv_write_u32(config,buf_types,0)))
301 goto ERROR5; 340 goto ERROR6;
302 341
303 if ((res = psiconv_write_u32(buf_elements,1))) 342 if ((res = psiconv_write_u32(config,buf_elements,1)))
304 goto ERROR5; 343 goto ERROR6;
305 if ((res = psiconv_write_u8(buf_elements,1))) 344 if ((res = psiconv_write_u8(config,buf_elements,1)))
306 goto ERROR5; 345 goto ERROR6;
307 pel_length = 1; 346 pel_length = 1;
308 ptl_length = 1; 347 ptl_length = 1;
309 } else { 348 } else {
310 pel_length = psiconv_list_length(value); 349 pel_length = psiconv_list_length(value);
311 ptl_length = psiconv_list_length(paragraph_type_list); 350 ptl_length = psiconv_list_length(paragraph_type_list);
312 } 351 }
313 352
314 /* Now append everything */ 353 /* Now append everything */
315 if ((res = psiconv_write_u16(buf,with_styles?0x0001:0x0000))) 354 if ((res = psiconv_write_u16(config,buf,with_styles?0x0001:0x0000)))
316 goto ERROR5; 355 goto ERROR6;
317 if ((res = psiconv_write_u8(buf, ptl_length))) 356 if ((res = psiconv_write_u8(config,buf, ptl_length)))
318 goto ERROR5; 357 goto ERROR6;
319 if ((res = psiconv_buffer_concat(buf,buf_types))) 358 if ((res = psiconv_buffer_concat(buf,buf_types)))
320 goto ERROR5; 359 goto ERROR6;
321 if ((res = psiconv_write_u32(buf,pel_length))) 360 if ((res = psiconv_write_u32(config,buf,pel_length)))
322 goto ERROR5; 361 goto ERROR6;
323 if ((res = psiconv_buffer_concat(buf,buf_elements))) 362 if ((res = psiconv_buffer_concat(buf,buf_elements)))
324 goto ERROR5; 363 goto ERROR6;
325 if ((res = psiconv_write_u32(buf,nr_of_inlines))) 364 if ((res = psiconv_write_u32(config,buf,nr_of_inlines)))
326 goto ERROR5; 365 goto ERROR6;
327 res = psiconv_buffer_concat(buf,buf_inlines); 366 if ((res = psiconv_buffer_concat(buf,buf_inlines)))
367 goto ERROR6;
368 if ((res = psiconv_buffer_concat(buf,buf_objects)))
369 goto ERROR6;
328 370
371ERROR6:
372 psiconv_buffer_free(buf_objects);
329ERROR5: 373ERROR5:
330 psiconv_buffer_free(buf_inlines); 374 psiconv_buffer_free(buf_inlines);
331ERROR4: 375ERROR4:
332 psiconv_buffer_free(buf_elements); 376 psiconv_buffer_free(buf_elements);
333ERROR3: 377ERROR3:
… …
336 psiconv_list_free(paragraph_type_list); 380 psiconv_list_free(paragraph_type_list);
337ERROR1: 381ERROR1:
338 return res; 382 return res;
339} 383}
340 384
341int psiconv_write_styled_layout_section(psiconv_buffer buf, 385int psiconv_write_styled_layout_section(const psiconv_config config,
386 psiconv_buffer buf,
342 psiconv_text_and_layout result, 387 psiconv_text_and_layout result,
343 psiconv_word_styles_section styles) 388 psiconv_word_styles_section styles)
344{ 389{
345 return psiconv_write_layout_section(buf,result,styles,1); 390 return psiconv_write_layout_section(config,buf,result,styles,1);
346} 391}
347 392
348int psiconv_write_styleless_layout_section(psiconv_buffer buf, 393int psiconv_write_styleless_layout_section(const psiconv_config config,
394 psiconv_buffer buf,
349 const psiconv_text_and_layout value, 395 const psiconv_text_and_layout value,
350 const psiconv_character_layout base_char, 396 const psiconv_character_layout base_char,
351 const psiconv_paragraph_layout base_para) 397 const psiconv_paragraph_layout base_para)
352{ 398{
353 int res = 0; 399 int res = 0;
… …
368 goto ERROR5; 414 goto ERROR5;
369 if (!(styles_section->styles = psiconv_list_new(sizeof( 415 if (!(styles_section->styles = psiconv_list_new(sizeof(
370 struct psiconv_word_style_s)))) 416 struct psiconv_word_style_s))))
371 goto ERROR6; 417 goto ERROR6;
372 418
373 res = psiconv_write_layout_section(buf,value,styles_section,0); 419 res = psiconv_write_layout_section(config,buf,value,styles_section,0);
374 psiconv_free_word_styles_section(styles_section); 420 psiconv_free_word_styles_section(styles_section);
375 return res; 421 return res;
376 422
377ERROR6: 423ERROR6:
378 free(styles_section->normal->name); 424 free(styles_section->normal->name);
… …
388 if (!res) 434 if (!res)
389 return -PSICONV_E_NOMEM; 435 return -PSICONV_E_NOMEM;
390 else 436 else
391 return res; 437 return res;
392} 438}
439
440
441int psiconv_write_embedded_object_section(const psiconv_config config,
442 psiconv_buffer buf,
443 const psiconv_embedded_object_section value)
444{
445 int res;
446 psiconv_u32 display_id,icon_id,table_id;
447 psiconv_buffer extra_buf;
448
449 if (!value) {
450 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object");
451 res = -PSICONV_E_GENERATE;
452 goto ERROR1;
453 }
454
455 if (!(extra_buf = psiconv_buffer_new())) {
456 res = -PSICONV_E_NOMEM;
457 goto ERROR1;
458 }
459
460 display_id = psiconv_buffer_unique_id();
461 icon_id = psiconv_buffer_unique_id();
462 table_id = psiconv_buffer_unique_id();
463 if ((res = psiconv_write_u8(config,buf,0x06)))
464 goto ERROR2;
465 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_DISPLAY_SECTION)))
466 goto ERROR2;
467 if ((res = psiconv_buffer_add_reference(buf,display_id)))
468 goto ERROR2;
469 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_ICON_SECTION)))
470 goto ERROR2;
471 if ((res = psiconv_buffer_add_reference(buf,icon_id)))
472 goto ERROR2;
473 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION)))
474 goto ERROR2;
475 if ((res = psiconv_buffer_add_reference(buf,table_id)))
476 goto ERROR2;
477
478 if ((res = psiconv_buffer_add_target(buf,display_id)))
479 goto ERROR2;
480 if ((res = psiconv_write_object_display_section(config,buf,value->display)))
481 goto ERROR2;
482 if ((res = psiconv_buffer_add_target(buf,icon_id)))
483 goto ERROR2;
484 if ((res = psiconv_write_object_icon_section(config,buf,value->icon)))
485 goto ERROR2;
486 if ((res = psiconv_buffer_add_target(buf,table_id)))
487 goto ERROR2;
488 switch(value->object->type) {
489 case psiconv_word_file:
490 if ((res = psiconv_write_word_file(config,extra_buf,
491 (psiconv_word_f) value->object->file)))
492 goto ERROR2;
493 break;
494 case psiconv_sketch_file:
495 if ((res = psiconv_write_sketch_file(config,extra_buf,
496 (psiconv_sketch_f) value->object->file)))
497 goto ERROR2;
498 break;
499/*
500 case psiconv_sheet_file:
501 if ((res = psiconv_write_sheet_file(config,extra_buf,
502 (psiconv_sheet_f) value->object->file)))
503 goto ERROR2;
504 break;
505*/
506 default:
507 psiconv_warn(config,0,psiconv_buffer_length(buf),
508 "Unknown or unsupported object type");
509 res = -PSICONV_E_GENERATE;
510 goto ERROR2;
511 }
512
513 if ((res = psiconv_buffer_resolve(extra_buf)))
514 goto ERROR2;
515 if ((res = psiconv_buffer_concat(buf,extra_buf)))
516 goto ERROR2;
517
518 return 0;
519
520ERROR2:
521 psiconv_buffer_free(extra_buf);
522ERROR1:
523 return res;
524}
525
526
527int psiconv_write_object_display_section(const psiconv_config config,
528 psiconv_buffer buf,
529 const psiconv_object_display_section value)
530{
531 int res;
532
533 if (!value) {
534 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object Display Section");
535 res = -PSICONV_E_GENERATE;
536 goto ERROR1;
537 }
538
539 if ((res = psiconv_write_u8(config,buf,value->show_icon?0x00:0x01)))
540 goto ERROR1;
541 if ((res = psiconv_write_length(config,buf,value->width)))
542 goto ERROR1;
543 if ((res = psiconv_write_length(config,buf,value->height)))
544 goto ERROR1;
545 if ((res = psiconv_write_u32(config,buf,0x00000000)))
546 goto ERROR1;
547
548 return 0;
549
550ERROR1:
551 return res;
552}
553
554int psiconv_write_object_icon_section(const psiconv_config config,
555 psiconv_buffer buf,
556 const psiconv_object_icon_section value)
557{
558 int res;
559
560 if (!value) {
561 psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object Icon Section");
562 res = -PSICONV_E_GENERATE;
563 goto ERROR1;
564 }
565
566 if ((res = psiconv_write_string(config,buf,value->icon_name)))
567 goto ERROR1;
568 if ((res = psiconv_write_length(config,buf,value->icon_width)))
569 goto ERROR1;
570 if ((res = psiconv_write_length(config,buf,value->icon_height)))
571 goto ERROR1;
572
573 return 0;
574
575ERROR1:
576 return res;
577}
Legend:
Removed from v.89  
changed lines
  Added in v.170
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26