--- psiconv/trunk/lib/psiconv/generate_driver.c	2004/02/04 12:19:09	196
+++ psiconv/trunk/lib/psiconv/generate_driver.c	2005/11/15 15:52:34	270
@@ -1,6 +1,6 @@
 /*
     generate_driver.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 2000-2004  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 2000-2005  Frodo Looijaard <frodo@frodo.looijaard.name>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -44,8 +44,10 @@
     psiconv_error(config,0,0,"Can't parse to an empty buffer!");
     return -PSICONV_E_OTHER;
   }
-  if (!(*buf = psiconv_buffer_new()))
+  if (!(*buf = psiconv_buffer_new())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     return -PSICONV_E_NOMEM;
+  }
 
   if (value->type == psiconv_word_file) {
     if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
@@ -88,8 +90,10 @@
     res = -PSICONV_E_GENERATE;
     goto ERROR;
   }
-  if ((res = psiconv_buffer_resolve(*buf)))
+  if ((res = psiconv_buffer_resolve(*buf))) {
+    psiconv_error(config,lev+1,0,"Internal error resolving buffer references");
     goto ERROR;
+  }
   return -PSICONV_E_OK;
 
 ERROR:
@@ -110,68 +114,90 @@
 
   psiconv_progress(config,lev,0,"Writing texted file");
   if (!value) {
-    psiconv_error(config,0,0,"Null TextEd file");
-    return -PSICONV_E_GENERATE;
+    psiconv_error(config,lev,0,"Null TextEd file");
+    res = -PSICONV_E_GENERATE;
+    goto ERROR1;
   }
 
   if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR1;
   }
 
   if (!(entry = malloc(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR2;
   }
     
   if (!(base_char = psiconv_basic_character_layout())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR3;
   }
   if (!(base_para = psiconv_basic_paragraph_layout())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR4;
   }
 
   section_table_id = psiconv_buffer_unique_id();
-  if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
+  if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR5;
+  }
 
   entry->id = PSICONV_ID_APPL_ID_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR5;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR5;
+  }
   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;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR5;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR5;
+  }
   if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
     goto ERROR5;
 
   entry->id = PSICONV_ID_TEXTED;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR5;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR5;
+  }
   if ((res = psiconv_write_texted_section(config,buf,lev+1,value->texted_sec,
                                            base_char,base_para,&buf_texted)))
     goto ERROR5;
 
-  if ((res = psiconv_buffer_concat(buf,buf_texted)))
+  if ((res = psiconv_buffer_concat(buf,buf_texted))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR6;
+  }
 
-
-  if ((res = psiconv_buffer_add_target(buf,section_table_id)))
+  if ((res = psiconv_buffer_add_target(buf,section_table_id))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR6;
+  }
 
   res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
   
@@ -186,6 +212,10 @@
 ERROR2:
   psiconv_list_free(section_table);
 ERROR1:
+  if (res)
+    psiconv_error(config,lev,0,"Writing of texted file failed");
+  else
+    psiconv_progress(config,lev,0,"End of texted file");
   return res;
 }
 
@@ -199,82 +229,111 @@
 
   psiconv_progress(config,lev,0,"Writing word file");
   if (!value) {
-    psiconv_error(config,0,0,"Null Word file");
-    return -PSICONV_E_GENERATE;
+    psiconv_error(config,lev,0,"Null Word file");
+    res = -PSICONV_E_GENERATE;
+    goto ERROR1;
   }
 
   if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR1;
   }
 
   if (!(entry = malloc(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR2;
   }
     
   section_table_id = psiconv_buffer_unique_id();
-  if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
+  if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id))) 
     goto ERROR3;
 
   entry->id = PSICONV_ID_APPL_ID_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   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;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   if ((res = psiconv_write_word_status_section(config,buf,lev+1,value->status_sec)))
     goto ERROR3;
 
   entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
     goto ERROR3;
 
   entry->id = PSICONV_ID_WORD_STYLES_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   if ((res = psiconv_write_word_styles_section(config,buf,lev+1,value->styles_sec)))
     goto ERROR3;
 
   entry->id = PSICONV_ID_TEXT_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   if ((res = psiconv_write_text_section(config,buf,lev+1,value->paragraphs)))
     goto ERROR3;
 
   entry->id = PSICONV_ID_LAYOUT_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   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)))
+  if ((res = psiconv_buffer_add_target(buf,section_table_id))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
 
   res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
   
@@ -283,6 +342,10 @@
 ERROR2:
   psiconv_list_free(section_table);
 ERROR1:
+  if (res)
+    psiconv_error(config,lev,0,"Writing of word file failed");
+  else
+    psiconv_progress(config,lev,0,"End of word file");
   return res;
 }
 
@@ -296,16 +359,19 @@
 
   psiconv_progress(config,lev,0,"Writing sketch file");
   if (!value) {
-    psiconv_error(config,0,0,"Null Sketch file");
-    return -PSICONV_E_GENERATE;
+    psiconv_error(config,lev,0,"Null Sketch file");
+    res = -PSICONV_E_GENERATE;
+    goto ERROR1;
   }
 
   if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR1;
   }
 
   if (!(entry = malloc(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR2;
   }
@@ -316,25 +382,35 @@
 
   entry->id = PSICONV_ID_APPL_ID_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   if ((res=psiconv_write_application_id_section(config,buf,lev+1,
                                            PSICONV_ID_SKETCH,unicode_paint)))
     goto ERROR3;
   
   entry->id = PSICONV_ID_SKETCH_SECTION;
   entry->offset = psiconv_buffer_unique_id();
-  if ((res = psiconv_list_add(section_table,entry)))
+  if ((res = psiconv_list_add(section_table,entry))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  if ((res = psiconv_buffer_add_target(buf,entry->offset)))
+  }
+  if ((res = psiconv_buffer_add_target(buf,entry->offset))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   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)))
+  if ((res = psiconv_buffer_add_target(buf,section_table_id))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
   res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
   
 ERROR3:
@@ -342,6 +418,10 @@
 ERROR2:
   psiconv_list_free(section_table);
 ERROR1:
+  if (res)
+    psiconv_error(config,lev,0,"Writing of sketch file failed");
+  else
+    psiconv_progress(config,lev,0,"End of sketch file");
   return res;
 }
 
@@ -355,35 +435,46 @@
 
   psiconv_progress(config,lev,0,"Writing mbm file");
   if (!value) {
-    psiconv_error(config,0,0,"Null MBM file");
-    return -PSICONV_E_GENERATE;
+    psiconv_error(config,lev,0,"Null MBM file");
+    res = -PSICONV_E_GENERATE;
+    goto ERROR1;
   }
 
   if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR1;
   }
 
   table_id = psiconv_buffer_unique_id();
-  if ((res = psiconv_buffer_add_reference(buf,table_id)))
+  if ((res = psiconv_buffer_add_reference(buf,table_id))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR2;
+  }
   
   for (i = 0; i < psiconv_list_length(value->sections); i++) {
     if (!(section = psiconv_list_get(value->sections,i))) {
-      psiconv_error(config,0,0,"Massive memory corruption");
+      psiconv_error(config,lev,0,"Data structure corruption");
       res = -PSICONV_E_NOMEM;
       goto ERROR2;
     }
     id = psiconv_buffer_unique_id();
-    psiconv_list_add(jumptable,&id);
-    if ((res = psiconv_buffer_add_target(buf,id)))
+    if ((res = psiconv_list_add(jumptable,&id))) {
+      psiconv_error(config,lev+1,0,"Out of memory error");
       goto ERROR2;
+     }
+    if ((res = psiconv_buffer_add_target(buf,id))) {
+      psiconv_error(config,lev+1,0,"Out of memory error");
+      goto ERROR2;
+    }
     if ((res = psiconv_write_paint_data_section(config,buf,lev+1,section,0)))
       goto ERROR2;
   }
 
-  if ((res = psiconv_buffer_add_target(buf,table_id)))
+  if ((res = psiconv_buffer_add_target(buf,table_id))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR2;
+  }
   if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
     goto ERROR2;
     
@@ -391,6 +482,10 @@
 ERROR2:
   psiconv_list_free(jumptable);
 ERROR1:
+  if (res)
+    psiconv_error(config,lev,0,"Writing of mbm file failed");
+  else
+    psiconv_progress(config,lev,0,"End of mbm file");
   return res;
 }
 
@@ -406,16 +501,19 @@
 
   psiconv_progress(config,lev,0,"Writing clipart file");
   if (!value) {
-    psiconv_error(config,0,0,"Null Clipart file");
-    return -PSICONV_E_GENERATE;
+    psiconv_error(config,lev,0,"Null Clipart file");
+    res = -PSICONV_E_GENERATE;
+    goto ERROR1;
   }
 
   if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR1;
   }
 
   if (!(sec_buf = psiconv_buffer_new())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR2;
   }
@@ -425,14 +523,19 @@
 
   for (i = 0; i < psiconv_list_length(value->sections); i++) {
     if (!(section = psiconv_list_get(value->sections,i))) {
-      psiconv_error(config,0,0,"Massive memory corruption");
+      psiconv_error(config,lev,0,"Data structure corruption");
       res = -PSICONV_E_NOMEM;
       goto ERROR3;
     }
     id = psiconv_buffer_unique_id();
-    psiconv_list_add(jumptable,&id);
-    if ((res = psiconv_buffer_add_target(sec_buf,id)))
+    if ((res = psiconv_list_add(jumptable,&id))) {
+      psiconv_error(config,lev+1,0,"Out of memory error");
+      goto ERROR3;
+    }
+    if ((res = psiconv_buffer_add_target(sec_buf,id))) {
+      psiconv_error(config,lev+1,0,"Out of memory error");
       goto ERROR3;
+    }
     if ((res = psiconv_write_clipart_section(config,sec_buf, lev+1,section)))
       goto ERROR3;
   }
@@ -440,8 +543,10 @@
   if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
     goto ERROR3;
 
-  if ((res = psiconv_buffer_concat(buf,sec_buf)))
+  if ((res = psiconv_buffer_concat(buf,sec_buf))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
+  }
     
   
 ERROR3:
@@ -449,5 +554,9 @@
 ERROR2:
   psiconv_list_free(jumptable);
 ERROR1:
+  if (res)
+    psiconv_error(config,lev,0,"Writing of clipart file failed");
+  else
+    psiconv_progress(config,lev,0,"End of clipart file");
   return res;
 }