[PATCH 1/6] msi: Make MsiGetMode() RPC-compatible.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/msi/install.c   | 9 +--------
 dlls/msi/package.c   | 5 ++---
 dlls/msi/winemsi.idl | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 88b3ff5..3ac151d 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -561,18 +561,11 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode)
     if (!package)
     {
         MSIHANDLE remote;
-        BOOL ret;
-        HRESULT hr;

if (!(remote = msi_get_remote(hInstall)))
             return FALSE;

-        hr = remote_GetMode(remote, iRunMode, &ret);
-
-        if (hr == S_OK)
-            return ret;
-
-        return FALSE;
+        return remote_GetMode(remote, iRunMode);
     }

switch (iRunMode)
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 1790918..3ea5afc 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -2513,10 +2513,9 @@ UINT __cdecl remote_GetSourcePath(MSIHANDLE hinst, LPCWSTR folder, LPWSTR *value
     return r;
 }

-HRESULT __cdecl remote_GetMode(MSIHANDLE hinst, MSIRUNMODE mode, BOOL *ret)
+BOOL __cdecl remote_GetMode(MSIHANDLE hinst, MSIRUNMODE mode)
 {
-    *ret = MsiGetMode(hinst, mode);
-    return S_OK;
+    return MsiGetMode(hinst, mode);
 }

HRESULT __cdecl remote_SetMode(MSIHANDLE hinst, MSIRUNMODE mode, BOOL state)
diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl
index 06db52e..7282c77 100644
--- a/dlls/msi/winemsi.idl
+++ b/dlls/msi/winemsi.idl
@@ -79,7 +79,7 @@ interface IWineMsiRemote
     UINT remote_GetTargetPath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [out, string] LPWSTR *value );
     UINT remote_SetTargetPath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [in, string] LPCWSTR value );
     UINT remote_GetSourcePath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [out, string] LPWSTR *value );
-    HRESULT remote_GetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [out] BOOL *ret );
+    BOOL remote_GetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode );
     HRESULT remote_SetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [in] BOOL state );
     HRESULT remote_GetFeatureState( [in] MSIHANDLE hinst, [in] BSTR feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action );
     HRESULT remote_SetFeatureState( [in] MSIHANDLE hinst, [in] BSTR feature, [in] INSTALLSTATE state );