https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83bbe8c85b233cd2ad45fe...
commit 83bbe8c85b233cd2ad45fee1f49b256d79481e57 Author: winesync ros-dev@reactos.org AuthorDate: Sat Mar 12 15:12:00 2022 +0100 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Sun Mar 20 19:27:39 2022 +0100
[WINESYNC] msi: Make MsiGetMode() RPC-compatible.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 9091c3dcf2e4c7775926c0a7a3f82f2e491eb849 by Zebediah Figura z.figura12@gmail.com --- dll/win32/msi/install.c | 9 +-------- dll/win32/msi/package.c | 5 ++--- dll/win32/msi/winemsi.idl | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/dll/win32/msi/install.c b/dll/win32/msi/install.c index 88b3ff518e2..3ac151d36c8 100644 --- a/dll/win32/msi/install.c +++ b/dll/win32/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/dll/win32/msi/package.c b/dll/win32/msi/package.c index 1e554af5eee..d77b692a771 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -2520,10 +2520,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/dll/win32/msi/winemsi.idl b/dll/win32/msi/winemsi.idl index 06db52e5fc5..7282c771a9c 100644 --- a/dll/win32/msi/winemsi.idl +++ b/dll/win32/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 );
-
winesync