Alexandre Julliard : user32: Do not load 16-bit user.exe by default.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb  8 17:44:23 2010 +0100

user32: Do not load 16-bit user.exe by default.

---

 dlls/user.exe16/user.c  |   10 ----------
 dlls/user32/user_main.c |    2 --
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c
index f4c7741..ba90db4 100644
--- a/dlls/user.exe16/user.c
+++ b/dlls/user.exe16/user.c
@@ -509,16 +509,6 @@ 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)
  */
 INT16 WINAPI InitApp16( HINSTANCE16 hInstance )
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index d076e67..19482e4 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -278,8 +278,6 @@ static BOOL process_attach(void)
     /* Setup palette function pointers */
     palette_init();
 
-    LoadLibraryA( "user.exe16" );
-
     /* Initialize built-in window classes */
     CLASS_RegisterBuiltinClasses();