/[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 174 Revision 270
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-2005 Frodo Looijaard <frodo@frodo.looijaard.name>
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())) {
48 psiconv_error(config,lev+1,0,"Out of memory error");
43 return -PSICONV_E_NOMEM; 49 return -PSICONV_E_NOMEM;
50 }
44 51
45 if (value->type == psiconv_word_file) { 52 if (value->type == psiconv_word_file) {
46 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 53 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
47 PSICONV_ID_DATA_FILE, 54 PSICONV_ID_DATA_FILE,
48 PSICONV_ID_WORD))) 55 PSICONV_ID_WORD)))
49 goto ERROR; 56 goto ERROR;
50 if ((res =psiconv_write_word_file(config,*buf,(psiconv_word_f) (value->file)))) 57 if ((res =psiconv_write_word_file(config,*buf,lev+1,(psiconv_word_f) (value->file))))
51 goto ERROR; 58 goto ERROR;
52 } else if (value->type == psiconv_texted_file) { 59 } else if (value->type == psiconv_texted_file) {
53 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 60 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
54 PSICONV_ID_DATA_FILE, 61 PSICONV_ID_DATA_FILE,
55 PSICONV_ID_TEXTED))) 62 PSICONV_ID_TEXTED)))
56 goto ERROR; 63 goto ERROR;
57 if ((res =psiconv_write_texted_file(config,*buf, 64 if ((res =psiconv_write_texted_file(config,*buf,lev+1,
58 (psiconv_texted_f) (value->file)))) 65 (psiconv_texted_f) (value->file))))
59 goto ERROR; 66 goto ERROR;
60 } else if (value->type == psiconv_sketch_file) { 67 } else if (value->type == psiconv_sketch_file) {
61 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 68 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
62 PSICONV_ID_DATA_FILE, 69 PSICONV_ID_DATA_FILE,
63 PSICONV_ID_SKETCH))) 70 PSICONV_ID_SKETCH)))
64 goto ERROR; 71 goto ERROR;
65 if ((res =psiconv_write_sketch_file(config,*buf, 72 if ((res =psiconv_write_sketch_file(config,*buf,lev+1,
66 (psiconv_sketch_f) (value->file)))) 73 (psiconv_sketch_f) (value->file))))
67 goto ERROR; 74 goto ERROR;
68 } else if (value->type == psiconv_mbm_file) { 75 } else if (value->type == psiconv_mbm_file) {
69 if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, 76 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
70 PSICONV_ID_MBM_FILE, 77 PSICONV_ID_MBM_FILE,
71 0x00000000))) 78 0x00000000)))
72 goto ERROR; 79 goto ERROR;
73 if ((res =psiconv_write_mbm_file(config,*buf, 80 if ((res =psiconv_write_mbm_file(config,*buf,lev+1,
74 (psiconv_mbm_f) (value->file)))) 81 (psiconv_mbm_f) (value->file))))
75 goto ERROR; 82 goto ERROR;
76 } else if (value->type == psiconv_clipart_file) { 83 } else if (value->type == psiconv_clipart_file) {
77 /* No complete header section, so we do it all in the below function */ 84 /* No complete header section, so we do it all in the below function */
78 if ((res =psiconv_write_clipart_file(config,*buf, 85 if ((res =psiconv_write_clipart_file(config,*buf,lev+1,
79 (psiconv_clipart_f) (value->file)))) 86 (psiconv_clipart_f) (value->file))))
80 goto ERROR; 87 goto ERROR;
81 } else { 88 } else {
82 psiconv_warn(config,0,0,"Unknown or unsupported file type"); 89 psiconv_error(config,0,0,"Unknown or unsupported file type");
83 res = -PSICONV_E_GENERATE; 90 res = -PSICONV_E_GENERATE;
84 goto ERROR; 91 goto ERROR;
85 } 92 }
86 if ((res = psiconv_buffer_resolve(*buf))) 93 if ((res = psiconv_buffer_resolve(*buf))) {
94 psiconv_error(config,lev+1,0,"Internal error resolving buffer references");
87 goto ERROR; 95 goto ERROR;
96 }
88 return -PSICONV_E_OK; 97 return -PSICONV_E_OK;
89 98
90ERROR: 99ERROR:
91 psiconv_buffer_free(*buf); 100 psiconv_buffer_free(*buf);
92 return res; 101 return res;
93} 102}
94 103
95int psiconv_write_texted_file(const psiconv_config config, 104int psiconv_write_texted_file(const psiconv_config config,
96 psiconv_buffer buf,psiconv_texted_f value) 105 psiconv_buffer buf,int lev,psiconv_texted_f value)
97{ 106{
98 psiconv_character_layout base_char; 107 psiconv_character_layout base_char;
99 psiconv_paragraph_layout base_para; 108 psiconv_paragraph_layout base_para;
100 int res; 109 int res;
101 psiconv_section_table_section section_table; 110 psiconv_section_table_section section_table;
102 psiconv_section_table_entry entry; 111 psiconv_section_table_entry entry;
103 psiconv_u32 section_table_id; 112 psiconv_u32 section_table_id;
104 psiconv_buffer buf_texted; 113 psiconv_buffer buf_texted;
105 114
115 psiconv_progress(config,lev,0,"Writing texted file");
106 if (!value) { 116 if (!value) {
107 psiconv_warn(config,0,0,"Null TextEd file"); 117 psiconv_error(config,lev,0,"Null TextEd file");
108 return -PSICONV_E_GENERATE; 118 res = -PSICONV_E_GENERATE;
119 goto ERROR1;
109 } 120 }
110 121
111 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 122 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
123 psiconv_error(config,lev+1,0,"Out of memory error");
112 res = -PSICONV_E_NOMEM; 124 res = -PSICONV_E_NOMEM;
113 goto ERROR1; 125 goto ERROR1;
114 } 126 }
115 127
116 if (!(entry = malloc(sizeof(*entry)))) { 128 if (!(entry = malloc(sizeof(*entry)))) {
129 psiconv_error(config,lev+1,0,"Out of memory error");
117 res = -PSICONV_E_NOMEM; 130 res = -PSICONV_E_NOMEM;
118 goto ERROR2; 131 goto ERROR2;
119 } 132 }
120 133
121 if (!(base_char = psiconv_basic_character_layout())) { 134 if (!(base_char = psiconv_basic_character_layout())) {
135 psiconv_error(config,lev+1,0,"Out of memory error");
122 res = -PSICONV_E_NOMEM; 136 res = -PSICONV_E_NOMEM;
123 goto ERROR3; 137 goto ERROR3;
124 } 138 }
125 if (!(base_para = psiconv_basic_paragraph_layout())) { 139 if (!(base_para = psiconv_basic_paragraph_layout())) {
140 psiconv_error(config,lev+1,0,"Out of memory error");
126 res = -PSICONV_E_NOMEM; 141 res = -PSICONV_E_NOMEM;
127 goto ERROR4; 142 goto ERROR4;
128 } 143 }
129 144
130 section_table_id = psiconv_buffer_unique_id(); 145 section_table_id = psiconv_buffer_unique_id();
131 if ((res = psiconv_write_offset(config,buf,section_table_id))) 146 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id))) {
147 psiconv_error(config,lev+1,0,"Out of memory error");
132 goto ERROR5; 148 goto ERROR5;
149 }
133 150
134 entry->id = PSICONV_ID_APPL_ID_SECTION; 151 entry->id = PSICONV_ID_APPL_ID_SECTION;
135 entry->offset = psiconv_buffer_unique_id(); 152 entry->offset = psiconv_buffer_unique_id();
136 if ((res = psiconv_list_add(section_table,entry))) 153 if ((res = psiconv_list_add(section_table,entry))) {
154 psiconv_error(config,lev+1,0,"Out of memory error");
137 goto ERROR5; 155 goto ERROR5;
156 }
138 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 157 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
158 psiconv_error(config,lev+1,0,"Out of memory error");
139 goto ERROR5; 159 goto ERROR5;
160 }
140 if ((res=psiconv_write_application_id_section(config,buf, 161 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
141 PSICONV_ID_TEXTED,"TextEd.app"))) 162 PSICONV_ID_TEXTED,unicode_texted)))
142 goto ERROR5; 163 goto ERROR5;
143 164
144 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; 165 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION;
145 entry->offset = psiconv_buffer_unique_id(); 166 entry->offset = psiconv_buffer_unique_id();
146 if ((res = psiconv_list_add(section_table,entry))) 167 if ((res = psiconv_list_add(section_table,entry))) {
168 psiconv_error(config,lev+1,0,"Out of memory error");
147 goto ERROR5; 169 goto ERROR5;
170 }
148 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 171 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
172 psiconv_error(config,lev+1,0,"Out of memory error");
149 goto ERROR5; 173 goto ERROR5;
174 }
150 if ((res = psiconv_write_page_layout_section(config,buf,value->page_sec))) 175 if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
151 goto ERROR5; 176 goto ERROR5;
152 177
153 entry->id = PSICONV_ID_TEXTED; 178 entry->id = PSICONV_ID_TEXTED;
154 entry->offset = psiconv_buffer_unique_id(); 179 entry->offset = psiconv_buffer_unique_id();
155 if ((res = psiconv_list_add(section_table,entry))) 180 if ((res = psiconv_list_add(section_table,entry))) {
181 psiconv_error(config,lev+1,0,"Out of memory error");
156 goto ERROR5; 182 goto ERROR5;
183 }
157 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 184 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
185 psiconv_error(config,lev+1,0,"Out of memory error");
158 goto ERROR5; 186 goto ERROR5;
187 }
159 if ((res = psiconv_write_texted_section(config,buf,value->texted_sec, 188 if ((res = psiconv_write_texted_section(config,buf,lev+1,value->texted_sec,
160 base_char,base_para,&buf_texted))) 189 base_char,base_para,&buf_texted)))
161 goto ERROR5; 190 goto ERROR5;
162 191
163 if ((res = psiconv_buffer_concat(buf,buf_texted))) 192 if ((res = psiconv_buffer_concat(buf,buf_texted))) {
193 psiconv_error(config,lev+1,0,"Out of memory error");
164 goto ERROR6; 194 goto ERROR6;
195 }
165 196
166
167 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 197 if ((res = psiconv_buffer_add_target(buf,section_table_id))) {
198 psiconv_error(config,lev+1,0,"Out of memory error");
168 goto ERROR6; 199 goto ERROR6;
200 }
169 201
170 res = psiconv_write_section_table_section(config,buf,section_table); 202 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
171 203
172ERROR6: 204ERROR6:
173 psiconv_buffer_free(buf_texted); 205 psiconv_buffer_free(buf_texted);
174ERROR5: 206ERROR5:
175 psiconv_free_paragraph_layout(base_para); 207 psiconv_free_paragraph_layout(base_para);
… …
178ERROR3: 210ERROR3:
179 free(entry); 211 free(entry);
180ERROR2: 212ERROR2:
181 psiconv_list_free(section_table); 213 psiconv_list_free(section_table);
182ERROR1: 214ERROR1:
215 if (res)
216 psiconv_error(config,lev,0,"Writing of texted file failed");
217 else
218 psiconv_progress(config,lev,0,"End of texted file");
183 return res; 219 return res;
184} 220}
185 221
186int psiconv_write_word_file(const psiconv_config config, 222int psiconv_write_word_file(const psiconv_config config,
187 psiconv_buffer buf,psiconv_word_f value) 223 psiconv_buffer buf,int lev,psiconv_word_f value)
188{ 224{
189 int res; 225 int res;
190 psiconv_section_table_section section_table; 226 psiconv_section_table_section section_table;
191 psiconv_section_table_entry entry; 227 psiconv_section_table_entry entry;
192 psiconv_u32 section_table_id; 228 psiconv_u32 section_table_id;
193 229
230 psiconv_progress(config,lev,0,"Writing word file");
194 if (!value) { 231 if (!value) {
195 psiconv_warn(config,0,0,"Null Word file"); 232 psiconv_error(config,lev,0,"Null Word file");
196 return -PSICONV_E_GENERATE; 233 res = -PSICONV_E_GENERATE;
234 goto ERROR1;
197 } 235 }
198 236
199 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 237 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
238 psiconv_error(config,lev+1,0,"Out of memory error");
200 res = -PSICONV_E_NOMEM; 239 res = -PSICONV_E_NOMEM;
201 goto ERROR1; 240 goto ERROR1;
202 } 241 }
203 242
204 if (!(entry = malloc(sizeof(*entry)))) { 243 if (!(entry = malloc(sizeof(*entry)))) {
244 psiconv_error(config,lev+1,0,"Out of memory error");
205 res = -PSICONV_E_NOMEM; 245 res = -PSICONV_E_NOMEM;
206 goto ERROR2; 246 goto ERROR2;
207 } 247 }
208 248
209 section_table_id = psiconv_buffer_unique_id(); 249 section_table_id = psiconv_buffer_unique_id();
210 if ((res = psiconv_write_offset(config,buf,section_table_id))) 250 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
211 goto ERROR3; 251 goto ERROR3;
212 252
213 entry->id = PSICONV_ID_APPL_ID_SECTION; 253 entry->id = PSICONV_ID_APPL_ID_SECTION;
214 entry->offset = psiconv_buffer_unique_id(); 254 entry->offset = psiconv_buffer_unique_id();
215 if ((res = psiconv_list_add(section_table,entry))) 255 if ((res = psiconv_list_add(section_table,entry))) {
256 psiconv_error(config,lev+1,0,"Out of memory error");
216 goto ERROR3; 257 goto ERROR3;
258 }
217 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 259 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
260 psiconv_error(config,lev+1,0,"Out of memory error");
218 goto ERROR3; 261 goto ERROR3;
262 }
219 if ((res=psiconv_write_application_id_section(config,buf, 263 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
220 PSICONV_ID_WORD,"Word.app"))) 264 PSICONV_ID_WORD,unicode_word)))
221 goto ERROR3; 265 goto ERROR3;
222 266
223 entry->id = PSICONV_ID_WORD_STATUS_SECTION; 267 entry->id = PSICONV_ID_WORD_STATUS_SECTION;
224 entry->offset = psiconv_buffer_unique_id(); 268 entry->offset = psiconv_buffer_unique_id();
225 if ((res = psiconv_list_add(section_table,entry))) 269 if ((res = psiconv_list_add(section_table,entry))) {
270 psiconv_error(config,lev+1,0,"Out of memory error");
226 goto ERROR3; 271 goto ERROR3;
272 }
227 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 273 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
274 psiconv_error(config,lev+1,0,"Out of memory error");
228 goto ERROR3; 275 goto ERROR3;
276 }
229 if ((res = psiconv_write_word_status_section(config,buf,value->status_sec))) 277 if ((res = psiconv_write_word_status_section(config,buf,lev+1,value->status_sec)))
230 goto ERROR3; 278 goto ERROR3;
231 279
232 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; 280 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION;
233 entry->offset = psiconv_buffer_unique_id(); 281 entry->offset = psiconv_buffer_unique_id();
234 if ((res = psiconv_list_add(section_table,entry))) 282 if ((res = psiconv_list_add(section_table,entry))) {
283 psiconv_error(config,lev+1,0,"Out of memory error");
235 goto ERROR3; 284 goto ERROR3;
285 }
236 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 286 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
287 psiconv_error(config,lev+1,0,"Out of memory error");
237 goto ERROR3; 288 goto ERROR3;
289 }
238 if ((res = psiconv_write_page_layout_section(config,buf,value->page_sec))) 290 if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
239 goto ERROR3; 291 goto ERROR3;
240 292
241 entry->id = PSICONV_ID_WORD_STYLES_SECTION; 293 entry->id = PSICONV_ID_WORD_STYLES_SECTION;
242 entry->offset = psiconv_buffer_unique_id(); 294 entry->offset = psiconv_buffer_unique_id();
243 if ((res = psiconv_list_add(section_table,entry))) 295 if ((res = psiconv_list_add(section_table,entry))) {
296 psiconv_error(config,lev+1,0,"Out of memory error");
244 goto ERROR3; 297 goto ERROR3;
298 }
245 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 299 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
300 psiconv_error(config,lev+1,0,"Out of memory error");
246 goto ERROR3; 301 goto ERROR3;
302 }
247 if ((res = psiconv_write_word_styles_section(config,buf,value->styles_sec))) 303 if ((res = psiconv_write_word_styles_section(config,buf,lev+1,value->styles_sec)))
248 goto ERROR3; 304 goto ERROR3;
249 305
250 entry->id = PSICONV_ID_TEXT_SECTION; 306 entry->id = PSICONV_ID_TEXT_SECTION;
251 entry->offset = psiconv_buffer_unique_id(); 307 entry->offset = psiconv_buffer_unique_id();
252 if ((res = psiconv_list_add(section_table,entry))) 308 if ((res = psiconv_list_add(section_table,entry))) {
309 psiconv_error(config,lev+1,0,"Out of memory error");
253 goto ERROR3; 310 goto ERROR3;
311 }
254 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 312 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
313 psiconv_error(config,lev+1,0,"Out of memory error");
255 goto ERROR3; 314 goto ERROR3;
315 }
256 if ((res = psiconv_write_text_section(config,buf,value->paragraphs))) 316 if ((res = psiconv_write_text_section(config,buf,lev+1,value->paragraphs)))
257 goto ERROR3; 317 goto ERROR3;
258 318
259 entry->id = PSICONV_ID_LAYOUT_SECTION; 319 entry->id = PSICONV_ID_LAYOUT_SECTION;
260 entry->offset = psiconv_buffer_unique_id(); 320 entry->offset = psiconv_buffer_unique_id();
261 if ((res = psiconv_list_add(section_table,entry))) 321 if ((res = psiconv_list_add(section_table,entry))) {
322 psiconv_error(config,lev+1,0,"Out of memory error");
262 goto ERROR3; 323 goto ERROR3;
324 }
263 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 325 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
326 psiconv_error(config,lev+1,0,"Out of memory error");
264 goto ERROR3; 327 goto ERROR3;
328 }
265 if ((res = psiconv_write_styled_layout_section(config,buf,value->paragraphs, 329 if ((res = psiconv_write_styled_layout_section(config,buf,lev+1,value->paragraphs,
266 value->styles_sec))) 330 value->styles_sec)))
267 goto ERROR3; 331 goto ERROR3;
268 332
269 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 333 if ((res = psiconv_buffer_add_target(buf,section_table_id))) {
334 psiconv_error(config,lev+1,0,"Out of memory error");
270 goto ERROR3; 335 goto ERROR3;
336 }
271 337
272 res = psiconv_write_section_table_section(config,buf,section_table); 338 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
273 339
274ERROR3: 340ERROR3:
275 free(entry); 341 free(entry);
276ERROR2: 342ERROR2:
277 psiconv_list_free(section_table); 343 psiconv_list_free(section_table);
278ERROR1: 344ERROR1:
345 if (res)
346 psiconv_error(config,lev,0,"Writing of word file failed");
347 else
348 psiconv_progress(config,lev,0,"End of word file");
279 return res; 349 return res;
280} 350}
281 351
282int psiconv_write_sketch_file(const psiconv_config config, 352int psiconv_write_sketch_file(const psiconv_config config,
283 psiconv_buffer buf,psiconv_sketch_f value) 353 psiconv_buffer buf,int lev,psiconv_sketch_f value)
284{ 354{
285 int res; 355 int res;
286 psiconv_section_table_section section_table; 356 psiconv_section_table_section section_table;
287 psiconv_section_table_entry entry; 357 psiconv_section_table_entry entry;
288 psiconv_u32 section_table_id; 358 psiconv_u32 section_table_id;
289 359
360 psiconv_progress(config,lev,0,"Writing sketch file");
290 if (!value) { 361 if (!value) {
291 psiconv_warn(config,0,0,"Null Sketch file"); 362 psiconv_error(config,lev,0,"Null Sketch file");
292 return -PSICONV_E_GENERATE; 363 res = -PSICONV_E_GENERATE;
364 goto ERROR1;
293 } 365 }
294 366
295 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 367 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
368 psiconv_error(config,lev+1,0,"Out of memory error");
296 res = -PSICONV_E_NOMEM; 369 res = -PSICONV_E_NOMEM;
297 goto ERROR1; 370 goto ERROR1;
298 } 371 }
299 372
300 if (!(entry = malloc(sizeof(*entry)))) { 373 if (!(entry = malloc(sizeof(*entry)))) {
374 psiconv_error(config,lev+1,0,"Out of memory error");
301 res = -PSICONV_E_NOMEM; 375 res = -PSICONV_E_NOMEM;
302 goto ERROR2; 376 goto ERROR2;
303 } 377 }
304 378
305 section_table_id = psiconv_buffer_unique_id(); 379 section_table_id = psiconv_buffer_unique_id();
306 if ((res = psiconv_write_offset(config,buf,section_table_id))) 380 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
307 goto ERROR3; 381 goto ERROR3;
308 382
309 entry->id = PSICONV_ID_APPL_ID_SECTION; 383 entry->id = PSICONV_ID_APPL_ID_SECTION;
310 entry->offset = psiconv_buffer_unique_id(); 384 entry->offset = psiconv_buffer_unique_id();
311 if ((res = psiconv_list_add(section_table,entry))) 385 if ((res = psiconv_list_add(section_table,entry))) {
386 psiconv_error(config,lev+1,0,"Out of memory error");
312 goto ERROR3; 387 goto ERROR3;
388 }
313 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 389 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
390 psiconv_error(config,lev+1,0,"Out of memory error");
314 goto ERROR3; 391 goto ERROR3;
392 }
315 if ((res=psiconv_write_application_id_section(config,buf, 393 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
316 PSICONV_ID_SKETCH,"Paint.app"))) 394 PSICONV_ID_SKETCH,unicode_paint)))
317 goto ERROR3; 395 goto ERROR3;
318 396
319 entry->id = PSICONV_ID_SKETCH_SECTION; 397 entry->id = PSICONV_ID_SKETCH_SECTION;
320 entry->offset = psiconv_buffer_unique_id(); 398 entry->offset = psiconv_buffer_unique_id();
321 if ((res = psiconv_list_add(section_table,entry))) 399 if ((res = psiconv_list_add(section_table,entry))) {
400 psiconv_error(config,lev+1,0,"Out of memory error");
322 goto ERROR3; 401 goto ERROR3;
402 }
323 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 403 if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
404 psiconv_error(config,lev+1,0,"Out of memory error");
324 goto ERROR3; 405 goto ERROR3;
406 }
325 if ((res = psiconv_write_sketch_section(config,buf,value->sketch_sec))) 407 if ((res = psiconv_write_sketch_section(config,buf,lev+1,value->sketch_sec)))
326 goto ERROR3; 408 goto ERROR3;
327 409
328 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 410 if ((res = psiconv_buffer_add_target(buf,section_table_id))) {
411 psiconv_error(config,lev+1,0,"Out of memory error");
329 goto ERROR3; 412 goto ERROR3;
413 }
330 res = psiconv_write_section_table_section(config,buf,section_table); 414 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
331 415
332ERROR3: 416ERROR3:
333 free(entry); 417 free(entry);
334ERROR2: 418ERROR2:
335 psiconv_list_free(section_table); 419 psiconv_list_free(section_table);
336ERROR1: 420ERROR1:
421 if (res)
422 psiconv_error(config,lev,0,"Writing of sketch file failed");
423 else
424 psiconv_progress(config,lev,0,"End of sketch file");
337 return res; 425 return res;
338} 426}
339 427
340int psiconv_write_mbm_file(const psiconv_config config, 428int psiconv_write_mbm_file(const psiconv_config config,
341 psiconv_buffer buf,psiconv_mbm_f value) 429 psiconv_buffer buf,int lev,psiconv_mbm_f value)
342{ 430{
343 int res,i; 431 int res,i;
344 psiconv_jumptable_section jumptable; 432 psiconv_jumptable_section jumptable;
345 psiconv_u32 *entry,id,table_id; 433 psiconv_u32 *entry,id,table_id;
346 psiconv_paint_data_section section; 434 psiconv_paint_data_section section;
347 435
436 psiconv_progress(config,lev,0,"Writing mbm file");
348 if (!value) { 437 if (!value) {
349 psiconv_warn(config,0,0,"Null MBM file"); 438 psiconv_error(config,lev,0,"Null MBM file");
350 return -PSICONV_E_GENERATE; 439 res = -PSICONV_E_GENERATE;
440 goto ERROR1;
351 } 441 }
352 442
353 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) { 443 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
444 psiconv_error(config,lev+1,0,"Out of memory error");
354 res = -PSICONV_E_NOMEM; 445 res = -PSICONV_E_NOMEM;
355 goto ERROR1; 446 goto ERROR1;
356 } 447 }
357 448
358 table_id = psiconv_buffer_unique_id(); 449 table_id = psiconv_buffer_unique_id();
359 if ((res = psiconv_buffer_add_reference(buf,table_id))) 450 if ((res = psiconv_buffer_add_reference(buf,table_id))) {
451 psiconv_error(config,lev+1,0,"Out of memory error");
360 goto ERROR2; 452 goto ERROR2;
453 }
361 454
362 for (i = 0; i < psiconv_list_length(value->sections); i++) { 455 for (i = 0; i < psiconv_list_length(value->sections); i++) {
363 if (!(section = psiconv_list_get(value->sections,i))) { 456 if (!(section = psiconv_list_get(value->sections,i))) {
364 psiconv_warn(config,0,0,"Massive memory corruption"); 457 psiconv_error(config,lev,0,"Data structure corruption");
365 res = -PSICONV_E_NOMEM; 458 res = -PSICONV_E_NOMEM;
366 goto ERROR2; 459 goto ERROR2;
367 } 460 }
368 id = psiconv_buffer_unique_id(); 461 id = psiconv_buffer_unique_id();
369 psiconv_list_add(jumptable,&id); 462 if ((res = psiconv_list_add(jumptable,&id))) {
370 if ((res = psiconv_buffer_add_target(buf,id))) 463 psiconv_error(config,lev+1,0,"Out of memory error");
371 goto ERROR2; 464 goto ERROR2;
372 if ((res = psiconv_write_paint_data_section(config,buf,section,0))) 465 }
466 if ((res = psiconv_buffer_add_target(buf,id))) {
467 psiconv_error(config,lev+1,0,"Out of memory error");
373 goto ERROR2; 468 goto ERROR2;
374 } 469 }
470 if ((res = psiconv_write_paint_data_section(config,buf,lev+1,section,0)))
471 goto ERROR2;
472 }
375 473
376 if ((res = psiconv_buffer_add_target(buf,table_id))) 474 if ((res = psiconv_buffer_add_target(buf,table_id))) {
475 psiconv_error(config,lev+1,0,"Out of memory error");
377 goto ERROR2; 476 goto ERROR2;
477 }
378 if ((res = psiconv_write_jumptable_section(config,buf,jumptable))) 478 if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
379 goto ERROR2; 479 goto ERROR2;
380 480
381 481
382ERROR2: 482ERROR2:
383 psiconv_list_free(jumptable); 483 psiconv_list_free(jumptable);
384ERROR1: 484ERROR1:
485 if (res)
486 psiconv_error(config,lev,0,"Writing of mbm file failed");
487 else
488 psiconv_progress(config,lev,0,"End of mbm file");
385 return res; 489 return res;
386} 490}
387 491
388/* Note: this file is special, because it does not have a complete header! */ 492/* Note: this file is special, because it does not have a complete header! */
389int psiconv_write_clipart_file(const psiconv_config config, 493int psiconv_write_clipart_file(const psiconv_config config,
390 psiconv_buffer buf,psiconv_clipart_f value) 494 psiconv_buffer buf,int lev,psiconv_clipart_f value)
391{ 495{
392 int res,i; 496 int res,i;
393 psiconv_jumptable_section jumptable; 497 psiconv_jumptable_section jumptable;
394 psiconv_u32 *entry,id; 498 psiconv_u32 *entry,id;
395 psiconv_clipart_section section; 499 psiconv_clipart_section section;
396 psiconv_buffer sec_buf; 500 psiconv_buffer sec_buf;
397 501
502 psiconv_progress(config,lev,0,"Writing clipart file");
398 if (!value) { 503 if (!value) {
399 psiconv_warn(config,0,0,"Null Clipart file"); 504 psiconv_error(config,lev,0,"Null Clipart file");
400 return -PSICONV_E_GENERATE; 505 res = -PSICONV_E_GENERATE;
506 goto ERROR1;
401 } 507 }
402 508
403 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) { 509 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
510 psiconv_error(config,lev+1,0,"Out of memory error");
404 res = -PSICONV_E_NOMEM; 511 res = -PSICONV_E_NOMEM;
405 goto ERROR1; 512 goto ERROR1;
406 } 513 }
407 514
408 if (!(sec_buf = psiconv_buffer_new())) { 515 if (!(sec_buf = psiconv_buffer_new())) {
516 psiconv_error(config,lev+1,0,"Out of memory error");
409 res = -PSICONV_E_NOMEM; 517 res = -PSICONV_E_NOMEM;
410 goto ERROR2; 518 goto ERROR2;
411 } 519 }
412 520
413 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_CLIPART))) 521 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_CLIPART)))
414 goto ERROR3; 522 goto ERROR3;
415 523
416 for (i = 0; i < psiconv_list_length(value->sections); i++) { 524 for (i = 0; i < psiconv_list_length(value->sections); i++) {
417 if (!(section = psiconv_list_get(value->sections,i))) { 525 if (!(section = psiconv_list_get(value->sections,i))) {
418 psiconv_warn(config,0,0,"Massive memory corruption"); 526 psiconv_error(config,lev,0,"Data structure corruption");
419 res = -PSICONV_E_NOMEM; 527 res = -PSICONV_E_NOMEM;
420 goto ERROR3; 528 goto ERROR3;
421 } 529 }
422 id = psiconv_buffer_unique_id(); 530 id = psiconv_buffer_unique_id();
423 psiconv_list_add(jumptable,&id); 531 if ((res = psiconv_list_add(jumptable,&id))) {
424 if ((res = psiconv_buffer_add_target(sec_buf,id))) 532 psiconv_error(config,lev+1,0,"Out of memory error");
425 goto ERROR3; 533 goto ERROR3;
426 if ((res = psiconv_write_clipart_section(config,sec_buf, section))) 534 }
535 if ((res = psiconv_buffer_add_target(sec_buf,id))) {
536 psiconv_error(config,lev+1,0,"Out of memory error");
427 goto ERROR3; 537 goto ERROR3;
428 } 538 }
539 if ((res = psiconv_write_clipart_section(config,sec_buf, lev+1,section)))
540 goto ERROR3;
541 }
429 542
430 if ((res = psiconv_write_jumptable_section(config,buf,jumptable))) 543 if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
431 goto ERROR3; 544 goto ERROR3;
432 545
433 if ((res = psiconv_buffer_concat(buf,sec_buf))) 546 if ((res = psiconv_buffer_concat(buf,sec_buf))) {
547 psiconv_error(config,lev+1,0,"Out of memory error");
434 goto ERROR3; 548 goto ERROR3;
549 }
435 550
436 551
437ERROR3: 552ERROR3:
438 psiconv_buffer_free(sec_buf); 553 psiconv_buffer_free(sec_buf);
439ERROR2: 554ERROR2:
440 psiconv_list_free(jumptable); 555 psiconv_list_free(jumptable);
441ERROR1: 556ERROR1:
557 if (res)
558 psiconv_error(config,lev,0,"Writing of clipart file failed");
559 else
560 psiconv_progress(config,lev,0,"End of clipart file");
442 return res; 561 return res;
443} 562}
Legend:
Removed from v.174  
changed lines
  Added in v.270
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26