[PATCH] Implement IDispatch for IXMLDOMNode

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Tue Apr 29 05:25:14 CDT 2008


---
 dlls/msxml3/main.c          |    1 +
 dlls/msxml3/msxml_private.h |    1 +
 dlls/msxml3/node.c          |   58 +++++++++++++++++++++++++++++++++++++------
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 3c2bc22..1bf3a98 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -55,6 +55,7 @@ static REFIID tid_ids[] = {
     &IID_IXMLDOMEntityReference,
     &IID_IXMLDOMImplementation,
     &IID_IXMLDOMNamedNodeMap,
+    &IID_IXMLDOMNode,
     &IID_IXMLDOMNodeList,
     &IID_IXMLDOMParseError,
     &IID_IXMLDOMProcessingInstruction,
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index 5484d66..f6932d1 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -102,6 +102,7 @@ enum tid_t {
     IXMLDOMEntityReference_tid,
     IXMLDOMImplementation_tid,
     IXMLDOMNamedNodeMap_tid,
+    IXMLDOMNode_tid,
     IXMLDOMNodeList_tid,
     IXMLDOMParseError_tid,
     IXMLDOMProcessingInstruction_tid,
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index f67a9f9..b344969 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -139,8 +139,13 @@ static HRESULT WINAPI xmlnode_GetTypeInfoCount(
     IXMLDOMNode *iface,
     UINT* pctinfo )
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+
+    TRACE("(%p)->(%p)\n", This, pctinfo);
+
+    *pctinfo = 1;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI xmlnode_GetTypeInfo(
@@ -149,8 +154,14 @@ static HRESULT WINAPI xmlnode_GetTypeInfo(
     LCID lcid,
     ITypeInfo** ppTInfo )
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    HRESULT hr;
+
+    TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+
+    hr = get_typeinfo(IXMLDOMNode_tid, ppTInfo);
+    
+    return hr;
 }
 
 static HRESULT WINAPI xmlnode_GetIDsOfNames(
@@ -161,8 +172,25 @@ static HRESULT WINAPI xmlnode_GetIDsOfNames(
     LCID lcid,
     DISPID* rgDispId )
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+          lcid, rgDispId);
+
+    if(!rgszNames || cNames == 0 || !rgDispId)
+        return E_INVALIDARG;
+
+    hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo);
+    if(SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId);
+        ITypeInfo_Release(typeinfo);
+    }
+
+    return hr;
 }
 
 static HRESULT WINAPI xmlnode_Invoke(
@@ -176,8 +204,22 @@ static HRESULT WINAPI xmlnode_Invoke(
     EXCEPINFO* pExcepInfo,
     UINT* puArgErr )
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+          lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+
+    hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo);
+    if(SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams,
+                pVarResult, pExcepInfo, puArgErr);
+        ITypeInfo_Release(typeinfo);
+    }
+
+    return hr;
 }
 
 static HRESULT WINAPI xmlnode_get_nodeName(
-- 
1.5.4.1


--------------020307000106090205090006--




More information about the wine-patches mailing list