Andrew Nguyen : kernel32: Make the return type of LoadModule match the Windows SDK.

[Alexandre Julliard]

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

Author: Andrew Nguyen 
Date:   Mon Oct 11 05:16:51 2010 -0500

kernel32: Make the return type of LoadModule match the Windows SDK.

---

dlls/kernel32/process.c |   20 ++++++++++----------
 include/winbase.h       |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index d4c2063..fdd19db 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -2297,25 +2297,25 @@ UINT WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow )
 /**********************************************************************
  *	    LoadModule    (KERNEL32.@)
  */
-HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
+DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
 {
     LOADPARMS32 *params = paramBlock;
     PROCESS_INFORMATION info;
     STARTUPINFOA startup;
-    HINSTANCE hInstance;
+    DWORD ret;
     LPSTR cmdline, p;
     char filename[MAX_PATH];
     BYTE len;

-    if (!name) return (HINSTANCE)ERROR_FILE_NOT_FOUND;
+    if (!name) return ERROR_FILE_NOT_FOUND;

if (!SearchPathA( NULL, name, ".exe", sizeof(filename), filename, NULL ) &&
         !SearchPathA( NULL, name, NULL, sizeof(filename), filename, NULL ))
-        return ULongToHandle(GetLastError());
+        return GetLastError();

len = (BYTE)params->lpCmdLine[0];
     if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, strlen(filename) + len + 2 )))
-        return (HINSTANCE)ERROR_NOT_ENOUGH_MEMORY;
+        return ERROR_NOT_ENOUGH_MEMORY;

strcpy( cmdline, filename );
     p = cmdline + strlen(cmdline);
@@ -2337,19 +2337,19 @@ HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
         /* Give 30 seconds to the app to come up */
         if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED)
             WARN("WaitForInputIdle failed: Error %d\n", GetLastError() );
-        hInstance = (HINSTANCE)33;
+        ret = 33;
         /* Close off the handles */
         CloseHandle( info.hThread );
         CloseHandle( info.hProcess );
     }
-    else if ((hInstance = ULongToHandle(GetLastError())) >= (HINSTANCE)32)
+    else if ((ret = GetLastError()) >= 32)
     {
-        FIXME("Strange error set by CreateProcess: %p\n", hInstance );
-        hInstance = (HINSTANCE)11;
+        FIXME("Strange error set by CreateProcess: %u\n", ret );
+        ret = 11;
     }

HeapFree( GetProcessHeap(), 0, cmdline );
-    return hInstance;
+    return ret;
 }

diff --git a/include/winbase.h b/include/winbase.h
index 05f3a2a..a233a0a 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1887,7 +1887,7 @@ WINBASEAPI HMODULE     WINAPI LoadLibraryW(LPCWSTR);
 WINBASEAPI HMODULE     WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD);
 WINBASEAPI HMODULE     WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD);
 #define                       LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx)
-WINBASEAPI HINSTANCE   WINAPI LoadModule(LPCSTR,LPVOID);
+WINBASEAPI DWORD       WINAPI LoadModule(LPCSTR,LPVOID);
 WINBASEAPI HGLOBAL     WINAPI LoadResource(HMODULE,HRSRC);
 WINBASEAPI HLOCAL      WINAPI LocalAlloc(UINT,SIZE_T) __WINE_ALLOC_SIZE(2);
 WINBASEAPI SIZE_T      WINAPI LocalCompact(UINT);