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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9ceda48337b15f017bc84707ef3250015e4b9459
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9ceda48337b15f017bc84707ef...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Dec 28 16:24:54 2009 +0100

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

---

 dlls/user.exe16/user.c  |   11 +++++++++++
 dlls/user32/user_main.c |    5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c
index 6889088..6c7ec7e 100644
--- a/dlls/user.exe16/user.c
+++ b/dlls/user.exe16/user.c
@@ -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)
  */
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index 9440934..d076e67 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -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();