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