From 569ea392a7ccc5ced3e4b6fd96ffdc10d04e4c00 Mon Sep 17 00:00:00 2001 From: James Hawkins <truiken@gmail.com> Date: Tue, 3 Jul 2007 19:20:17 -0700 Subject: [PATCH] msi: Handle remote calls to MsiGetLanguage. --- dlls/msi/install.c | 17 ++++++++++++++++- dlls/msi/msiserver.idl | 2 ++ dlls/msi/package.c | 8 ++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 88a4c94372c..6e33c2c5b08 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1045,7 +1045,22 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE hInstall) package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) - return ERROR_INVALID_HANDLE; + { + HRESULT hr; + LANGID lang; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + hr = IWineMsiRemotePackage_GetLanguage(remote_package, &lang); + + if (SUCCEEDED(hr)) + return lang; + + return 0; + } langid = msi_get_property_int( package, szProductLanguage, 0 ); msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 502d1bd2dd1..0e189e07c96 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -28,6 +28,7 @@ typedef unsigned long MSIHANDLE; typedef int INSTALLMESSAGE; typedef int MSIRUNMODE; typedef int INSTALLSTATE; +typedef WORD LANGID; cpp_quote("#endif") [ @@ -52,6 +53,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetFeatureState( [in] BSTR *feature, [in] INSTALLSTATE state ); HRESULT GetComponentState( [in] BSTR *component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT SetComponentState( [in] BSTR *component, [in] INSTALLSTATE state ); + HRESULT GetLanguage( [out] LANGID *language ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 88ad36b2149..8038dd14f85 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1648,6 +1648,13 @@ HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR *compon return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_GetLanguage( IWineMsiRemotePackage *iface, LANGID *language ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + *language = MsiGetLanguage(This->package); + return S_OK; +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1668,6 +1675,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetFeatureState, mrp_GetComponentState, mrp_SetComponentState, + mrp_GetLanguage, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) -- GitLab