James Hawkins : msi: Handle remote calls to MsiSetFeatureState.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jul 4 06:56:55 CDT 2007


Module: wine
Branch: master
Commit: f45b3ce60e4282d239b9e5396ed180af41557390
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f45b3ce60e4282d239b9e5396ed180af41557390

Author: James Hawkins <truiken at gmail.com>
Date:   Tue Jul  3 19:18:04 2007 -0700

msi: Handle remote calls to MsiSetFeatureState.

---

 dlls/msi/install.c     |   23 ++++++++++++++++++++++-
 dlls/msi/msiserver.idl |    2 ++
 dlls/msi/package.c     |    8 ++++++++
 3 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index e7ee92b..c9a34cc 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -749,7 +749,28 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
 
     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_SetFeatureState(remote_package, (BSTR *)szFeature, iState);
+
+        IWineMsiRemotePackage_Release(remote_package);
+
+        if (FAILED(hr))
+        {
+            if (HRESULT_FACILITY(hr) == FACILITY_WIN32)
+                return HRESULT_CODE(hr);
+
+            return ERROR_FUNCTION_FAILED;
+        }
+
+        return ERROR_SUCCESS;
+    }
 
     rc = MSI_SetFeatureStateW(package,szFeature,iState);
 
diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl
index aad2b3a..f64c8ae 100644
--- a/dlls/msi/msiserver.idl
+++ b/dlls/msi/msiserver.idl
@@ -27,6 +27,7 @@ cpp_quote("#if 0")
 typedef unsigned long MSIHANDLE;
 typedef int INSTALLMESSAGE;
 typedef int MSIRUNMODE;
+typedef int INSTALLSTATE;
 cpp_quote("#endif")
 
 [
@@ -47,6 +48,7 @@ interface IWineMsiRemotePackage : IUnknown
     HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value );
     HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size );
     HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret );
+    HRESULT SetFeatureState( [in] BSTR *feature, [in] INSTALLSTATE state );
 }
 
 [
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index d25c7ae..72eae3b 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1618,6 +1618,13 @@ HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL
     return S_OK;
 }
 
+HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR *feature, INSTALLSTATE state )
+{
+    msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
+    UINT r = MsiSetFeatureStateW(This->package, (LPWSTR)feature, state);
+    return HRESULT_FROM_WIN32(r);
+}
+
 static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl =
 {
     mrp_QueryInterface,
@@ -1634,6 +1641,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl =
     mrp_SetTargetPath,
     mrp_GetSourcePath,
     mrp_GetMode,
+    mrp_SetFeatureState,
 };
 
 HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )




More information about the wine-cvs mailing list