commit 4e951ea25bed3e8e44f930b9e3684823e04b52bf
author Alexandre Julliard <julliard@winehq.org> Wed Nov 08 22:47:53 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Nov 08 22:47:53 2000 +0000
tree 48f82af7b8af48199f819dcac6c73b62fe76ccc2
parent d3576a9f85007834a6cbc5aa33839c85681cf455

Check all Callouts function pointers for NULL before using them.
Don't load USER dll if not needed by the application.

if1632/thunk.c

diff --git a/if1632/thunk.c b/if1632/thunk.c
index 3aa43ec..3a1dbcd 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -43,7 +43,6 @@
     /* GetMessageA */ NULL,
     /* SendMessageA */ NULL,
     /* PostMessageA */ NULL,
-    /* PostAppMessage16 */ NULL,
     /* TranslateMessage */ NULL,
     /* DispatchMessageA */ NULL,
     /* RedrawWindow */ NULL,
@@ -168,7 +167,7 @@
     HMODULE hModule;
     NE_MODULE *pModule;
 
-    hModule = LoadLibraryA( "user32.dll" );
+    hModule = GetModuleHandleA( "user32.dll" );
     if ( hModule )
     {
 #define GETADDR( name )  \
@@ -188,21 +187,21 @@
         GETADDR( MessageBoxW );
 #undef GETADDR
     }
+    else WARN("no 32-bit USER\n");
 
-    pModule = NE_GetPtr( LoadLibrary16( "USER.EXE" ) );
+    pModule = NE_GetPtr( GetModuleHandle16( "USER.EXE" ) );
     if ( pModule )
     {
 #define GETADDR( var, name, thk )  \
         *(FARPROC *)&Callout.var = THUNK_GetCalloutThunk( pModule, name, \
                                                (RELAY)THUNK_CallTo16_##thk )
 
-        GETADDR( PostAppMessage16, "PostAppMessage", word_wwwl );
         GETADDR( FinalUserInit16, "FinalUserInit", word_ );
         GETADDR( InitThreadInput16, "InitThreadInput", word_ww );
         GETADDR( UserYield16, "UserYield", word_ );
         GETADDR( DestroyIcon32, "DestroyIcon32", word_ww );
         GETADDR( UserSignalProc, "SignalProc32", word_lllw );
-
 #undef GETADDR
     }
+    else WARN("no 16-bit USER\n");
 }