Fix implicit loading of 16bit GDI & USER

[Alexandre Julliard]

Richard Cohen <richard at daijobu.co.uk> writes:

> Alexandre Julliard wrote:
> > The problem is probably
> > that GDI isn't pre-loaded, which is the case for 32-bit apps now that
> > GDI no longer needs the local heap.
> 
> That would explain it.
> 
> > What app is causing the problem?
> 
> Scansoft Paperport version 6 (.5? -- there are different version
> numbers all over the place)

The easiest is probably to go back to always loading GDI. Something
like this should do the trick:

Index: dlls/gdi/gdi_main.c
===================================================================
RCS file: /opt/cvs-commit/wine/dlls/gdi/gdi_main.c,v
retrieving revision 1.17
diff -u -p -r1.17 gdi_main.c
--- dlls/gdi/gdi_main.c	15 Jan 2004 00:35:40 -0000	1.17
+++ dlls/gdi/gdi_main.c	31 May 2005 14:11:46 -0000
@@ -34,6 +34,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, 
 {
     if (reason != DLL_PROCESS_ATTACH) return TRUE;
     DisableThreadLibraryCalls(hinstDLL);
+    LoadLibrary16( "gdi.exe" );
     return GDI_Init();
 }
 

-- 
Alexandre Julliard
julliard at winehq.org