marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Handle remote calls to MsiGetLanguage.

oldstable
James Hawkins 2007-07-03 19:20:17 -07:00 committed by Alexandre Julliard
parent 82b0066f70
commit 569ea392a7
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/msi/install.c
View File

@ -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 );

2
dlls/msi/msiserver.idl
View File

@ -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 );
}
[

8
dlls/msi/package.c
View File

@ -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 )