--- psiconv/trunk/lib/psiconv/generate_driver.c 2004/01/04 22:20:43 183 +++ psiconv/trunk/lib/psiconv/generate_driver.c 2004/01/06 20:15:01 184 @@ -29,57 +29,62 @@ #include #endif +static psiconv_ucs2 unicode_paint[10] = { 'P','a','i','n','t','.','a','p','p',0 }; +static psiconv_ucs2 unicode_texted[11] ={ 'T','e','x','t','E','d','.','a','p','p',0 }; +static psiconv_ucs2 unicode_word[9] = { 'W','o','r','d','.','a','p','p',0 }; + int psiconv_write(const psiconv_config config, psiconv_buffer *buf, const psiconv_file value) { int res; + int lev = 0; if (!value) { - psiconv_warn(config,0,0,"Can't parse to an empty buffer!"); + psiconv_error(config,0,0,"Can't parse to an empty buffer!"); return -PSICONV_E_OTHER; } if (!(*buf = psiconv_buffer_new())) return -PSICONV_E_NOMEM; if (value->type == psiconv_word_file) { - if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, + if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5, PSICONV_ID_DATA_FILE, PSICONV_ID_WORD))) goto ERROR; - if ((res =psiconv_write_word_file(config,*buf,(psiconv_word_f) (value->file)))) + if ((res =psiconv_write_word_file(config,*buf,lev+1,(psiconv_word_f) (value->file)))) goto ERROR; } else if (value->type == psiconv_texted_file) { - if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, + if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5, PSICONV_ID_DATA_FILE, PSICONV_ID_TEXTED))) goto ERROR; - if ((res =psiconv_write_texted_file(config,*buf, + if ((res =psiconv_write_texted_file(config,*buf,lev+1, (psiconv_texted_f) (value->file)))) goto ERROR; } else if (value->type == psiconv_sketch_file) { - if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, + if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5, PSICONV_ID_DATA_FILE, PSICONV_ID_SKETCH))) goto ERROR; - if ((res =psiconv_write_sketch_file(config,*buf, + if ((res =psiconv_write_sketch_file(config,*buf,lev+1, (psiconv_sketch_f) (value->file)))) goto ERROR; } else if (value->type == psiconv_mbm_file) { - if ((res = psiconv_write_header_section(config,*buf,PSICONV_ID_PSION5, + if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5, PSICONV_ID_MBM_FILE, 0x00000000))) goto ERROR; - if ((res =psiconv_write_mbm_file(config,*buf, + if ((res =psiconv_write_mbm_file(config,*buf,lev+1, (psiconv_mbm_f) (value->file)))) goto ERROR; } else if (value->type == psiconv_clipart_file) { /* No complete header section, so we do it all in the below function */ - if ((res =psiconv_write_clipart_file(config,*buf, + if ((res =psiconv_write_clipart_file(config,*buf,lev+1, (psiconv_clipart_f) (value->file)))) goto ERROR; } else { - psiconv_warn(config,0,0,"Unknown or unsupported file type"); + psiconv_error(config,0,0,"Unknown or unsupported file type"); res = -PSICONV_E_GENERATE; goto ERROR; } @@ -93,7 +98,7 @@ } int psiconv_write_texted_file(const psiconv_config config, - psiconv_buffer buf,psiconv_texted_f value) + psiconv_buffer buf,int lev,psiconv_texted_f value) { psiconv_character_layout base_char; psiconv_paragraph_layout base_para; @@ -103,8 +108,9 @@ psiconv_u32 section_table_id; psiconv_buffer buf_texted; + psiconv_progress(config,lev,0,"Writing texted file"); if (!value) { - psiconv_warn(config,0,0,"Null TextEd file"); + psiconv_error(config,0,0,"Null TextEd file"); return -PSICONV_E_GENERATE; } @@ -128,7 +134,7 @@ } section_table_id = psiconv_buffer_unique_id(); - if ((res = psiconv_write_offset(config,buf,section_table_id))) + if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id))) goto ERROR5; entry->id = PSICONV_ID_APPL_ID_SECTION; @@ -137,8 +143,8 @@ goto ERROR5; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR5; - if ((res=psiconv_write_application_id_section(config,buf, - PSICONV_ID_TEXTED,"TextEd.app"))) + if ((res=psiconv_write_application_id_section(config,buf,lev+1, + PSICONV_ID_TEXTED,unicode_texted))) goto ERROR5; entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; @@ -147,7 +153,7 @@ goto ERROR5; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR5; - if ((res = psiconv_write_page_layout_section(config,buf,value->page_sec))) + if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec))) goto ERROR5; entry->id = PSICONV_ID_TEXTED; @@ -156,7 +162,7 @@ goto ERROR5; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR5; - if ((res = psiconv_write_texted_section(config,buf,value->texted_sec, + if ((res = psiconv_write_texted_section(config,buf,lev+1,value->texted_sec, base_char,base_para,&buf_texted))) goto ERROR5; @@ -167,7 +173,7 @@ if ((res = psiconv_buffer_add_target(buf,section_table_id))) goto ERROR6; - res = psiconv_write_section_table_section(config,buf,section_table); + res = psiconv_write_section_table_section(config,buf,lev+1,section_table); ERROR6: psiconv_buffer_free(buf_texted); @@ -184,15 +190,16 @@ } int psiconv_write_word_file(const psiconv_config config, - psiconv_buffer buf,psiconv_word_f value) + psiconv_buffer buf,int lev,psiconv_word_f value) { int res; psiconv_section_table_section section_table; psiconv_section_table_entry entry; psiconv_u32 section_table_id; + psiconv_progress(config,lev,0,"Writing word file"); if (!value) { - psiconv_warn(config,0,0,"Null Word file"); + psiconv_error(config,0,0,"Null Word file"); return -PSICONV_E_GENERATE; } @@ -207,7 +214,7 @@ } section_table_id = psiconv_buffer_unique_id(); - if ((res = psiconv_write_offset(config,buf,section_table_id))) + if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id))) goto ERROR3; entry->id = PSICONV_ID_APPL_ID_SECTION; @@ -216,8 +223,8 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res=psiconv_write_application_id_section(config,buf, - PSICONV_ID_WORD,"Word.app"))) + if ((res=psiconv_write_application_id_section(config,buf,lev+1, + PSICONV_ID_WORD,unicode_word))) goto ERROR3; entry->id = PSICONV_ID_WORD_STATUS_SECTION; @@ -226,7 +233,7 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res = psiconv_write_word_status_section(config,buf,value->status_sec))) + if ((res = psiconv_write_word_status_section(config,buf,lev+1,value->status_sec))) goto ERROR3; entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; @@ -235,7 +242,7 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res = psiconv_write_page_layout_section(config,buf,value->page_sec))) + if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec))) goto ERROR3; entry->id = PSICONV_ID_WORD_STYLES_SECTION; @@ -244,7 +251,7 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res = psiconv_write_word_styles_section(config,buf,value->styles_sec))) + if ((res = psiconv_write_word_styles_section(config,buf,lev+1,value->styles_sec))) goto ERROR3; entry->id = PSICONV_ID_TEXT_SECTION; @@ -253,7 +260,7 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res = psiconv_write_text_section(config,buf,value->paragraphs))) + if ((res = psiconv_write_text_section(config,buf,lev+1,value->paragraphs))) goto ERROR3; entry->id = PSICONV_ID_LAYOUT_SECTION; @@ -262,14 +269,14 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res = psiconv_write_styled_layout_section(config,buf,value->paragraphs, + if ((res = psiconv_write_styled_layout_section(config,buf,lev+1,value->paragraphs, value->styles_sec))) goto ERROR3; if ((res = psiconv_buffer_add_target(buf,section_table_id))) goto ERROR3; - res = psiconv_write_section_table_section(config,buf,section_table); + res = psiconv_write_section_table_section(config,buf,lev+1,section_table); ERROR3: free(entry); @@ -280,15 +287,16 @@ } int psiconv_write_sketch_file(const psiconv_config config, - psiconv_buffer buf,psiconv_sketch_f value) + psiconv_buffer buf,int lev,psiconv_sketch_f value) { int res; psiconv_section_table_section section_table; psiconv_section_table_entry entry; psiconv_u32 section_table_id; + psiconv_progress(config,lev,0,"Writing sketch file"); if (!value) { - psiconv_warn(config,0,0,"Null Sketch file"); + psiconv_error(config,0,0,"Null Sketch file"); return -PSICONV_E_GENERATE; } @@ -303,7 +311,7 @@ } section_table_id = psiconv_buffer_unique_id(); - if ((res = psiconv_write_offset(config,buf,section_table_id))) + if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id))) goto ERROR3; entry->id = PSICONV_ID_APPL_ID_SECTION; @@ -312,8 +320,8 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res=psiconv_write_application_id_section(config,buf, - PSICONV_ID_SKETCH,"Paint.app"))) + if ((res=psiconv_write_application_id_section(config,buf,lev+1, + PSICONV_ID_SKETCH,unicode_paint))) goto ERROR3; entry->id = PSICONV_ID_SKETCH_SECTION; @@ -322,12 +330,12 @@ goto ERROR3; if ((res = psiconv_buffer_add_target(buf,entry->offset))) goto ERROR3; - if ((res = psiconv_write_sketch_section(config,buf,value->sketch_sec))) + if ((res = psiconv_write_sketch_section(config,buf,lev+1,value->sketch_sec))) goto ERROR3; if ((res = psiconv_buffer_add_target(buf,section_table_id))) goto ERROR3; - res = psiconv_write_section_table_section(config,buf,section_table); + res = psiconv_write_section_table_section(config,buf,lev+1,section_table); ERROR3: free(entry); @@ -338,15 +346,16 @@ } int psiconv_write_mbm_file(const psiconv_config config, - psiconv_buffer buf,psiconv_mbm_f value) + psiconv_buffer buf,int lev,psiconv_mbm_f value) { int res,i; psiconv_jumptable_section jumptable; psiconv_u32 *entry,id,table_id; psiconv_paint_data_section section; + psiconv_progress(config,lev,0,"Writing mbm file"); if (!value) { - psiconv_warn(config,0,0,"Null MBM file"); + psiconv_error(config,0,0,"Null MBM file"); return -PSICONV_E_GENERATE; } @@ -361,7 +370,7 @@ for (i = 0; i < psiconv_list_length(value->sections); i++) { if (!(section = psiconv_list_get(value->sections,i))) { - psiconv_warn(config,0,0,"Massive memory corruption"); + psiconv_error(config,0,0,"Massive memory corruption"); res = -PSICONV_E_NOMEM; goto ERROR2; } @@ -369,13 +378,13 @@ psiconv_list_add(jumptable,&id); if ((res = psiconv_buffer_add_target(buf,id))) goto ERROR2; - if ((res = psiconv_write_paint_data_section(config,buf,section,0))) + if ((res = psiconv_write_paint_data_section(config,buf,lev+1,section,0))) goto ERROR2; } if ((res = psiconv_buffer_add_target(buf,table_id))) goto ERROR2; - if ((res = psiconv_write_jumptable_section(config,buf,jumptable))) + if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable))) goto ERROR2; @@ -387,7 +396,7 @@ /* Note: this file is special, because it does not have a complete header! */ int psiconv_write_clipart_file(const psiconv_config config, - psiconv_buffer buf,psiconv_clipart_f value) + psiconv_buffer buf,int lev,psiconv_clipart_f value) { int res,i; psiconv_jumptable_section jumptable; @@ -395,8 +404,9 @@ psiconv_clipart_section section; psiconv_buffer sec_buf; + psiconv_progress(config,lev,0,"Writing clipart file"); if (!value) { - psiconv_warn(config,0,0,"Null Clipart file"); + psiconv_error(config,0,0,"Null Clipart file"); return -PSICONV_E_GENERATE; } @@ -410,12 +420,12 @@ goto ERROR2; } - if ((res = psiconv_write_u32(config,buf,PSICONV_ID_CLIPART))) + if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_CLIPART))) goto ERROR3; for (i = 0; i < psiconv_list_length(value->sections); i++) { if (!(section = psiconv_list_get(value->sections,i))) { - psiconv_warn(config,0,0,"Massive memory corruption"); + psiconv_error(config,0,0,"Massive memory corruption"); res = -PSICONV_E_NOMEM; goto ERROR3; } @@ -423,11 +433,11 @@ psiconv_list_add(jumptable,&id); if ((res = psiconv_buffer_add_target(sec_buf,id))) goto ERROR3; - if ((res = psiconv_write_clipart_section(config,sec_buf, section))) + if ((res = psiconv_write_clipart_section(config,sec_buf, lev+1,section))) goto ERROR3; } - if ((res = psiconv_write_jumptable_section(config,buf,jumptable))) + if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable))) goto ERROR3; if ((res = psiconv_buffer_concat(buf,sec_buf)))