ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: automation: Implement Session::Installer.

Browse Source
This commit is contained in:
Misha Koshelev 2007-05-04 23:18:40 -05:00 committed by Alexandre Julliard
parent 8ba0b3c7b9
commit c7e7f36e77
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msi/automation.c
View File

@ -686,6 +686,14 @@ static HRESULT WINAPI SessionImpl_Invoke(
switch (dispIdMember) 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: case DISPID_SESSION_PROPERTY:
if (wFlags & DISPATCH_PROPERTYGET) { if (wFlags & DISPATCH_PROPERTYGET) {
hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr);

2
dlls/msi/msiserver.idl
View File

@ -163,6 +163,8 @@ library WindowsInstaller
{ {
properties: properties:
methods: methods:
[id(DISPID_SESSION_INSTALLER), propget]
Installer *Installer();
[id(DISPID_SESSION_PROPERTY), propget] [id(DISPID_SESSION_PROPERTY), propget]
BSTR Property([in] BSTR PropertyName); BSTR Property([in] BSTR PropertyName);
[id(DISPID_SESSION_PROPERTY), propput] [id(DISPID_SESSION_PROPERTY), propput]

1
dlls/msi/msiserver_dispids.h
View File

@ -26,6 +26,7 @@
#define DISPID_DATABASE_OPENVIEW 3 #define DISPID_DATABASE_OPENVIEW 3
#define DISPID_SESSION_INSTALLER 1
#define DISPID_SESSION_PROPERTY 2 #define DISPID_SESSION_PROPERTY 2
#define DISPID_SESSION_LANGUAGE 3 #define DISPID_SESSION_LANGUAGE 3
#define DISPID_SESSION_MODE 4 #define DISPID_SESSION_MODE 4

2
dlls/msi/tests/automation.c
View File

@ -908,12 +908,10 @@ static void test_Session(IDispatch *pSession)
HRESULT hr; HRESULT hr;
/* Session::Installer */ /* Session::Installer */
todo_wine {
hr = Session_Installer(pSession, &pInst); hr = Session_Installer(pSession, &pInst);
ok(SUCCEEDED(hr), "Session_Installer failed, hresult 0x%08x\n", hr); ok(SUCCEEDED(hr), "Session_Installer failed, hresult 0x%08x\n", hr);
ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n");
ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n");
}
/* Session::Property, get */ /* Session::Property, get */
memset(stringw, 0, sizeof(stringw)); memset(stringw, 0, sizeof(stringw));