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

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

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

Revision 171 Revision 231
1/* 1/*
2 generate_driver.c - Part of psiconv, a PSION 5 file formats converter 2 generate_driver.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 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 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 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
27 27
28#ifdef DMALLOC 28#ifdef DMALLOC
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32static psiconv_ucs2 unicode_paint[10] = { 'P','a','i','n','t','.','a','p','p',0 };
33static psiconv_ucs2 unicode_texted[11] ={ 'T','e','x','t','E','d','.','a','p','p',0 };
34static psiconv_ucs2 unicode_word[9] = { 'W','o','r','d','.','a','p','p',0 };
35
32 36
33int psiconv_write(const psiconv_config config, psiconv_buffer *buf, 37int psiconv_write(const psiconv_config config, psiconv_buffer *buf,
34 const psiconv_file value) 38 const psiconv_file value)
35{ 39{
36 int res; 40 int res;
41 int lev = 0;
37 42
38 if (!value) { 43 if (!value) {
39 psiconv_warn(config,0,0,"Can't parse to an empty buffer!"); 44 psiconv_error(config,0,0,"Can't parse to an empty buffer!");
40 return -PSICONV_E_OTHER; 45 return -PSICONV_E_OTHER;
41 } 46 }
42 if (!(*buf = psiconv_buffer_new())) 47 if (!(*buf = psiconv_buffer_new()))
43 return -PSICONV_E_NOMEM; 48 return -PSICONV_E_NOMEM;
44 49
45 if (value->type == psiconv_word_file) { 50 if (value->type == psiconv_word_file) {
46 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 51 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
47 PSICONV_ID_DATA_FILE, 52 PSICONV_ID_DATA_FILE,
48 PSICONV_ID_WORD))) 53 PSICONV_ID_WORD)))
49 goto ERROR; 54 goto ERROR;
50 if ((res =psiconv_write_word_file(config,*buf,(psiconv_word_f) (value->file)))) 55 if ((res =psiconv_write_word_file(config,*buf,lev+1,(psiconv_word_f) (value->file))))
51 goto ERROR; 56 goto ERROR;
52 } else if (value->type == psiconv_texted_file) { 57 } else if (value->type == psiconv_texted_file) {
53 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 58 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
54 PSICONV_ID_DATA_FILE, 59 PSICONV_ID_DATA_FILE,
55 PSICONV_ID_TEXTED))) 60 PSICONV_ID_TEXTED)))
56 goto ERROR; 61 goto ERROR;
57 if ((res =psiconv_write_texted_file(config,*buf, 62 if ((res =psiconv_write_texted_file(config,*buf,lev+1,
58 (psiconv_texted_f) (value->file)))) 63 (psiconv_texted_f) (value->file))))
59 goto ERROR; 64 goto ERROR;
60 } else if (value->type == psiconv_sketch_file) { 65 } else if (value->type == psiconv_sketch_file) {
61 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 66 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
62 PSICONV_ID_DATA_FILE, 67 PSICONV_ID_DATA_FILE,
63 PSICONV_ID_SKETCH))) 68 PSICONV_ID_SKETCH)))
64 goto ERROR; 69 goto ERROR;
65 if ((res =psiconv_write_sketch_file(config,*buf, 70 if ((res =psiconv_write_sketch_file(config,*buf,lev+1,
66 (psiconv_sketch_f) (value->file)))) 71 (psiconv_sketch_f) (value->file))))
67 goto ERROR; 72 goto ERROR;
68 } else if (value->type == psiconv_mbm_file) { 73 } else if (value->type == psiconv_mbm_file) {
69 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 74 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
70 PSICONV_ID_MBM_FILE, 75 PSICONV_ID_MBM_FILE,
71 0x00000000))) 76 0x00000000)))
72 goto ERROR; 77 goto ERROR;
73 if ((res =psiconv_write_mbm_file(config,*buf, 78 if ((res =psiconv_write_mbm_file(config,*buf,lev+1,
74 (psiconv_mbm_f) (value->file)))) 79 (psiconv_mbm_f) (value->file))))
75 goto ERROR; 80 goto ERROR;
76#if 0
77 } else if (value->type == psiconv_clipart_file) { 81 } else if (value->type == psiconv_clipart_file) {
82 /* No complete header section, so we do it all in the below function */
78 if ((res =psiconv_write_clipart_file(config,*buf, 83 if ((res =psiconv_write_clipart_file(config,*buf,lev+1,
79 (psiconv_clipart_f) (value->file)))) 84 (psiconv_clipart_f) (value->file))))
80 goto ERROR; 85 goto ERROR;
81#endif
82 } else { 86 } else {
83 psiconv_warn(config,0,0,"Unknown or unsupported file type"); 87 psiconv_error(config,0,0,"Unknown or unsupported file type");
84 res = -PSICONV_E_GENERATE; 88 res = -PSICONV_E_GENERATE;
85 goto ERROR; 89 goto ERROR;
86 } 90 }
87 if ((res = psiconv_buffer_resolve(*buf))) 91 if ((res = psiconv_buffer_resolve(*buf)))
88 goto ERROR; 92 goto ERROR;
… …
92 psiconv_buffer_free(*buf); 96 psiconv_buffer_free(*buf);
93 return res; 97 return res;
94} 98}
95 99
96int psiconv_write_texted_file(const psiconv_config config, 100int psiconv_write_texted_file(const psiconv_config config,
97 psiconv_buffer buf,psiconv_texted_f value) 101 psiconv_buffer buf,int lev,psiconv_texted_f value)
98{ 102{
99 psiconv_character_layout base_char; 103 psiconv_character_layout base_char;
100 psiconv_paragraph_layout base_para; 104 psiconv_paragraph_layout base_para;
101 int res; 105 int res;
102 psiconv_section_table_section section_table; 106 psiconv_section_table_section section_table;
103 psiconv_section_table_entry entry; 107 psiconv_section_table_entry entry;
104 psiconv_u32 section_table_id; 108 psiconv_u32 section_table_id;
105 psiconv_buffer buf_texted; 109 psiconv_buffer buf_texted;
106 110
111 psiconv_progress(config,lev,0,"Writing texted file");
107 if (!value) { 112 if (!value) {
108 psiconv_warn(config,0,0,"Null TextEd file"); 113 psiconv_error(config,lev,0,"Null TextEd file");
109 return -PSICONV_E_GENERATE; 114 res = -PSICONV_E_GENERATE;
115 goto ERROR1;
110 } 116 }
111 117
112 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 118 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
113 res = -PSICONV_E_NOMEM; 119 res = -PSICONV_E_NOMEM;
114 goto ERROR1; 120 goto ERROR1;
… …
127 res = -PSICONV_E_NOMEM; 133 res = -PSICONV_E_NOMEM;
128 goto ERROR4; 134 goto ERROR4;
129 } 135 }
130 136
131 section_table_id = psiconv_buffer_unique_id(); 137 section_table_id = psiconv_buffer_unique_id();
132 if ((res = psiconv_write_offset(config,buf,section_table_id))) 138 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
133 goto ERROR5; 139 goto ERROR5;
134 140
135 entry->id = PSICONV_ID_APPL_ID_SECTION; 141 entry->id = PSICONV_ID_APPL_ID_SECTION;
136 entry->offset = psiconv_buffer_unique_id(); 142 entry->offset = psiconv_buffer_unique_id();
137 if ((res = psiconv_list_add(section_table,entry))) 143 if ((res = psiconv_list_add(section_table,entry)))
138 goto ERROR5; 144 goto ERROR5;
139 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 145 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
140 goto ERROR5; 146 goto ERROR5;
141 if ((res=psiconv_write_application_id_section(config,buf, 147 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
142 PSICONV_ID_TEXTED,"TextEd.app"))) 148 PSICONV_ID_TEXTED,unicode_texted)))
143 goto ERROR5; 149 goto ERROR5;
144 150
145 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; 151 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION;
146 entry->offset = psiconv_buffer_unique_id(); 152 entry->offset = psiconv_buffer_unique_id();
147 if ((res = psiconv_list_add(section_table,entry))) 153 if ((res = psiconv_list_add(section_table,entry)))
148 goto ERROR5; 154 goto ERROR5;
149 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 155 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
150 goto ERROR5; 156 goto ERROR5;
151 if ((res = psiconv_write_page_layout_section(config,buf,value->page_sec))) 157 if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
152 goto ERROR5; 158 goto ERROR5;
153 159
154 entry->id = PSICONV_ID_TEXTED; 160 entry->id = PSICONV_ID_TEXTED;
155 entry->offset = psiconv_buffer_unique_id(); 161 entry->offset = psiconv_buffer_unique_id();
156 if ((res = psiconv_list_add(section_table,entry))) 162 if ((res = psiconv_list_add(section_table,entry)))
157 goto ERROR5; 163 goto ERROR5;
158 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 164 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
159 goto ERROR5; 165 goto ERROR5;
160 if ((res = psiconv_write_texted_section(config,buf,value->texted_sec, 166 if ((res = psiconv_write_texted_section(config,buf,lev+1,value->texted_sec,
161 base_char,base_para,&buf_texted))) 167 base_char,base_para,&buf_texted)))
162 goto ERROR5; 168 goto ERROR5;
163 169
164 if ((res = psiconv_buffer_concat(buf,buf_texted))) 170 if ((res = psiconv_buffer_concat(buf,buf_texted)))
165 goto ERROR6; 171 goto ERROR6;
166 172
167 173
168 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 174 if ((res = psiconv_buffer_add_target(buf,section_table_id)))
169 goto ERROR6; 175 goto ERROR6;
170 176
171 res = psiconv_write_section_table_section(config,buf,section_table); 177 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
172 178
173ERROR6: 179ERROR6:
174 psiconv_buffer_free(buf_texted); 180 psiconv_buffer_free(buf_texted);
175ERROR5: 181ERROR5:
176 psiconv_free_paragraph_layout(base_para); 182 psiconv_free_paragraph_layout(base_para);
… …
179ERROR3: 185ERROR3:
180 free(entry); 186 free(entry);
181ERROR2: 187ERROR2:
182 psiconv_list_free(section_table); 188 psiconv_list_free(section_table);
183ERROR1: 189ERROR1:
190 if (res)
191 psiconv_error(config,lev,0,"Writing of texted file failed");
192 else
193 psiconv_progress(config,lev,0,"End of texted file");
184 return res; 194 return res;
185} 195}
186 196
187int psiconv_write_word_file(const psiconv_config config, 197int psiconv_write_word_file(const psiconv_config config,
188 psiconv_buffer buf,psiconv_word_f value) 198 psiconv_buffer buf,int lev,psiconv_word_f value)
189{ 199{
190 int res; 200 int res;
191 psiconv_section_table_section section_table; 201 psiconv_section_table_section section_table;
192 psiconv_section_table_entry entry; 202 psiconv_section_table_entry entry;
193 psiconv_u32 section_table_id; 203 psiconv_u32 section_table_id;
194 204
205 psiconv_progress(config,lev,0,"Writing word file");
195 if (!value) { 206 if (!value) {
196 psiconv_warn(config,0,0,"Null Word file"); 207 psiconv_error(config,lev,0,"Null Word file");
197 return -PSICONV_E_GENERATE; 208 res = -PSICONV_E_GENERATE;
209 goto ERROR1;
198 } 210 }
199 211
200 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 212 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
201 res = -PSICONV_E_NOMEM; 213 res = -PSICONV_E_NOMEM;
202 goto ERROR1; 214 goto ERROR1;
… …
206 res = -PSICONV_E_NOMEM; 218 res = -PSICONV_E_NOMEM;
207 goto ERROR2; 219 goto ERROR2;
208 } 220 }
209 221
210 section_table_id = psiconv_buffer_unique_id(); 222 section_table_id = psiconv_buffer_unique_id();
211 if ((res = psiconv_write_offset(config,buf,section_table_id))) 223 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
212 goto ERROR3; 224 goto ERROR3;
213 225
214 entry->id = PSICONV_ID_APPL_ID_SECTION; 226 entry->id = PSICONV_ID_APPL_ID_SECTION;
215 entry->offset = psiconv_buffer_unique_id(); 227 entry->offset = psiconv_buffer_unique_id();
216 if ((res = psiconv_list_add(section_table,entry))) 228 if ((res = psiconv_list_add(section_table,entry)))
217 goto ERROR3; 229 goto ERROR3;
218 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 230 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
219 goto ERROR3; 231 goto ERROR3;
220 if ((res=psiconv_write_application_id_section(config,buf, 232 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
221 PSICONV_ID_WORD,"Word.app"))) 233 PSICONV_ID_WORD,unicode_word)))
222 goto ERROR3; 234 goto ERROR3;
223 235
224 entry->id = PSICONV_ID_WORD_STATUS_SECTION; 236 entry->id = PSICONV_ID_WORD_STATUS_SECTION;
225 entry->offset = psiconv_buffer_unique_id(); 237 entry->offset = psiconv_buffer_unique_id();
226 if ((res = psiconv_list_add(section_table,entry))) 238 if ((res = psiconv_list_add(section_table,entry)))
227 goto ERROR3; 239 goto ERROR3;
228 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 240 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
229 goto ERROR3; 241 goto ERROR3;
230 if ((res = psiconv_write_word_status_section(config,buf,value->status_sec))) 242 if ((res = psiconv_write_word_status_section(config,buf,lev+1,value->status_sec)))
231 goto ERROR3; 243 goto ERROR3;
232 244
233 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; 245 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION;
234 entry->offset = psiconv_buffer_unique_id(); 246 entry->offset = psiconv_buffer_unique_id();
235 if ((res = psiconv_list_add(section_table,entry))) 247 if ((res = psiconv_list_add(section_table,entry)))
236 goto ERROR3; 248 goto ERROR3;
237 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 249 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
238 goto ERROR3; 250 goto ERROR3;
239 if ((res = psiconv_write_page_layout_section(config,buf,value->page_sec))) 251 if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
240 goto ERROR3; 252 goto ERROR3;
241 253
242 entry->id = PSICONV_ID_WORD_STYLES_SECTION; 254 entry->id = PSICONV_ID_WORD_STYLES_SECTION;
243 entry->offset = psiconv_buffer_unique_id(); 255 entry->offset = psiconv_buffer_unique_id();
244 if ((res = psiconv_list_add(section_table,entry))) 256 if ((res = psiconv_list_add(section_table,entry)))
245 goto ERROR3; 257 goto ERROR3;
246 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 258 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
247 goto ERROR3; 259 goto ERROR3;
248 if ((res = psiconv_write_word_styles_section(config,buf,value->styles_sec))) 260 if ((res = psiconv_write_word_styles_section(config,buf,lev+1,value->styles_sec)))
249 goto ERROR3; 261 goto ERROR3;
250 262
251 entry->id = PSICONV_ID_TEXT_SECTION; 263 entry->id = PSICONV_ID_TEXT_SECTION;
252 entry->offset = psiconv_buffer_unique_id(); 264 entry->offset = psiconv_buffer_unique_id();
253 if ((res = psiconv_list_add(section_table,entry))) 265 if ((res = psiconv_list_add(section_table,entry)))
254 goto ERROR3; 266 goto ERROR3;
255 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 267 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
256 goto ERROR3; 268 goto ERROR3;
257 if ((res = psiconv_write_text_section(config,buf,value->paragraphs))) 269 if ((res = psiconv_write_text_section(config,buf,lev+1,value->paragraphs)))
258 goto ERROR3; 270 goto ERROR3;
259 271
260 entry->id = PSICONV_ID_LAYOUT_SECTION; 272 entry->id = PSICONV_ID_LAYOUT_SECTION;
261 entry->offset = psiconv_buffer_unique_id(); 273 entry->offset = psiconv_buffer_unique_id();
262 if ((res = psiconv_list_add(section_table,entry))) 274 if ((res = psiconv_list_add(section_table,entry)))
263 goto ERROR3; 275 goto ERROR3;
264 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 276 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
265 goto ERROR3; 277 goto ERROR3;
266 if ((res = psiconv_write_styled_layout_section(config,buf,value->paragraphs, 278 if ((res = psiconv_write_styled_layout_section(config,buf,lev+1,value->paragraphs,
267 value->styles_sec))) 279 value->styles_sec)))
268 goto ERROR3; 280 goto ERROR3;
269 281
270 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 282 if ((res = psiconv_buffer_add_target(buf,section_table_id)))
271 goto ERROR3; 283 goto ERROR3;
272 284
273 res = psiconv_write_section_table_section(config,buf,section_table); 285 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
274 286
275ERROR3: 287ERROR3:
276 free(entry); 288 free(entry);
277ERROR2: 289ERROR2:
278 psiconv_list_free(section_table); 290 psiconv_list_free(section_table);
279ERROR1: 291ERROR1:
292 if (res)
293 psiconv_error(config,lev,0,"Writing of word file failed");
294 else
295 psiconv_progress(config,lev,0,"End of word file");
280 return res; 296 return res;
281} 297}
282 298
283int psiconv_write_sketch_file(const psiconv_config config, 299int psiconv_write_sketch_file(const psiconv_config config,
284 psiconv_buffer buf,psiconv_sketch_f value) 300 psiconv_buffer buf,int lev,psiconv_sketch_f value)
285{ 301{
286 int res; 302 int res;
287 psiconv_section_table_section section_table; 303 psiconv_section_table_section section_table;
288 psiconv_section_table_entry entry; 304 psiconv_section_table_entry entry;
289 psiconv_u32 section_table_id; 305 psiconv_u32 section_table_id;
290 306
307 psiconv_progress(config,lev,0,"Writing sketch file");
291 if (!value) { 308 if (!value) {
292 psiconv_warn(config,0,0,"Null Sketch file"); 309 psiconv_error(config,lev,0,"Null Sketch file");
293 return -PSICONV_E_GENERATE; 310 res = -PSICONV_E_GENERATE;
311 goto ERROR1;
294 } 312 }
295 313
296 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 314 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
297 res = -PSICONV_E_NOMEM; 315 res = -PSICONV_E_NOMEM;
298 goto ERROR1; 316 goto ERROR1;
… …
302 res = -PSICONV_E_NOMEM; 320 res = -PSICONV_E_NOMEM;
303 goto ERROR2; 321 goto ERROR2;
304 } 322 }
305 323
306 section_table_id = psiconv_buffer_unique_id(); 324 section_table_id = psiconv_buffer_unique_id();
307 if ((res = psiconv_write_offset(config,buf,section_table_id))) 325 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
308 goto ERROR3; 326 goto ERROR3;
309 327
310 entry->id = PSICONV_ID_APPL_ID_SECTION; 328 entry->id = PSICONV_ID_APPL_ID_SECTION;
311 entry->offset = psiconv_buffer_unique_id(); 329 entry->offset = psiconv_buffer_unique_id();
312 if ((res = psiconv_list_add(section_table,entry))) 330 if ((res = psiconv_list_add(section_table,entry)))
313 goto ERROR3; 331 goto ERROR3;
314 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 332 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
315 goto ERROR3; 333 goto ERROR3;
316 if ((res=psiconv_write_application_id_section(config,buf, 334 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
317 PSICONV_ID_SKETCH,"Paint.app"))) 335 PSICONV_ID_SKETCH,unicode_paint)))
318 goto ERROR3; 336 goto ERROR3;
319 337
320 entry->id = PSICONV_ID_SKETCH_SECTION; 338 entry->id = PSICONV_ID_SKETCH_SECTION;
321 entry->offset = psiconv_buffer_unique_id(); 339 entry->offset = psiconv_buffer_unique_id();
322 if ((res = psiconv_list_add(section_table,entry))) 340 if ((res = psiconv_list_add(section_table,entry)))
323 goto ERROR3; 341 goto ERROR3;
324 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 342 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
325 goto ERROR3; 343 goto ERROR3;
326 if ((res = psiconv_write_sketch_section(config,buf,value->sketch_sec))) 344 if ((res = psiconv_write_sketch_section(config,buf,lev+1,value->sketch_sec)))
327 goto ERROR3; 345 goto ERROR3;
328 346
329 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 347 if ((res = psiconv_buffer_add_target(buf,section_table_id)))
330 goto ERROR3; 348 goto ERROR3;
331 res = psiconv_write_section_table_section(config,buf,section_table); 349 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
332 350
333ERROR3: 351ERROR3:
334 free(entry); 352 free(entry);
335ERROR2: 353ERROR2:
336 psiconv_list_free(section_table); 354 psiconv_list_free(section_table);
337ERROR1: 355ERROR1:
356 if (res)
357 psiconv_error(config,lev,0,"Writing of sketch file failed");
358 else
359 psiconv_progress(config,lev,0,"End of sketch file");
338 return res; 360 return res;
339} 361}
340 362
341int psiconv_write_mbm_file(const psiconv_config config, 363int psiconv_write_mbm_file(const psiconv_config config,
342 psiconv_buffer buf,psiconv_mbm_f value) 364 psiconv_buffer buf,int lev,psiconv_mbm_f value)
343{ 365{
344 int res,i; 366 int res,i;
345 psiconv_jumptable_section jumptable; 367 psiconv_jumptable_section jumptable;
346 psiconv_u32 *entry,id,table_id; 368 psiconv_u32 *entry,id,table_id;
347 psiconv_paint_data_section section; 369 psiconv_paint_data_section section;
348 370
371 psiconv_progress(config,lev,0,"Writing mbm file");
349 if (!value) { 372 if (!value) {
350 psiconv_warn(config,0,0,"Null MBM file"); 373 psiconv_error(config,lev,0,"Null MBM file");
351 return -PSICONV_E_GENERATE; 374 res = -PSICONV_E_GENERATE;
375 goto ERROR1;
352 } 376 }
353 377
354 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) { 378 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
355 res = -PSICONV_E_NOMEM; 379 res = -PSICONV_E_NOMEM;
356 goto ERROR1; 380 goto ERROR1;
… …
360 if ((res = psiconv_buffer_add_reference(buf,table_id))) 384 if ((res = psiconv_buffer_add_reference(buf,table_id)))
361 goto ERROR2; 385 goto ERROR2;
362 386
363 for (i = 0; i < psiconv_list_length(value->sections); i++) { 387 for (i = 0; i < psiconv_list_length(value->sections); i++) {
364 if (!(section = psiconv_list_get(value->sections,i))) { 388 if (!(section = psiconv_list_get(value->sections,i))) {
365 psiconv_warn(config,0,0,"Massive memory corruption"); 389 psiconv_error(config,lev,0,"Massive memory corruption");
366 res = -PSICONV_E_NOMEM; 390 res = -PSICONV_E_NOMEM;
367 goto ERROR2; 391 goto ERROR2;
368 } 392 }
369 id = psiconv_buffer_unique_id(); 393 id = psiconv_buffer_unique_id();
370 psiconv_list_add(jumptable,&id); 394 psiconv_list_add(jumptable,&id);
371 if ((res = psiconv_buffer_add_target(buf,id))) 395 if ((res = psiconv_buffer_add_target(buf,id)))
372 goto ERROR2; 396 goto ERROR2;
373 if ((res = psiconv_write_paint_data_section(config,buf,section))) 397 if ((res = psiconv_write_paint_data_section(config,buf,lev+1,section,0)))
374 goto ERROR2; 398 goto ERROR2;
375 } 399 }
376 400
377 if ((res = psiconv_buffer_add_target(buf,table_id))) 401 if ((res = psiconv_buffer_add_target(buf,table_id)))
378 goto ERROR2; 402 goto ERROR2;
379 if ((res = psiconv_write_jumptable_section(config,buf,jumptable))) 403 if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
380 goto ERROR2; 404 goto ERROR2;
381 405
382 406
383ERROR2: 407ERROR2:
384 psiconv_list_free(jumptable); 408 psiconv_list_free(jumptable);
385ERROR1: 409ERROR1:
410 if (res)
411 psiconv_error(config,lev,0,"Writing of mbm file failed");
412 else
413 psiconv_progress(config,lev,0,"End of mbm file");
386 return res; 414 return res;
387} 415}
416
417/* Note: this file is special, because it does not have a complete header! */
418int psiconv_write_clipart_file(const psiconv_config config,
419 psiconv_buffer buf,int lev,psiconv_clipart_f value)
420{
421 int res,i;
422 psiconv_jumptable_section jumptable;
423 psiconv_u32 *entry,id;
424 psiconv_clipart_section section;
425 psiconv_buffer sec_buf;
426
427 psiconv_progress(config,lev,0,"Writing clipart file");
428 if (!value) {
429 psiconv_error(config,lev,0,"Null Clipart file");
430 res = -PSICONV_E_GENERATE;
431 goto ERROR1;
432 }
433
434 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
435 res = -PSICONV_E_NOMEM;
436 goto ERROR1;
437 }
438
439 if (!(sec_buf = psiconv_buffer_new())) {
440 res = -PSICONV_E_NOMEM;
441 goto ERROR2;
442 }
443
444 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_CLIPART)))
445 goto ERROR3;
446
447 for (i = 0; i < psiconv_list_length(value->sections); i++) {
448 if (!(section = psiconv_list_get(value->sections,i))) {
449 psiconv_error(config,lev,0,"Massive memory corruption");
450 res = -PSICONV_E_NOMEM;
451 goto ERROR3;
452 }
453 id = psiconv_buffer_unique_id();
454 psiconv_list_add(jumptable,&id);
455 if ((res = psiconv_buffer_add_target(sec_buf,id)))
456 goto ERROR3;
457 if ((res = psiconv_write_clipart_section(config,sec_buf, lev+1,section)))
458 goto ERROR3;
459 }
460
461 if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
462 goto ERROR3;
463
464 if ((res = psiconv_buffer_concat(buf,sec_buf)))
465 goto ERROR3;
466
467
468ERROR3:
469 psiconv_buffer_free(sec_buf);
470ERROR2:
471 psiconv_list_free(jumptable);
472ERROR1:
473 if (res)
474 psiconv_error(config,lev,0,"Writing of clipart file failed");
475 else
476 psiconv_progress(config,lev,0,"End of clipart file");
477 return res;
478}
Legend:
Removed from v.171  
changed lines
  Added in v.231
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26