user32: Load the 32-bit user.exe module wrapper from the 32-bit side.

This commit is contained in:
Alexandre Julliard 2009-12-28 16:24:54 +01:00
parent 40a264b0e7
commit 9ceda48337
2 changed files with 13 additions and 3 deletions

View File

@ -387,6 +387,17 @@ static void free_clipboard_formats(void)
}
}
/**********************************************************************
* DllMain
*/
BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
{
if (reason == DLL_PROCESS_ATTACH) LoadLibrary16( "user.exe" );
return TRUE;
}
/**********************************************************************
* InitApp (USER.5)
*/

View File

@ -29,7 +29,6 @@
#include "controls.h"
#include "user_private.h"
#include "win.h"
#include "wine/winbase16.h"
#include "wine/unicode.h"
#include "wine/debug.h"
@ -271,8 +270,6 @@ static void winstation_init(void)
*/
static BOOL process_attach(void)
{
LoadLibrary16( "user.exe" );
winstation_init();
/* Initialize system colors and metrics */
@ -281,6 +278,8 @@ static BOOL process_attach(void)
/* Setup palette function pointers */
palette_init();
LoadLibraryA( "user.exe16" );
/* Initialize built-in window classes */
CLASS_RegisterBuiltinClasses();