msxml3: Add custom handling for DISPID_VALUE for node map
Nikolay Sivov
nsivov at codeweavers.com
Wed Dec 19 01:24:46 CST 2012
Add custom handling for DISPID_VALUE for node map
-------------- next part --------------
>From bcded2dbb6d53777c63c5e23c4a57d1962ecc545 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue, 18 Dec 2012 08:43:00 +0400
Subject: [PATCH 1/7] Add custom handling for DISPID_VALUE for node map
---
dlls/msxml3/nodemap.c | 65 +++++++++++++++++++++++--------
dlls/msxml3/tests/domdoc.c | 91 ++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 137 insertions(+), 19 deletions(-)
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index 94faf9f..be9f47d 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -388,28 +388,61 @@ static HRESULT xmlnodemap_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fla
TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei);
- V_VT(res) = VT_DISPATCH;
- V_DISPATCH(res) = NULL;
-
- if (id < DISPID_DOM_COLLECTION_BASE || id > DISPID_DOM_COLLECTION_MAX)
- return DISP_E_UNKNOWNNAME;
-
- switch(flags)
+ if (id >= DISPID_DOM_COLLECTION_BASE && id <= DISPID_DOM_COLLECTION_MAX)
{
- case INVOKE_PROPERTYGET:
+ switch(flags)
{
- IXMLDOMNode *disp = NULL;
-
- IXMLDOMNamedNodeMap_get_item(&This->IXMLDOMNamedNodeMap_iface, id - DISPID_DOM_COLLECTION_BASE, &disp);
- V_DISPATCH(res) = (IDispatch*)disp;
- break;
+ case DISPATCH_PROPERTYGET:
+ {
+ IXMLDOMNode *disp = NULL;
+
+ IXMLDOMNamedNodeMap_get_item(&This->IXMLDOMNamedNodeMap_iface, id - DISPID_DOM_COLLECTION_BASE, &disp);
+ V_DISPATCH(res) = (IDispatch*)disp;
+ break;
+ }
+ default:
+ {
+ FIXME("unimplemented flags %x\n", flags);
+ break;
+ }
}
- default:
+ }
+ else if (id == DISPID_VALUE)
+ {
+ switch(flags)
{
- FIXME("unimplemented flags %x\n", flags);
- break;
+ case DISPATCH_METHOD|DISPATCH_PROPERTYGET:
+ case DISPATCH_PROPERTYGET:
+ case DISPATCH_METHOD:
+ {
+ IXMLDOMNode *item;
+ VARIANT index;
+ HRESULT hr;
+
+ if (params->cArgs - params->cNamedArgs != 1) return DISP_E_BADPARAMCOUNT;
+
+ VariantInit(&index);
+ hr = VariantChangeType(&index, params->rgvarg, 0, VT_I4);
+ if(FAILED(hr))
+ {
+ FIXME("failed to convert arg, %s\n", debugstr_variant(params->rgvarg));
+ return hr;
+ }
+
+ IXMLDOMNamedNodeMap_get_item(&This->IXMLDOMNamedNodeMap_iface, V_I4(&index), &item);
+ V_VT(res) = VT_DISPATCH;
+ V_DISPATCH(res) = (IDispatch*)item;
+ break;
+ }
+ default:
+ {
+ FIXME("DISPID_VALUE: unimplemented flags %x\n", flags);
+ break;
+ }
}
}
+ else
+ return DISP_E_UNKNOWNNAME;
TRACE("ret %p\n", V_DISPATCH(res));
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index d846db5..49d3ded 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -10004,7 +10004,7 @@ static void test_dispex(void)
ok(did == DISPID_VALUE, "got %d\n", did);
V_VT(&arg) = VT_I4;
- V_I2(&arg) = 0;
+ V_I4(&arg) = 0;
dispparams.cArgs = 0;
dispparams.cNamedArgs = 0;
dispparams.rgdispidNamedArgs = NULL;
@@ -10018,7 +10018,7 @@ static void test_dispex(void)
ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret));
V_VT(&arg) = VT_I4;
- V_I2(&arg) = 0;
+ V_I4(&arg) = 0;
dispparams.cArgs = 2;
dispparams.cNamedArgs = 0;
dispparams.rgdispidNamedArgs = NULL;
@@ -10032,7 +10032,7 @@ static void test_dispex(void)
ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret));
V_VT(&arg) = VT_I4;
- V_I2(&arg) = 0;
+ V_I4(&arg) = 0;
dispparams.cArgs = 1;
dispparams.cNamedArgs = 0;
dispparams.rgdispidNamedArgs = NULL;
@@ -10142,6 +10142,91 @@ static void test_dispex(void)
ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did);
IDispatchEx_Release(dispex);
+ did = -1;
+ hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(did == DISPID_VALUE, "got %d\n", did);
+
+ V_VT(&arg) = VT_I4;
+ V_I4(&arg) = 0;
+ dispparams.cArgs = 0;
+ dispparams.cNamedArgs = 0;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = &arg;
+
+ V_VT(&ret) = VT_EMPTY;
+ V_DISPATCH(&ret) = (void*)0x1;
+ hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+ ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr);
+ ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+ ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret));
+
+ V_VT(&arg) = VT_I4;
+ V_I4(&arg) = 0;
+ dispparams.cArgs = 2;
+ dispparams.cNamedArgs = 0;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = &arg;
+
+ V_VT(&ret) = VT_EMPTY;
+ V_DISPATCH(&ret) = (void*)0x1;
+ hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+ ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr);
+ ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+ ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret));
+
+ V_VT(&arg) = VT_I4;
+ V_I4(&arg) = 0;
+ dispparams.cArgs = 1;
+ dispparams.cNamedArgs = 0;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = &arg;
+
+ V_VT(&ret) = VT_EMPTY;
+ V_DISPATCH(&ret) = (void*)0x1;
+ hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+ ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+ V_VT(&ret) = VT_EMPTY;
+ V_DISPATCH(&ret) = (void*)0x1;
+ hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+ ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+ V_VT(&ret) = VT_EMPTY;
+ V_DISPATCH(&ret) = (void*)0x1;
+ hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+ ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+ dispparams.cArgs = 0;
+ dispparams.cNamedArgs = 0;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = NULL;
+
+ V_VT(&ret) = VT_EMPTY;
+ V_I4(&ret) = 1;
+ hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(V_VT(&ret) == VT_I4, "got %d\n", V_VT(&ret));
+ ok(V_I4(&ret) == 0, "got %d\n", V_I4(&ret));
+
+ dispparams.cArgs = 0;
+ dispparams.cNamedArgs = 0;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = NULL;
+
+ V_VT(&ret) = VT_EMPTY;
+ V_I4(&ret) = 1;
+ hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+ ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr);
+ ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+ ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret));
+
IXMLDOMNamedNodeMap_Release(map);
IXMLDOMElement_Release(elem);
--
1.7.10.4
More information about the wine-patches
mailing list