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

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)
  */

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();