Module: wine Branch: master Commit: c6741d83c6476a7862c148f8ad2cb5acd27563a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6741d83c6476a7862c148f8ad...
Author: James Hawkins truiken@gmail.com Date: Tue Jul 3 19:20:48 2007 -0700
msi: Handle remote calls to MsiSetInstallLevel.
---
dlls/msi/install.c | 27 ++++++++++++++++++++++++--- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 ++++++++ 3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 6e33c2c..cb5f77b 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1100,9 +1100,30 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel)
TRACE("%ld %i\n", hInstall, iInstallLevel);
- package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); - if ( !package ) - return ERROR_INVALID_HANDLE; + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); + if (!package) + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + hr = IWineMsiRemotePackage_SetInstallLevel(remote_package, iInstallLevel); + + IWineMsiRemotePackage_Release(remote_package); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + }
r = MSI_SetInstallLevel( package, iInstallLevel );
diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 0e189e0..d31cb22 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -54,6 +54,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT GetComponentState( [in] BSTR *component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT SetComponentState( [in] BSTR *component, [in] INSTALLSTATE state ); HRESULT GetLanguage( [out] LANGID *language ); + HRESULT SetInstallLevel( [in] int level ); }
[ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8038dd1..276271b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1655,6 +1655,13 @@ HRESULT WINAPI mrp_GetLanguage( IWineMsiRemotePackage *iface, LANGID *language ) return S_OK; }
+HRESULT WINAPI mrp_SetInstallLevel( IWineMsiRemotePackage *iface, int level ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSetInstallLevel(This->package, level); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1676,6 +1683,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetComponentState, mrp_SetComponentState, mrp_GetLanguage, + mrp_SetInstallLevel, };
HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )