Misha Koshelev : msi: automation: Implement Session::Installer.

[Alexandre Julliard]

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

Author: Misha Koshelev 
Date:   Fri May  4 23:18:40 2007 -0500

msi: automation: Implement Session::Installer.

---

dlls/msi/automation.c        |    8 ++++++++
 dlls/msi/msiserver.idl       |    2 ++
 dlls/msi/msiserver_dispids.h |    1 +
 dlls/msi/tests/automation.c  |   10 ++++------
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c
index 07994e1..169ad81 100644
--- a/dlls/msi/automation.c
+++ b/dlls/msi/automation.c
@@ -686,6 +686,14 @@ static HRESULT WINAPI SessionImpl_Invoke(

switch (dispIdMember)
     {
+	case DISPID_SESSION_INSTALLER:
+	    if (wFlags & DISPATCH_PROPERTYGET) {
+                V_VT(pVarResult) = VT_DISPATCH;
+                IDispatch_AddRef(This->pInstaller);
+                V_DISPATCH(pVarResult) = This->pInstaller;
+	    }
+	    break;
+
    case DISPID_SESSION_PROPERTY:
        if (wFlags & DISPATCH_PROPERTYGET) {
                 hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr);
diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl
index 4d6c00b..09ea7c7 100644
--- a/dlls/msi/msiserver.idl
+++ b/dlls/msi/msiserver.idl
@@ -163,6 +163,8 @@ library WindowsInstaller
     {
     properties:
     methods:
+        [id(DISPID_SESSION_INSTALLER), propget]
+            Installer *Installer();
         [id(DISPID_SESSION_PROPERTY), propget]
             BSTR Property([in] BSTR PropertyName);
         [id(DISPID_SESSION_PROPERTY), propput]
diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h
index 1c7a17f..e5efa3e 100644
--- a/dlls/msi/msiserver_dispids.h
+++ b/dlls/msi/msiserver_dispids.h
@@ -26,6 +26,7 @@

#define DISPID_DATABASE_OPENVIEW 3

+#define DISPID_SESSION_INSTALLER 1
 #define DISPID_SESSION_PROPERTY 2
 #define DISPID_SESSION_LANGUAGE 3
 #define DISPID_SESSION_MODE 4
diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index d4977ab..91e7b9a 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -908,12 +908,10 @@ static void test_Session(IDispatch *pSession)
     HRESULT hr;

/* Session::Installer */
-    todo_wine {
-        hr = Session_Installer(pSession, &pInst);
-        ok(SUCCEEDED(hr), "Session_Installer failed, hresult 0x%08x\n", hr);
-        ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n");
-        ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n");
-    }
+    hr = Session_Installer(pSession, &pInst);
+    ok(SUCCEEDED(hr), "Session_Installer failed, hresult 0x%08x\n", hr);
+    ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n");
+    ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n");

/* Session::Property, get */
     memset(stringw, 0, sizeof(stringw));