James Hawkins : msi: Handle remote calls to MsiSequence.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jul 4 06:56:52 CDT 2007
Module: wine
Branch: master
Commit: 99714f12cb08fb40521f6d8e12fab2ca7a40b622
URL: http://source.winehq.org/git/wine.git/?a=commit;h=99714f12cb08fb40521f6d8e12fab2ca7a40b622
Author: James Hawkins <truiken at gmail.com>
Date: Tue Jul 3 19:15:06 2007 -0700
msi: Handle remote calls to MsiSequence.
---
dlls/msi/install.c | 23 ++++++++++++++++++++++-
dlls/msi/msiserver.idl | 1 +
dlls/msi/package.c | 8 ++++++++
3 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 77e6756..e06399c 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -131,7 +131,28 @@ UINT WINAPI MsiSequenceW( MSIHANDLE hInstall, LPCWSTR szTable, INT iSequenceMode
package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE );
if (!package)
- return ERROR_INVALID_HANDLE;
+ {
+ HRESULT hr;
+ IWineMsiRemotePackage *remote_package;
+
+ remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall );
+ if (!remote_package)
+ return ERROR_INVALID_HANDLE;
+
+ hr = IWineMsiRemotePackage_Sequence( remote_package, (BSTR *)szTable, iSequenceMode );
+
+ IWineMsiRemotePackage_Release( remote_package );
+
+ if (FAILED(hr))
+ {
+ if (HRESULT_FACILITY(hr) == FACILITY_WIN32)
+ return HRESULT_CODE(hr);
+
+ return ERROR_FUNCTION_FAILED;
+ }
+
+ return ERROR_SUCCESS;
+ }
ret = MSI_Sequence( package, szTable, iSequenceMode );
msiobj_release( &package->hdr );
diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl
index 550a44f..521b4ca 100644
--- a/dlls/msi/msiserver.idl
+++ b/dlls/msi/msiserver.idl
@@ -41,6 +41,7 @@ interface IWineMsiRemotePackage : IUnknown
HRESULT SetProperty( [in] BSTR *property, [in] BSTR *value );
HRESULT ProcessMessage( [in] INSTALLMESSAGE message, [in] MSIHANDLE record );
HRESULT DoAction( [in] BSTR *action );
+ HRESULT Sequence( [in] BSTR *table, [in] int sequence );
}
[
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 153ea8c..b453ae5 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1583,6 +1583,13 @@ HRESULT WINAPI mrp_DoAction( IWineMsiRemotePackage *iface, BSTR *action )
return HRESULT_FROM_WIN32(r);
}
+HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR *table, int sequence )
+{
+ msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
+ UINT r = MsiSequenceW(This->package, (LPWSTR)table, sequence);
+ return HRESULT_FROM_WIN32(r);
+}
+
static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl =
{
mrp_QueryInterface,
@@ -1594,6 +1601,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl =
mrp_SetProperty,
mrp_ProcessMessage,
mrp_DoAction,
+ mrp_Sequence,
};
HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )
More information about the wine-cvs
mailing list