msxml3: Add IDispatchEx support to IXMLDOMElement.
authorAlistair Leslie-Hughes <leslie_alistair@hotmail.com>
Mon, 31 Aug 2009 05:18:00 +0000 (15:18 +1000)
committerAlexandre Julliard <julliard@winehq.org>
Thu, 10 Sep 2009 08:49:17 +0000 (10:49 +0200)
dlls/msxml3/element.c
dlls/msxml3/tests/domdoc.c

index 6590e5baed58abca7da836c2c65c20bc06876c9a..531d43eea26c8f82d686b6794f531a03cf002a5d 100644 (file)
@@ -74,6 +74,10 @@ static HRESULT WINAPI domelem_QueryInterface(
     {
         *ppvObject = IXMLDOMNode_from_impl(This->node);
     }
+    else if(dispex_query_interface(&This->node->dispex, riid, ppvObject))
+    {
+        return *ppvObject ? S_OK : E_NOINTERFACE;
+    }
     else
     {
         FIXME("interface %s not implemented\n", debugstr_guid(riid));
@@ -751,6 +755,18 @@ static const struct IXMLDOMElementVtbl domelem_vtbl =
     domelem_normalize,
 };
 
+static const tid_t domelem_iface_tids[] = {
+    IXMLDOMElement_tid,
+    0
+};
+
+static dispex_static_data_t domelem_dispex = {
+    NULL,
+    IXMLDOMElement_tid,
+    NULL,
+    domelem_iface_tids
+};
+
 IUnknown* create_element( xmlNodePtr element )
 {
     domelem *This;
@@ -762,7 +778,7 @@ IUnknown* create_element( xmlNodePtr element )
     This->lpVtbl = &domelem_vtbl;
     This->ref = 1;
 
-    This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl, NULL );
+    This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl, &domelem_dispex );
     if(!This->node)
     {
         HeapFree(GetProcessHeap(), 0, This);
index 91e34f50a353523d3fae7ceb8a66f88bb1d0e48b..469a4f9449266323f6d9bb23fcb9c4b78ba0782e 100644 (file)
@@ -599,6 +599,8 @@ static void test_domdoc( void )
         IObjectIdentity *ident;
         BSTR tag = NULL;
 
+        test_disp((IUnknown*)element);
+
         r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident );
         ok( r == E_NOINTERFACE, "ret %08x\n", r);