Commit c96f1d52 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

msi: Handle remote calls to MsiGetMode.

parent f935e94a
...@@ -612,8 +612,24 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) ...@@ -612,8 +612,24 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode)
package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
if (!package) if (!package)
{
BOOL ret;
HRESULT hr;
IWineMsiRemotePackage *remote_package;
remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall);
if (!remote_package)
return FALSE; return FALSE;
hr = IWineMsiRemotePackage_GetMode(remote_package, iRunMode, &ret);
IWineMsiRemotePackage_Release(remote_package);
if (hr == S_OK)
return ret;
return FALSE;
}
switch (iRunMode) switch (iRunMode)
{ {
case MSIRUNMODE_WINDOWS9X: case MSIRUNMODE_WINDOWS9X:
......
...@@ -26,6 +26,7 @@ import "oaidl.idl"; ...@@ -26,6 +26,7 @@ import "oaidl.idl";
cpp_quote("#if 0") cpp_quote("#if 0")
typedef unsigned long MSIHANDLE; typedef unsigned long MSIHANDLE;
typedef int INSTALLMESSAGE; typedef int INSTALLMESSAGE;
typedef int MSIRUNMODE;
cpp_quote("#endif") cpp_quote("#endif")
[ [
...@@ -45,6 +46,7 @@ interface IWineMsiRemotePackage : IUnknown ...@@ -45,6 +46,7 @@ interface IWineMsiRemotePackage : IUnknown
HRESULT GetTargetPath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); HRESULT GetTargetPath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size );
HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value ); HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value );
HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size );
HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret );
} }
[ [
......
...@@ -1611,6 +1611,13 @@ HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR *folder, BS ...@@ -1611,6 +1611,13 @@ HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR *folder, BS
return HRESULT_FROM_WIN32(r); return HRESULT_FROM_WIN32(r);
} }
HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL *ret )
{
msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
*ret = MsiGetMode(This->package, mode);
return S_OK;
}
static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl =
{ {
mrp_QueryInterface, mrp_QueryInterface,
...@@ -1626,6 +1633,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = ...@@ -1626,6 +1633,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl =
mrp_GetTargetPath, mrp_GetTargetPath,
mrp_SetTargetPath, mrp_SetTargetPath,
mrp_GetSourcePath, mrp_GetSourcePath,
mrp_GetMode,
}; };
HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment