commit 267ca68253323c35f26157c9f809a7ae8aff7122
author Alexandre Julliard <julliard@winehq.org> Wed Jul 31 17:20:00 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jul 31 17:20:00 2002 +0000
tree 3cce7989e83f98d7708406701285f5795848ea59
parent 04b5a86c46bd3f51a878edffc8c2b7271a2d1bf1

Fixed HANDLE<->HFILE conversions, since they will be different types
when handles are void*.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index 6cd398e..6a41cb5 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -899,8 +899,8 @@
 {
     PROCESS_INFORMATION info;
     STARTUPINFOA startup;
-    HINSTANCE hInstance;
     char *cmdline;
+    UINT ret;
 
     memset( &startup, 0, sizeof(startup) );
     startup.cb = sizeof(startup);
@@ -917,18 +917,18 @@
         /* Give 30 seconds to the app to come up */
         if (wait_input_idle( info.hProcess, 30000 ) == 0xFFFFFFFF)
             WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
-        hInstance = (HINSTANCE)33;
+        ret = 33;
         /* Close off the handles */
         CloseHandle( info.hThread );
         CloseHandle( info.hProcess );
     }
-    else if ((hInstance = (HINSTANCE)GetLastError()) >= (HINSTANCE)32)
+    else if ((ret = GetLastError()) >= 32)
     {
-        FIXME("Strange error set by CreateProcess: %d\n", hInstance );
-        hInstance = (HINSTANCE)11;
+        FIXME("Strange error set by CreateProcess: %d\n", ret );
+        ret = 11;
     }
     HeapFree( GetProcessHeap(), 0, cmdline );
-    return hInstance;
+    return ret;
 }
 
 /**********************************************************************
@@ -1188,7 +1188,7 @@
  *        init function into load_library).
  * allocated_libdir is TRUE in the stack frame that allocated libdir
  */
-WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
+WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HANDLE hfile, DWORD flags )
 {
 	DWORD err = GetLastError();
 	WINE_MODREF *pwm;