Skip to content

W
wine-winehq
Commit 112d3078 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Added automatic registration of built-in DLLs.

parent c23872d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 108 deletions
if1632/builtin.c
View file @ 112d3078
......@@ -34,100 +34,12 @@ typedef struct
} BUILTIN16_RESOURCE;
/* 16-bit DLLs */
extern const WIN16_DESCRIPTOR AVIFILE_Descriptor;
extern const WIN16_DESCRIPTOR COMM_Descriptor;
extern const WIN16_DESCRIPTOR COMMDLG_Descriptor;
extern const WIN16_DESCRIPTOR COMPOBJ_Descriptor;
extern const WIN16_DESCRIPTOR DDEML_Descriptor;
extern const WIN16_DESCRIPTOR DISPDIB_Descriptor;
extern const WIN16_DESCRIPTOR DISPLAY_Descriptor;
extern const WIN16_DESCRIPTOR GDI_Descriptor;
extern const WIN16_DESCRIPTOR KERNEL_Descriptor;
extern const WIN16_DESCRIPTOR KEYBOARD_Descriptor;
extern const WIN16_DESCRIPTOR LZEXPAND_Descriptor;
extern const WIN16_DESCRIPTOR MMSYSTEM_Descriptor;
extern const WIN16_DESCRIPTOR MOUSE_Descriptor;
extern const WIN16_DESCRIPTOR MSACM_Descriptor;
extern const WIN16_DESCRIPTOR MSVIDEO_Descriptor;
extern const WIN16_DESCRIPTOR OLE2CONV_Descriptor;
extern const WIN16_DESCRIPTOR OLE2DISP_Descriptor;
extern const WIN16_DESCRIPTOR OLE2NLS_Descriptor;
extern const WIN16_DESCRIPTOR OLE2PROX_Descriptor;
extern const WIN16_DESCRIPTOR OLE2THK_Descriptor;
extern const WIN16_DESCRIPTOR OLE2_Descriptor;
extern const WIN16_DESCRIPTOR OLECLI_Descriptor;
extern const WIN16_DESCRIPTOR OLESVR_Descriptor;
extern const WIN16_DESCRIPTOR RASAPI16_Descriptor;
extern const WIN16_DESCRIPTOR SHELL_Descriptor;
extern const WIN16_DESCRIPTOR SOUND_Descriptor;
extern const WIN16_DESCRIPTOR STORAGE_Descriptor;
extern const WIN16_DESCRIPTOR STRESS_Descriptor;
extern const WIN16_DESCRIPTOR SYSTEM_Descriptor;
extern const WIN16_DESCRIPTOR TOOLHELP_Descriptor;
extern const WIN16_DESCRIPTOR TYPELIB_Descriptor;
extern const WIN16_DESCRIPTOR USER_Descriptor;
extern const WIN16_DESCRIPTOR VER_Descriptor;
extern const WIN16_DESCRIPTOR W32SYS_Descriptor;
extern const WIN16_DESCRIPTOR WIN32S16_Descriptor;
extern const WIN16_DESCRIPTOR WIN87EM_Descriptor;
extern const WIN16_DESCRIPTOR WINASPI_Descriptor;
extern const WIN16_DESCRIPTOR WINDEBUG_Descriptor;
extern const WIN16_DESCRIPTOR WINEPS_Descriptor;
extern const WIN16_DESCRIPTOR WING_Descriptor;
extern const WIN16_DESCRIPTOR WINSOCK_Descriptor;
extern const WIN16_DESCRIPTOR WPROCS_Descriptor;
/* Table of all built-in DLLs */
static const WIN16_DESCRIPTOR *BuiltinDLLs[] =
{
&KERNEL_Descriptor,
&USER_Descriptor,
&GDI_Descriptor,
&SYSTEM_Descriptor,
&DISPLAY_Descriptor,
&WPROCS_Descriptor,
&WINDEBUG_Descriptor,
&AVIFILE_Descriptor,
&COMMDLG_Descriptor,
&COMPOBJ_Descriptor,
&DDEML_Descriptor,
&DISPDIB_Descriptor,
&KEYBOARD_Descriptor,
&COMM_Descriptor,
&LZEXPAND_Descriptor,
&MMSYSTEM_Descriptor,
&MOUSE_Descriptor,
&MSACM_Descriptor,
&MSVIDEO_Descriptor,
&OLE2CONV_Descriptor,
&OLE2DISP_Descriptor,
&OLE2NLS_Descriptor,
&OLE2PROX_Descriptor,
&OLE2THK_Descriptor,
&OLE2_Descriptor,
&OLECLI_Descriptor,
&OLESVR_Descriptor,
&RASAPI16_Descriptor,
&SHELL_Descriptor,
&SOUND_Descriptor,
&STORAGE_Descriptor,
&STRESS_Descriptor,
&TOOLHELP_Descriptor,
&TYPELIB_Descriptor,
&VER_Descriptor,
&W32SYS_Descriptor,
&WIN32S16_Descriptor,
&WIN87EM_Descriptor,
&WINASPI_Descriptor,
&WINEPS_Descriptor,
&WING_Descriptor,
&WINSOCK_Descriptor,
/* Last entry */
NULL
};
#define MAX_DLLS 50
static const BUILTIN16_DESCRIPTOR *builtin_dlls[MAX_DLLS];
static int nb_dlls;
/* list of DLLs that should always be loaded at startup */
static const char * const always_load[] =
......@@ -145,7 +57,7 @@ static const char * const always_load[] =
* Load a built-in Win16 module. Helper function for BUILTIN_LoadModule
* and BUILTIN_Init.
*/
static HMODULE16 BUILTIN_DoLoadModule16( const WIN16_DESCRIPTOR *descr )
static HMODULE16 BUILTIN_DoLoadModule16( const BUILTIN16_DESCRIPTOR *descr )
{
NE_MODULE *pModule;
int minsize, res_off;
......@@ -269,8 +181,8 @@ BOOL BUILTIN_Init(void)
*/
HMODULE16 BUILTIN_LoadModule( LPCSTR name )
{
const WIN16_DESCRIPTOR **table;
char dllname[16], *p;
int i;
/* Fix the name in case we have a full path and extension */
......@@ -280,15 +192,15 @@ HMODULE16 BUILTIN_LoadModule( LPCSTR name )
if (!p) strcat( dllname, ".dll" );
for (table = BuiltinDLLs; *table; table++)
for (i = 0; i < nb_dlls; i++)
{
NE_MODULE *pModule = (NE_MODULE *)(*table)->module_start;
OFSTRUCT *pOfs = (OFSTRUCT *)((LPBYTE)pModule + pModule->fileinfo);
if (!lstrcmpiA( pOfs->szPathName, dllname )) break;
const BUILTIN16_DESCRIPTOR *descr = builtin_dlls[i];
NE_MODULE *pModule = (NE_MODULE *)descr->module_start;
OFSTRUCT *pOfs = (OFSTRUCT *)((LPBYTE)pModule + pModule->fileinfo);
if (!lstrcmpiA( pOfs->szPathName, dllname ))
return BUILTIN_DoLoadModule16( descr );
}
if (!*table) return (HMODULE16)2;
return BUILTIN_DoLoadModule16( *table );
return (HMODULE16)2;
}
......@@ -349,6 +261,18 @@ LPCSTR BUILTIN_GetEntryPoint16( STACK16FRAME *frame, LPSTR name, WORD *pOrd )
}
/***********************************************************************
* BUILTIN_RegisterDLL
*
* Register a built-in DLL descriptor.
*/
void BUILTIN_RegisterDLL( const BUILTIN16_DESCRIPTOR *descr )
{
assert( nb_dlls < MAX_DLLS );
builtin_dlls[nb_dlls++] = descr;
}
/**********************************************************************
* BUILTIN_DefaultIntHandler
*
......@@ -361,4 +285,3 @@ void WINAPI BUILTIN_DefaultIntHandler( CONTEXT86 *context )
BUILTIN_GetEntryPoint16( CURRENT_STACK16, name, &ordinal );
INT_BARF( context, ordinal - FIRST_INTERRUPT_ORDINAL );
}
include/builtin16.h
View file @ 112d3078
......@@ -13,10 +13,6 @@
struct _CONTEXT86;
struct _STACK16FRAME;
extern BOOL BUILTIN_Init(void);
extern HMODULE16 BUILTIN_LoadModule( LPCSTR name );
extern LPCSTR BUILTIN_GetEntryPoint16( struct _STACK16FRAME *frame, LPSTR name, WORD *pOrd );
extern void RELAY_Unimplemented16(void);
extern WORD CallFrom16Word();
......@@ -83,7 +79,11 @@ typedef struct
const BYTE *code_start; /* 32-bit address of DLL code */
const BYTE *data_start; /* 32-bit address of DLL data */
const void *rsrc; /* resources data */
} WIN16_DESCRIPTOR;
} BUILTIN16_DESCRIPTOR;
extern BOOL BUILTIN_Init(void);
extern HMODULE16 BUILTIN_LoadModule( LPCSTR name );
extern LPCSTR BUILTIN_GetEntryPoint16( struct _STACK16FRAME *frame, LPSTR name, WORD *pOrd );
extern void BUILTIN_RegisterDLL( const BUILTIN16_DESCRIPTOR *descr );
#endif /* __WINE_BUILTIN16_H */
include/builtin32.h
View file @ 112d3078
......@@ -30,6 +30,7 @@ typedef struct
extern ENTRYPOINT32 BUILTIN32_GetEntryPoint( char *buffer, void *relay,
unsigned int *typemask );
extern void BUILTIN32_RegisterDLL( const BUILTIN32_DESCRIPTOR *descr );
extern void BUILTIN32_Unimplemented( const BUILTIN32_DESCRIPTOR *descr,
int ordinal );
extern void BUILTIN32_SwitchRelayDebug(int onoff);
......
tools/build.c
View file @ 112d3078
......@@ -1211,6 +1211,12 @@ static int BuildSpec32File( FILE *outfile )
fprintf( outfile, " %s,\n", DLLInitFunc[0] ? DLLInitFunc : "0" );
fprintf( outfile, " %s\n", rsrc_name[0] ? rsrc_name : "0" );
fprintf( outfile, "};\n" );
/* Output the DLL constructor */
fprintf( outfile, "static void dll_init(void) __attribute__((constructor));\n" );
fprintf( outfile, "static void dll_init(void) { BUILTIN32_RegisterDLL( &%s_Descriptor ); }\n",
DLLName );
return 0;
}
......@@ -1451,7 +1457,7 @@ static int BuildSpec16File( FILE *outfile )
if (rsrc_name[0]) fprintf( outfile, "extern const char %s[];\n\n", rsrc_name );
fprintf( outfile, "\nconst WIN16_DESCRIPTOR %s_Descriptor = \n{\n", DLLName );
fprintf( outfile, "\nconst BUILTIN16_DESCRIPTOR %s_Descriptor = \n{\n", DLLName );
fprintf( outfile, " \"%s\",\n", DLLName );
fprintf( outfile, " Module,\n" );
fprintf( outfile, " sizeof(Module),\n" );
......@@ -1460,6 +1466,11 @@ static int BuildSpec16File( FILE *outfile )
fprintf( outfile, " %s\n", rsrc_name[0] ? rsrc_name : "0" );
fprintf( outfile, "};\n" );
/* Output the DLL constructor */
fprintf( outfile, "static void dll_init(void) __attribute__((constructor));\n" );
fprintf( outfile, "static void dll_init(void) { BUILTIN_RegisterDLL( &%s_Descriptor ); }\n",
DLLName );
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment