Alexandre Julliard : gdi32: Do not load 16-bit gdi.exe by default.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Feb  8 17:44:31 2010 +0100

gdi32: Do not load 16-bit gdi.exe by default.

---

 dlls/gdi.exe16/gdi.c |   10 ----------
 dlls/gdi32/gdiobj.c  |    2 --
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c
index 59cec0f..85dfef8 100644
--- a/dlls/gdi.exe16/gdi.c
+++ b/dlls/gdi.exe16/gdi.c
@@ -429,16 +429,6 @@ static void free_segptr_bits( HBITMAP16 bmp )
 }
 
 
-/**********************************************************************
- *		DllMain
- */
-BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
-{
-    if (reason == DLL_PROCESS_ATTACH) LoadLibrary16( "gdi.exe" );
-    return TRUE;
-}
-
-
 /***********************************************************************
  *           SetBkColor    (GDI.1)
  */
diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c
index bf4813f..c45ff4b 100644
--- a/dlls/gdi32/gdiobj.c
+++ b/dlls/gdi32/gdiobj.c
@@ -578,8 +578,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
     if (reason != DLL_PROCESS_ATTACH) return TRUE;
 
     DisableThreadLibraryCalls( inst );
-    LoadLibraryA( "gdi.exe16" );
-
     WineEngInit();
 
     /* create stock objects */