--- psiconv/trunk/lib/psiconv/generate_common.c 2003/11/25 22:08:48 170 +++ psiconv/trunk/lib/psiconv/generate_common.c 2004/01/06 20:15:01 184 @@ -30,65 +30,68 @@ #endif static int psiconv_write_layout_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf, int lev, const psiconv_text_and_layout value, const psiconv_word_styles_section styles, int with_styles); /* Maybe use a psiconv_header_section variable instead? */ int psiconv_write_header_section(const psiconv_config config, - psiconv_buffer buf,psiconv_u32 uid1, + psiconv_buffer buf,int lev,psiconv_u32 uid1, psiconv_u32 uid2, psiconv_u32 uid3) { int res; - if ((res = psiconv_write_u32(config,buf,uid1))) + psiconv_progress(config,lev,0,"Writing header section"); + if ((res = psiconv_write_u32(config,buf,lev+1,uid1))) return res; - if ((res = psiconv_write_u32(config,buf,uid2))) + if ((res = psiconv_write_u32(config,buf,lev+1,uid2))) return res; - if ((res = psiconv_write_u32(config,buf,uid3))) + if ((res = psiconv_write_u32(config,buf,lev+1,uid3))) return res; - return psiconv_write_u32(config,buf,psiconv_checkuid(uid1,uid2,uid3)); + return psiconv_write_u32(config,buf,lev+1,psiconv_checkuid(uid1,uid2,uid3)); } int psiconv_write_section_table_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, const psiconv_section_table_section value) { int res,i; psiconv_section_table_entry entry; + psiconv_progress(config,lev,0,"Writing section table section"); if (!value) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Null section table section"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Null section table section"); return -PSICONV_E_GENERATE; } - if ((res = psiconv_write_u8(config,buf,2 * psiconv_list_length(value)))) + if ((res = psiconv_write_u8(config,buf,lev+1,2 * psiconv_list_length(value)))) return res; for (i = 0; i < psiconv_list_length(value); i++) { if (!(entry = psiconv_list_get(value,i))) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); return -PSICONV_E_NOMEM; } - if ((res = psiconv_write_u32(config,buf,entry->id))) + if ((res = psiconv_write_u32(config,buf,lev+1,entry->id))) return res; - if ((res = psiconv_write_offset(config,buf,entry->offset))) + if ((res = psiconv_write_offset(config,buf,lev+1,entry->offset))) return res; } return -PSICONV_E_OK; } int psiconv_write_application_id_section(const psiconv_config config, - psiconv_buffer buf,psiconv_u32 id, + psiconv_buffer buf,int lev,psiconv_u32 id, const psiconv_string_t text) { int res; - if ((res = psiconv_write_u32(config,buf,id))) + psiconv_progress(config,lev,0,"Writing application id section"); + if ((res = psiconv_write_u32(config,buf,lev+1,id))) return res; - return psiconv_write_string(config,buf,text); + return psiconv_write_string(config,buf,lev+1,text); } int psiconv_write_text_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, const psiconv_text_and_layout value) { int res; @@ -96,8 +99,9 @@ int i,j; psiconv_paragraph paragraph; + psiconv_progress(config,lev,0,"Writing text section"); if (!value) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Null text section"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Null text section"); return -PSICONV_E_GENERATE; } @@ -106,21 +110,22 @@ return -PSICONV_E_NOMEM; for (i = 0; i < psiconv_list_length(value); i++) { if (!(paragraph = psiconv_list_get(value,i))) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); - res = -PSICONV_E_OTHER; + psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); + res = -PSICONV_E_NOMEM; goto ERROR; } - for (j = 0; j < strlen(paragraph->text); j++) - if ((res = psiconv_write_u8(config,extra_buf,paragraph->text[j]))) + for (j = 0; j < psiconv_unicode_strlen(paragraph->text); j++) + if ((res = psiconv_write_u8(config,extra_buf,lev+1, + psiconv_unicode_to_char(config,paragraph->text[j])))) goto ERROR; - psiconv_write_u8(config,extra_buf,0x06); + psiconv_write_u8(config,extra_buf,lev+1,0x06); } - if ((res = psiconv_write_X(config,buf,psiconv_buffer_length(extra_buf)))) + if ((res = psiconv_write_X(config,buf,lev+1,psiconv_buffer_length(extra_buf)))) goto ERROR; res = psiconv_buffer_concat(buf,extra_buf); } else /* Hack: empty text sections are just not allowed */ - return psiconv_write_u16(config,buf,0x0602); + return psiconv_write_u16(config,buf,lev+1,0x0602); ERROR: psiconv_buffer_free(extra_buf); @@ -128,7 +133,7 @@ } int psiconv_write_layout_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, const psiconv_text_and_layout value, const psiconv_word_styles_section styles, int with_styles) @@ -151,8 +156,9 @@ psiconv_character_layout para_charlayout; int i,j,para_type,nr_of_inlines=0,res,ptl_length,pel_length,thislen,paralen; + psiconv_progress(config,lev,0,"Writing layout section"); if (!value) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Null text section"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Null text section"); return -PSICONV_E_GENERATE; } @@ -183,11 +189,12 @@ for (i = 0; i < psiconv_list_length(value); i++) { if (!(paragraph = psiconv_list_get(value,i))) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); - res = -PSICONV_E_OTHER; + psiconv_error(config,0,psiconv_buffer_length(buf),"Massive memory corruption"); + res = -PSICONV_E_NOMEM; goto ERROR6; } - if ((res = psiconv_write_u32(config,buf_elements,strlen(paragraph->text)+1))) + if ((res = psiconv_write_u32(config,buf_elements,lev+1, + psiconv_unicode_strlen(paragraph->text)+1))) goto ERROR6; /* We need it for the next if-statement */ @@ -200,21 +207,21 @@ (in_line->object != NULL))) { /* Inline layouts, or an object, so we generate a paragraph element and inline elements */ - if ((res = psiconv_write_u8(config,buf_elements,0x00))) + if ((res = psiconv_write_u8(config,buf_elements,lev+1,0x00))) goto ERROR6; if (!(style = psiconv_get_style(styles,paragraph->base_style))) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Unknown style"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style"); res = -PSICONV_E_GENERATE; goto ERROR6; } - if ((res = psiconv_write_paragraph_layout_list(config,buf_elements, + if ((res = psiconv_write_paragraph_layout_list(config,buf_elements,lev+1, paragraph->base_paragraph, style->paragraph))) goto ERROR6; if (with_styles) - if ((res = psiconv_write_u8(config,buf_elements,paragraph->base_style))) + if ((res = psiconv_write_u8(config,buf_elements,lev+1,paragraph->base_style))) goto ERROR6; - if ((res = psiconv_write_u32(config,buf_elements, + if ((res = psiconv_write_u32(config,buf_elements,lev+1, psiconv_list_length(paragraph->in_lines)))) goto ERROR6; @@ -223,44 +230,44 @@ for (j = 0; j < psiconv_list_length(paragraph->in_lines); j++) { nr_of_inlines ++; if (!(in_line = psiconv_list_get(paragraph->in_lines,j))) { - psiconv_warn(config,0,psiconv_buffer_length(buf), + psiconv_error(config,0,psiconv_buffer_length(buf), "Massive memory corruption"); - res = -PSICONV_E_OTHER; + res = -PSICONV_E_NOMEM; goto ERROR6; } - if ((res = psiconv_write_u8(config,buf_inlines,in_line->object?0x01:0x00))) + if ((res = psiconv_write_u8(config,buf_inlines,lev+1,in_line->object?0x01:0x00))) goto ERROR6; thislen = in_line->length; paralen += thislen; /* If this is the last in_line, we need to make sure that the complete length of all inlines equals the text length */ if (j == psiconv_list_length(paragraph->in_lines)-1) { - if (paralen > strlen(paragraph->text)+1) { + if (paralen > psiconv_unicode_strlen(paragraph->text)+1) { res = -PSICONV_E_GENERATE; goto ERROR6; } - thislen += strlen(paragraph->text)+1-paralen; + thislen += psiconv_unicode_strlen(paragraph->text)+1-paralen; } - if ((res = psiconv_write_u32(config,buf_inlines,thislen))) + if ((res = psiconv_write_u32(config,buf_inlines,lev+1,thislen))) goto ERROR6; - if ((res = psiconv_write_character_layout_list(config,buf_inlines, + if ((res = psiconv_write_character_layout_list(config,buf_inlines,lev+1, in_line->layout, style->character))) goto ERROR6; if (in_line->object) { - if ((res = psiconv_write_u32(config,buf_inlines,PSICONV_ID_OBJECT))) + if ((res = psiconv_write_u32(config,buf_inlines,lev+1,PSICONV_ID_OBJECT))) goto ERROR6; obj_id = psiconv_buffer_unique_id(); if ((res = psiconv_buffer_add_reference(buf_inlines,obj_id))) goto ERROR6; if ((res = psiconv_buffer_add_target(buf_objects,obj_id))) goto ERROR6; - if ((res = psiconv_write_embedded_object_section(config,buf_objects, + if ((res = psiconv_write_embedded_object_section(config,buf_objects,lev+1, in_line->object))) goto ERROR6; - if ((res = psiconv_write_length(config,buf_inlines,in_line->object_width))) + if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_width))) goto ERROR6; - if ((res = psiconv_write_length(config,buf_inlines,in_line->object_height))) + if ((res = psiconv_write_length(config,buf_inlines,lev+1,in_line->object_height))) goto ERROR6; } } @@ -272,18 +279,18 @@ para_charlayout = paragraph->base_character; else { if (!(in_line = psiconv_list_get(paragraph->in_lines,0))) { - psiconv_warn(config,0,psiconv_buffer_length(buf), + psiconv_error(config,0,psiconv_buffer_length(buf), "Massive memory corruption"); - res = -PSICONV_E_OTHER; + res = -PSICONV_E_NOMEM; goto ERROR6; } para_charlayout = in_line->layout; } for (j = 0; j < psiconv_list_length(paragraph_type_list); j++) { if (!(paragraph_type = psiconv_list_get(paragraph_type_list,j))) { - psiconv_warn(config,0,psiconv_buffer_length(buf), + psiconv_error(config,0,psiconv_buffer_length(buf), "Massive memory corruption"); - res = -PSICONV_E_OTHER; + res = -PSICONV_E_NOMEM; goto ERROR6; } if ((paragraph->base_style == paragraph_type->style) && @@ -305,43 +312,43 @@ paragraph_type = &new_type; if ((res = psiconv_list_add(paragraph_type_list,paragraph_type))) goto ERROR6; - if ((res = psiconv_write_u32(config,buf_types,paragraph_type->nr))) + if ((res = psiconv_write_u32(config,buf_types,lev+1,paragraph_type->nr))) goto ERROR6; if (!(style = psiconv_get_style(styles,paragraph_type->style))) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Unknown style"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Unknown style"); res = -PSICONV_E_GENERATE; goto ERROR6; } - if ((res = psiconv_write_paragraph_layout_list(config,buf_types, + if ((res = psiconv_write_paragraph_layout_list(config,buf_types,lev+1, paragraph_type->paragraph,style->paragraph))) goto ERROR6; if (with_styles) - if ((res = psiconv_write_u8(config,buf_types,paragraph_type->style))) + if ((res = psiconv_write_u8(config,buf_types,lev+1,paragraph_type->style))) goto ERROR6; - if ((res = psiconv_write_character_layout_list(config,buf_types, + if ((res = psiconv_write_character_layout_list(config,buf_types,lev+1, paragraph_type->character,style->character))) goto ERROR6; } - if ((res = psiconv_write_u8(config,buf_elements,para_type))) + if ((res = psiconv_write_u8(config,buf_elements,lev+1,para_type))) goto ERROR6; } } /* HACK: special case: no paragraphs at all. We need to improvize. */ if (!psiconv_list_length(value)) { - if ((res = psiconv_write_u32(config,buf_types,1))) + if ((res = psiconv_write_u32(config,buf_types,lev+1,1))) goto ERROR6; - if ((res = psiconv_write_u32(config,buf_types,0))) + if ((res = psiconv_write_u32(config,buf_types,lev+1,0))) goto ERROR6; if (with_styles) - if ((res = psiconv_write_u8(config,buf_types,0))) + if ((res = psiconv_write_u8(config,buf_types,lev+1,0))) goto ERROR6; - if ((res = psiconv_write_u32(config,buf_types,0))) + if ((res = psiconv_write_u32(config,buf_types,lev+1,0))) goto ERROR6; - if ((res = psiconv_write_u32(config,buf_elements,1))) + if ((res = psiconv_write_u32(config,buf_elements,lev+1,1))) goto ERROR6; - if ((res = psiconv_write_u8(config,buf_elements,1))) + if ((res = psiconv_write_u8(config,buf_elements,lev+1,1))) goto ERROR6; pel_length = 1; ptl_length = 1; @@ -351,17 +358,17 @@ } /* Now append everything */ - if ((res = psiconv_write_u16(config,buf,with_styles?0x0001:0x0000))) + if ((res = psiconv_write_u16(config,buf,lev+1,with_styles?0x0001:0x0000))) goto ERROR6; - if ((res = psiconv_write_u8(config,buf, ptl_length))) + if ((res = psiconv_write_u8(config,buf,lev+1, ptl_length))) goto ERROR6; if ((res = psiconv_buffer_concat(buf,buf_types))) goto ERROR6; - if ((res = psiconv_write_u32(config,buf,pel_length))) + if ((res = psiconv_write_u32(config,buf,lev+1,pel_length))) goto ERROR6; if ((res = psiconv_buffer_concat(buf,buf_elements))) goto ERROR6; - if ((res = psiconv_write_u32(config,buf,nr_of_inlines))) + if ((res = psiconv_write_u32(config,buf,lev+1,nr_of_inlines))) goto ERROR6; if ((res = psiconv_buffer_concat(buf,buf_inlines))) goto ERROR6; @@ -383,15 +390,16 @@ } int psiconv_write_styled_layout_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, psiconv_text_and_layout result, psiconv_word_styles_section styles) { - return psiconv_write_layout_section(config,buf,result,styles,1); + psiconv_progress(config,lev,0,"Writing styled layout section"); + return psiconv_write_layout_section(config,buf,lev+1,result,styles,1); } int psiconv_write_styleless_layout_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, const psiconv_text_and_layout value, const psiconv_character_layout base_char, const psiconv_paragraph_layout base_para) @@ -399,6 +407,7 @@ int res = 0; psiconv_word_styles_section styles_section; + psiconv_progress(config,lev,0,"Writing styleless layout section"); if (!(styles_section = malloc(sizeof(*styles_section)))) goto ERROR1; if (!(styles_section->normal = malloc(sizeof(*styles_section->normal)))) @@ -410,13 +419,14 @@ psiconv_clone_paragraph_layout(base_para))) goto ERROR4; styles_section->normal->hotkey = 0; - if (!(styles_section->normal->name = strdup(""))) + if ((res = psiconv_unicode_from_chars(config,"", + &styles_section->normal->name))) goto ERROR5; if (!(styles_section->styles = psiconv_list_new(sizeof( struct psiconv_word_style_s)))) goto ERROR6; - res = psiconv_write_layout_section(config,buf,value,styles_section,0); + res = psiconv_write_layout_section(config,buf,lev+1,value,styles_section,0); psiconv_free_word_styles_section(styles_section); return res; @@ -439,15 +449,16 @@ int psiconv_write_embedded_object_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, const psiconv_embedded_object_section value) { int res; psiconv_u32 display_id,icon_id,table_id; psiconv_buffer extra_buf; + psiconv_progress(config,lev,0,"Writing embedded object section"); if (!value) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object"); res = -PSICONV_E_GENERATE; goto ERROR1; } @@ -460,51 +471,51 @@ display_id = psiconv_buffer_unique_id(); icon_id = psiconv_buffer_unique_id(); table_id = psiconv_buffer_unique_id(); - if ((res = psiconv_write_u8(config,buf,0x06))) + if ((res = psiconv_write_u8(config,buf,lev+1,0x06))) goto ERROR2; - if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_DISPLAY_SECTION))) + if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_DISPLAY_SECTION))) goto ERROR2; if ((res = psiconv_buffer_add_reference(buf,display_id))) goto ERROR2; - if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_ICON_SECTION))) + if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_ICON_SECTION))) goto ERROR2; if ((res = psiconv_buffer_add_reference(buf,icon_id))) goto ERROR2; - if ((res = psiconv_write_u32(config,buf,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION))) + if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_OBJECT_SECTION_TABLE_SECTION))) goto ERROR2; if ((res = psiconv_buffer_add_reference(buf,table_id))) goto ERROR2; if ((res = psiconv_buffer_add_target(buf,display_id))) goto ERROR2; - if ((res = psiconv_write_object_display_section(config,buf,value->display))) + if ((res = psiconv_write_object_display_section(config,buf,lev+1,value->display))) goto ERROR2; if ((res = psiconv_buffer_add_target(buf,icon_id))) goto ERROR2; - if ((res = psiconv_write_object_icon_section(config,buf,value->icon))) + if ((res = psiconv_write_object_icon_section(config,buf,lev+1,value->icon))) goto ERROR2; if ((res = psiconv_buffer_add_target(buf,table_id))) goto ERROR2; switch(value->object->type) { case psiconv_word_file: - if ((res = psiconv_write_word_file(config,extra_buf, + if ((res = psiconv_write_word_file(config,extra_buf,lev+1, (psiconv_word_f) value->object->file))) goto ERROR2; break; case psiconv_sketch_file: - if ((res = psiconv_write_sketch_file(config,extra_buf, + if ((res = psiconv_write_sketch_file(config,extra_buf,lev+1, (psiconv_sketch_f) value->object->file))) goto ERROR2; break; /* case psiconv_sheet_file: - if ((res = psiconv_write_sheet_file(config,extra_buf, + if ((res = psiconv_write_sheet_file(config,extra_buf,lev+1, (psiconv_sheet_f) value->object->file))) goto ERROR2; break; */ default: - psiconv_warn(config,0,psiconv_buffer_length(buf), + psiconv_error(config,0,psiconv_buffer_length(buf), "Unknown or unsupported object type"); res = -PSICONV_E_GENERATE; goto ERROR2; @@ -525,24 +536,26 @@ int psiconv_write_object_display_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, const psiconv_object_display_section value) { int res; + psiconv_progress(config,lev,0,"Writing object display section"); + if (!value) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object Display Section"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Display Section"); res = -PSICONV_E_GENERATE; goto ERROR1; } - if ((res = psiconv_write_u8(config,buf,value->show_icon?0x00:0x01))) + if ((res = psiconv_write_u8(config,buf,lev+1,value->show_icon?0x00:0x01))) goto ERROR1; - if ((res = psiconv_write_length(config,buf,value->width))) + if ((res = psiconv_write_length(config,buf,lev+1,value->width))) goto ERROR1; - if ((res = psiconv_write_length(config,buf,value->height))) + if ((res = psiconv_write_length(config,buf,lev+1,value->height))) goto ERROR1; - if ((res = psiconv_write_u32(config,buf,0x00000000))) + if ((res = psiconv_write_u32(config,buf,lev+1,0x00000000))) goto ERROR1; return 0; @@ -552,22 +565,24 @@ } int psiconv_write_object_icon_section(const psiconv_config config, - psiconv_buffer buf, + psiconv_buffer buf,int lev, const psiconv_object_icon_section value) { int res; + psiconv_progress(config,lev,0,"Writing object icon section"); + if (!value) { - psiconv_warn(config,0,psiconv_buffer_length(buf),"Null Object Icon Section"); + psiconv_error(config,0,psiconv_buffer_length(buf),"Null Object Icon Section"); res = -PSICONV_E_GENERATE; goto ERROR1; } - if ((res = psiconv_write_string(config,buf,value->icon_name))) + if ((res = psiconv_write_string(config,buf,lev+1,value->icon_name))) goto ERROR1; - if ((res = psiconv_write_length(config,buf,value->icon_width))) + if ((res = psiconv_write_length(config,buf,lev+1,value->icon_width))) goto ERROR1; - if ((res = psiconv_write_length(config,buf,value->icon_height))) + if ((res = psiconv_write_length(config,buf,lev+1,value->icon_height))) goto ERROR1; return 0;