Module: wine Branch: master Commit: f90fcca18120d0cfbfb61fc4d221313cddf618d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90fcca18120d0cfbfb61fc4d2...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Wed Feb 20 23:05:45 2008 +1100
msxml3: Implement IDispatch for IXMLDOMImplementation.
---
dlls/msxml3/domimpl.c | 57 +++++++++++++++++++++++++++++++++++++------ dlls/msxml3/main.c | 1 + dlls/msxml3/msxml_private.h | 1 + 3 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index c8afd6d..090c2c4 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -99,8 +99,13 @@ static HRESULT WINAPI dimimpl_GetTypeInfoCount( IXMLDOMImplementation *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; }
static HRESULT WINAPI dimimpl_GetTypeInfo( @@ -108,8 +113,14 @@ static HRESULT WINAPI dimimpl_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMImplementation_tid, ppTInfo); + + return hr; }
static HRESULT WINAPI dimimpl_GetIDsOfNames( @@ -117,8 +128,24 @@ static HRESULT WINAPI dimimpl_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( 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(IXMLDOMImplementation_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; }
static HRESULT WINAPI dimimpl_Invoke( @@ -127,8 +154,22 @@ static HRESULT WINAPI dimimpl_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( 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(IXMLDOMImplementation_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 dimimpl_hasFeature(IXMLDOMImplementation* This, BSTR feature, BSTR version, VARIANT_BOOL *hasFeature) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 5cce644..92e9dbb 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -49,6 +49,7 @@ static REFIID tid_ids[] = { &IID_IXMLDOMDocumentFragment, &IID_IXMLDOMElement, &IID_IXMLDOMEntityReference, + &IID_IXMLDOMImplementation, &IID_IXMLDOMNamedNodeMap, &IID_IXMLDOMNodeList, &IID_IXMLDOMParseError, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 96bb3de..6feb8ac 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -99,6 +99,7 @@ enum tid_t { IXMLDOMDocumentFragment_tid, IXMLDOMElement_tid, IXMLDOMEntityReference_tid, + IXMLDOMImplementation_tid, IXMLDOMNamedNodeMap_tid, IXMLDOMNodeList_tid, IXMLDOMParseError_tid,