Generate Win32 dll descriptor structure in the .spec.c file so that we

if1632/builtin.c

@@ -12,7 +12,6 @@
 #include "wine/winbase16.h"
 #include "wine/winestring.h"
 #include "builtin16.h"
-#include "builtin32.h"
 #include "global.h"
 #include "heap.h"
 #include "module.h"

include/builtin32.h

@@ -7,6 +7,7 @@
 #ifndef __WINE_BUILTIN32_H
 #define __WINE_BUILTIN32_H
 
+/* Warning: this must match the definition in tools/winebuild/spec32.c */
 typedef struct
 {
     const char*           filename;     /* DLL file name */
@@ -21,7 +22,6 @@ typedef struct
 } BUILTIN32_DESCRIPTOR;
 
 extern void BUILTIN32_RegisterDLL( const BUILTIN32_DESCRIPTOR *descr );
-extern void BUILTIN32_Unimplemented( const char *dllname, const char *funcname );
 extern void RELAY_SetupDLL( const char *module );
 
 #endif /* __WINE_BUILTIN32_H */

relay32/relay386.c

@@ -9,7 +9,6 @@
 #include <string.h>
 #include <stdio.h>
 #include "winnt.h"
-#include "builtin32.h"
 #include "selectors.h"
 #include "stackframe.h"
 #include "syslevel.h"

relay32/snoop.c

@@ -12,7 +12,6 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "heap.h"
-#include "builtin32.h"
 #include "snoop.h"
 #include "neexe.h"
 #include "selectors.h"

tools/winebuild/spec32.c

@@ -288,7 +288,7 @@ void BuildSpec32File( FILE *outfile )
 
     fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n\n",
              input_file_name );
-    fprintf( outfile, "#include \"builtin32.h\"\n\n" );
+    fprintf( outfile, "extern void BUILTIN32_Unimplemented( const char *dllname, const char *funcname );\n\n" );
 
     /* Reserve some space for the PE header */
 
@@ -439,7 +439,18 @@ void BuildSpec32File( FILE *outfile )
 
     if (rsrc_name[0]) fprintf( outfile, "extern char %s[];\n\n", rsrc_name );
 
-    fprintf( outfile, "static const BUILTIN32_DESCRIPTOR descriptor =\n{\n" );
+    /* Warning: this must match the definition in builtin32.h */
+    fprintf( outfile, "static const struct dll_descriptor\n{\n" );
+    fprintf( outfile, "    const char*           filename;\n" );
+    fprintf( outfile, "    int                   nb_imports;\n" );
+    fprintf( outfile, "    void                 *pe_header;\n" );
+    fprintf( outfile, "    void                 *exports;\n" );
+    fprintf( outfile, "    unsigned int          exports_size;\n" );
+    fprintf( outfile, "    const char * const   *imports;\n" );
+    fprintf( outfile, "    void                (*dllentrypoint)();\n" );
+    fprintf( outfile, "    int                   characteristics;\n" );
+    fprintf( outfile, "    void                 *rsrc;\n" );
+    fprintf( outfile, "} descriptor = {\n" );
     fprintf( outfile, "    \"%s\",\n", DLLFileName );
     fprintf( outfile, "    %d,\n", nb_imports );
     fprintf( outfile, "    pe_header,\n" );
@@ -462,6 +473,7 @@ void BuildSpec32File( FILE *outfile )
     fprintf( outfile, "    \"\\t.previous\\n\");\n" );
     fprintf( outfile, "}\n" );
     fprintf( outfile, "#endif /* defined(__GNUC__) */\n" );
-    fprintf( outfile, "static void %s_init(void) { BUILTIN32_RegisterDLL( &descriptor ); }\n",
-             DLLName );
+    fprintf( outfile, "static void %s_init(void)\n{\n", DLLName );
+    fprintf( outfile, "    extern void BUILTIN32_RegisterDLL( const struct dll_descriptor * );\n" );
+    fprintf( outfile, "    BUILTIN32_RegisterDLL( &descriptor );\n}\n" );
 }