commit 5edf4e1cef0cf55763dc48c4c41ac36a7ed1e24b
author Alexandre Julliard <julliard@winehq.org> Thu Jul 26 20:12:54 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jul 26 20:12:54 2001 +0000
tree cbf2a87dd207efe8be0c877e9472962da5ae1bb5
parent 8afe6628f8c5dced54a2b7e8325abb9d274edf07

Removed a few unnecessary Callouts.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index fcc0eea..692ea11 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -17,7 +17,6 @@
 #include "file.h"
 #include "module.h"
 #include "debugtools.h"
-#include "callback.h"
 #include "wine/server.h"
 
 DEFAULT_DEBUG_CHANNEL(module);
@@ -30,6 +29,25 @@
 static int free_lib_count;   /* recursion depth of FreeLibrary calls */
 static int process_detaching;  /* set on process detach to avoid deadlocks with thread detach */
 
+/***********************************************************************
+ *           wait_input_idle
+ *
+ * Wrapper to call WaitForInputIdle USER function
+ */
+typedef DWORD (WINAPI *WaitForInputIdle_ptr)( HANDLE hProcess, DWORD dwTimeOut );
+
+static DWORD wait_input_idle( HANDLE process, DWORD timeout )
+{
+    HMODULE mod = GetModuleHandleA( "user32.dll" );
+    if (mod)
+    {
+        WaitForInputIdle_ptr ptr = (WaitForInputIdle_ptr)GetProcAddress( mod, "WaitForInputIdle" );
+        if (ptr) return ptr( process, timeout );
+    }
+    return 0;
+}
+
+
 /*************************************************************************
  *		MODULE32_LookupHMODULE
  * looks for the referenced HMODULE in the current process
@@ -852,8 +870,7 @@
                         0, NULL, NULL, &startup, &info ))
     {
         /* Give 30 seconds to the app to come up */
-        if (Callout.WaitForInputIdle &&
-            Callout.WaitForInputIdle( info.hProcess, 30000 ) == 0xFFFFFFFF)
+        if (wait_input_idle( info.hProcess, 30000 ) == 0xFFFFFFFF)
             WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
         hInstance = (HINSTANCE)33;
         /* Close off the handles */
@@ -910,8 +927,7 @@
                         params->lpEnvAddress, NULL, &startup, &info ))
     {
         /* Give 30 seconds to the app to come up */
-        if (Callout.WaitForInputIdle &&
-            Callout.WaitForInputIdle( info.hProcess, 30000 ) ==  0xFFFFFFFF )
+        if (wait_input_idle( info.hProcess, 30000 ) ==  0xFFFFFFFF )
             WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
         hInstance = (HINSTANCE)33;
         /* Close off the handles */