[PATCH 1/3] winedump: Do not create a header file when not generating skeleton code.

[Michael Stefaniuc]

The header file generated with "winedump spec" without the "-c" option
just includes other headers.
---
 tools/winedump/output.c |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tools/winedump/output.c b/tools/winedump/output.c
index 1b325ff..f12b99a 100644
--- a/tools/winedump/output.c
+++ b/tools/winedump/output.c
@@ -138,6 +138,9 @@ static void output_spec_postamble (void)
  */
 void  output_header_preamble (void)
 {
+  if (!globals.do_code)
+      return;
+
   hfile = open_file (OUTPUT_DLL_NAME, "_dll.h", "w");
 
   atexit (output_header_postamble);
@@ -160,6 +163,9 @@ void  output_header_preamble (void)
  */
 void  output_header_symbol (const parsed_symbol *sym)
 {
+  if (!globals.do_code)
+      return;
+
   assert (hfile);
   assert (sym && sym->symbol);
 
@@ -210,10 +216,15 @@ void  output_c_preamble (void)
 
   fprintf (cfile,
            "/*\n * %s.dll\n *\n * Generated from %s by winedump.\n *\n"
-           " * DO NOT SUBMIT GENERATED DLLS FOR INCLUSION INTO WINE!\n * \n */"
-           "\n\n#include \"config.h\"\n#include \"%s_dll.h\"\n\n"
-           "WINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n",
-           OUTPUT_DLL_NAME, globals.input_name, OUTPUT_DLL_NAME,
+           " * DO NOT SUBMIT GENERATED DLLS FOR INCLUSION INTO WINE!\n *\n */"
+           "\n\n#include \"config.h\"\n\n#include <stdarg.h>\n\n"
+           "#include \"windef.h\"\n#include \"winbase.h\"\n",
+           OUTPUT_DLL_NAME, globals.input_name);
+
+  if (globals.do_code)
+    fprintf (cfile, "#include \"%s_dll.h\"\n", OUTPUT_DLL_NAME);
+
+  fprintf (cfile,"#include \"wine/debug.h\"\n\nWINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n",
            OUTPUT_DLL_NAME);
 
   if (globals.forward_dll)
-- 
1.5.4.rc3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20080113/df2e5583/attachment.pgp