[PATCH 2/6] msi: Make MsiSetInstallLevel() RPC-compatible.
Zebediah Figura
z.figura12 at gmail.com
Tue Apr 24 22:27:38 CDT 2018
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/msi/install.c | 13 +------------
dlls/msi/package.c | 5 ++---
dlls/msi/tests/custom.c | 6 ++++++
dlls/msi/winemsi.idl | 2 +-
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 0ec1f24..b9290b4 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -1428,22 +1428,11 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel)
if (!package)
{
MSIHANDLE remote;
- HRESULT hr;
if (!(remote = msi_get_remote(hInstall)))
return ERROR_INVALID_HANDLE;
- hr = remote_SetInstallLevel(remote, iInstallLevel);
-
- if (FAILED(hr))
- {
- if (HRESULT_FACILITY(hr) == FACILITY_WIN32)
- return HRESULT_CODE(hr);
-
- return ERROR_FUNCTION_FAILED;
- }
-
- return ERROR_SUCCESS;
+ return remote_SetInstallLevel(remote, iInstallLevel);
}
r = MSI_SetInstallLevel( package, iInstallLevel );
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 869da8d..6a5d689 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -2550,10 +2550,9 @@ LANGID __cdecl remote_GetLanguage(MSIHANDLE hinst)
return MsiGetLanguage(hinst);
}
-HRESULT __cdecl remote_SetInstallLevel(MSIHANDLE hinst, int level)
+UINT __cdecl remote_SetInstallLevel(MSIHANDLE hinst, int level)
{
- UINT r = MsiSetInstallLevel(hinst, level);
- return HRESULT_FROM_WIN32(r);
+ return MsiSetInstallLevel(hinst, level);
}
HRESULT __cdecl remote_FormatRecord(MSIHANDLE hinst, MSIHANDLE record,
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index e9561d6..35b1543 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -652,6 +652,12 @@ static void test_misc(MSIHANDLE hinst)
lang = MsiGetLanguage(hinst);
ok(hinst, lang == 1033, "got %u\n", lang);
+
+ check_prop(hinst, "INSTALLLEVEL", "3");
+ r = MsiSetInstallLevel(hinst, 123);
+ ok(hinst, !r, "got %u\n", r);
+ check_prop(hinst, "INSTALLLEVEL", "123");
+ MsiSetInstallLevel(hinst, 3);
}
static void test_feature_states(MSIHANDLE hinst)
diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl
index b75f32f..a8e9348 100644
--- a/dlls/msi/winemsi.idl
+++ b/dlls/msi/winemsi.idl
@@ -86,7 +86,7 @@ interface IWineMsiRemote
UINT remote_GetComponentState( [in] MSIHANDLE hinst, [in, string] LPCWSTR component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action );
UINT remote_SetComponentState( [in] MSIHANDLE hinst, [in, string] LPCWSTR component, [in] INSTALLSTATE state );
LANGID remote_GetLanguage( [in] MSIHANDLE hinst );
- HRESULT remote_SetInstallLevel( [in] MSIHANDLE hinst, [in] int level );
+ UINT remote_SetInstallLevel( [in] MSIHANDLE hinst, [in] int level );
HRESULT remote_FormatRecord( [in] MSIHANDLE hinst, [in] MSIHANDLE record, [out] BSTR *value );
HRESULT remote_EvaluateCondition( [in] MSIHANDLE hinst, [in] BSTR condition );
HRESULT remote_GetFeatureCost( [in] MSIHANDLE hinst, [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost );
--
2.7.4
More information about the wine-devel
mailing list