February 2008 - Wine-commits

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDocument.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: aa284e7e76aba87f2e3bb782e8a3e4e70739ecfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa284e7e76aba87f2e3bb782e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 12:36:53 2008 +1100 msxml3: Implemented IDispatch for IXMLDocument. --- dlls/msxml3/xmldoc.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index ee72d1b..fb653ad 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -126,23 +126,50 @@ static ULONG WINAPI xmldoc_Release(IXMLDocument *iface) static HRESULT WINAPI xmldoc_GetTypeInfoCount(IXMLDocument *iface, UINT* pctinfo) { - FIXME("\n"); - return E_NOTIMPL; + xmldoc *This = impl_from_IXMLDocument(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI xmldoc_GetTypeInfo(IXMLDocument *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { - FIXME("\n"); - return E_NOTIMPL; + xmldoc *This = impl_from_IXMLDocument(iface); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDocument_tid, ppTInfo); + + return hr; } static HRESULT WINAPI xmldoc_GetIDsOfNames(IXMLDocument *iface, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId) { - FIXME("\n"); - return E_NOTIMPL; + xmldoc *This = impl_from_IXMLDocument(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(IXMLDocument_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI xmldoc_Invoke(IXMLDocument *iface, DISPID dispIdMember, @@ -150,8 +177,22 @@ static HRESULT WINAPI xmldoc_Invoke(IXMLDocument *iface, DISPID dispIdMember, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) { - FIXME("\n"); - return E_NOTIMPL; + xmldoc *This = impl_from_IXMLDocument(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(IXMLDocument_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 xmldoc_get_root(IXMLDocument *iface, IXMLElement **p)

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMDocument2 .
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: e2ac47a4f1cded3f2c4aebf8a902637b488056aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ac47a4f1cded3f2c4aebf8a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 06:28:54 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMDocument2. --- dlls/msxml3/domdoc.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cb63922..fed1b8b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -416,16 +416,27 @@ static ULONG WINAPI domdoc_Release( static HRESULT WINAPI domdoc_GetTypeInfoCount( IXMLDOMDocument2 *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI domdoc_GetTypeInfo( IXMLDOMDocument2 *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMDocument2_tid, ppTInfo); + + return hr; } static HRESULT WINAPI domdoc_GetIDsOfNames( @@ -436,8 +447,24 @@ static HRESULT WINAPI domdoc_GetIDsOfNames( LCID lcid, DISPID* rgDispId) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( 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(IXMLDOMDocument2_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } @@ -452,8 +479,22 @@ static HRESULT WINAPI domdoc_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( 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(IXMLDOMDocument2_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMText length property.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 72e70a0122f906b9899d80ce2824db6d190e39f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e70a0122f906b9899d80ce2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 08:28:38 2008 +1100 msxml3: Implement IXMLDOMText length property. --- dlls/msxml3/tests/domdoc.c | 9 +++++++++ dlls/msxml3/text.c | 22 ++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2401878..ef1b3d9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -366,6 +366,7 @@ static void test_domdoc( void ) VARIANT var; BSTR str; long code; + long nLength = 0; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -554,6 +555,14 @@ static void test_domdoc( void ) ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n"); VariantClear(&var); + /* test length property */ + r = IXMLDOMText_get_length(nodetext, NULL); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 4, "expected 4 got %ld\n", nLength); + /* test nodeTypeString */ r = IXMLDOMText_get_nodeTypeString(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 4c57cce..031e5a9 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -491,8 +491,26 @@ static HRESULT WINAPI domtext_get_length( IXMLDOMText *iface, long *len) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pContent; + long nLength = 0; + + TRACE("%p\n", iface); + + if(!len) + return E_INVALIDARG; + + pContent = xmlNodeGetContent(pDOMNode->node); + if(pContent) + { + nLength = xmlStrlen(pContent); + xmlFree(pContent); + } + + *len = nLength; + + return S_OK; } static HRESULT WINAPI domtext_substringData(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMParseError.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 39b2f0fd834974bba7f55a9ba5fdc7e3b8c847e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b2f0fd834974bba7f55a9ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 12:28:08 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMParseError. --- dlls/msxml3/parseerror.c | 57 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index f70ed52..4db078b 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -107,8 +107,13 @@ static HRESULT WINAPI parseError_GetTypeInfoCount( IXMLDOMParseError *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI parseError_GetTypeInfo( @@ -117,8 +122,14 @@ static HRESULT WINAPI parseError_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMParseError_tid, ppTInfo); + + return hr; } static HRESULT WINAPI parseError_GetIDsOfNames( @@ -129,8 +140,24 @@ static HRESULT WINAPI parseError_GetIDsOfNames( LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + parse_error_t *This = impl_from_IXMLDOMParseError( 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(IXMLDOMParseError_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI parseError_Invoke( @@ -144,8 +171,22 @@ static HRESULT WINAPI parseError_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + parse_error_t *This = impl_from_IXMLDOMParseError( 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(IXMLDOMParseError_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 parseError_get_errorCode(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMNodeList.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: a6eb94f380b15b26a9bb9b373162faee29c26ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6eb94f380b15b26a9bb9b373… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 12:32:36 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMNodeList. --- dlls/msxml3/queryresult.c | 57 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 85d7aca..81c7de5 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -164,8 +164,13 @@ static HRESULT WINAPI queryresult_GetTypeInfoCount( IXMLDOMNodeList *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + queryresult *This = impl_from_IXMLDOMNodeList( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI queryresult_GetTypeInfo( @@ -174,8 +179,14 @@ static HRESULT WINAPI queryresult_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + queryresult *This = impl_from_IXMLDOMNodeList( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMNodeList_tid, ppTInfo); + + return hr; } static HRESULT WINAPI queryresult_GetIDsOfNames( @@ -186,8 +197,24 @@ static HRESULT WINAPI queryresult_GetIDsOfNames( LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + queryresult *This = impl_from_IXMLDOMNodeList( 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(IXMLDOMNodeList_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI queryresult_Invoke( @@ -201,8 +228,22 @@ static HRESULT WINAPI queryresult_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + queryresult *This = impl_from_IXMLDOMNodeList( 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(IXMLDOMNodeList_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 queryresult_get_item(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLElement.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: c75df9b8427d41adc03cf9a92f73ecd44bf9e214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75df9b8427d41adc03cf9a92… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 12:40:29 2008 +1100 msxml3: Implemented IDispatch for IXMLElement. --- dlls/msxml3/xmlelem.c | 57 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 5af43a7..8166e6a 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -100,23 +100,50 @@ static ULONG WINAPI xmlelem_Release(IXMLElement *iface) static HRESULT WINAPI xmlelem_GetTypeInfoCount(IXMLElement *iface, UINT* pctinfo) { - FIXME("\n"); - return E_NOTIMPL; + xmlelem *This = impl_from_IXMLElement(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI xmlelem_GetTypeInfo(IXMLElement *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { - FIXME("\n"); - return E_NOTIMPL; + xmlelem *This = impl_from_IXMLElement(iface); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLElement_tid, ppTInfo); + + return hr; } static HRESULT WINAPI xmlelem_GetIDsOfNames(IXMLElement *iface, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId) { - FIXME("\n"); - return E_NOTIMPL; + xmlelem *This = impl_from_IXMLElement(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(IXMLElement_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI xmlelem_Invoke(IXMLElement *iface, DISPID dispIdMember, @@ -124,8 +151,22 @@ static HRESULT WINAPI xmlelem_Invoke(IXMLElement *iface, DISPID dispIdMember, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) { - FIXME("\n"); - return E_NOTIMPL; + xmlelem *This = impl_from_IXMLElement(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(IXMLElement_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static inline BSTR str_dup_upper(BSTR str)

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMElement.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: fb08f209e1d2f1c8061b86e550664a38fff307b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb08f209e1d2f1c8061b86e55… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 12:13:22 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMElement. --- dlls/msxml3/element.c | 57 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6ee8881..76af4c6 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -92,8 +92,13 @@ static HRESULT WINAPI domelem_GetTypeInfoCount( IXMLDOMElement *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI domelem_GetTypeInfo( @@ -101,8 +106,14 @@ static HRESULT WINAPI domelem_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMElement_tid, ppTInfo); + + return hr; } static HRESULT WINAPI domelem_GetIDsOfNames( @@ -110,8 +121,24 @@ static HRESULT WINAPI domelem_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( 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(IXMLDOMElement_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domelem_Invoke( @@ -120,8 +147,22 @@ static HRESULT WINAPI domelem_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( 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(IXMLDOMElement_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 domelem_get_nodeName(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMEntityReference.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: b0783a3d946c4afac406629817edb25eb0e8265c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0783a3d946c4afac40662981… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 12:20:45 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMEntityReference. --- dlls/msxml3/entityref.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index a4634a9..a72b110 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -106,8 +106,12 @@ static HRESULT WINAPI entityref_GetTypeInfoCount( IXMLDOMEntityReference *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + entityref *This = impl_from_IXMLDOMEntityReference( iface ); + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI entityref_GetTypeInfo( @@ -115,8 +119,14 @@ static HRESULT WINAPI entityref_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + entityref *This = impl_from_IXMLDOMEntityReference( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMEntityReference_tid, ppTInfo); + + return hr; } static HRESULT WINAPI entityref_GetIDsOfNames( @@ -124,8 +134,24 @@ static HRESULT WINAPI entityref_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + entityref *This = impl_from_IXMLDOMEntityReference( 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(IXMLDOMEntityReference_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI entityref_Invoke( @@ -134,8 +160,22 @@ static HRESULT WINAPI entityref_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + entityref *This = impl_from_IXMLDOMEntityReference( 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(IXMLDOMEntityReference_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 entityref_get_nodeName(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMNamedNodeMap.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 5fb8b2f3c1bc11eb87aa0bb94b371795cc538961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb8b2f3c1bc11eb87aa0bb94… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 12:24:18 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMNamedNodeMap. --- dlls/msxml3/nodemap.c | 57 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 1a7d4dc..f41df2f 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -112,8 +112,13 @@ static HRESULT WINAPI xmlnodemap_GetTypeInfoCount( IXMLDOMNamedNodeMap *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI xmlnodemap_GetTypeInfo( @@ -121,8 +126,14 @@ static HRESULT WINAPI xmlnodemap_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMNamedNodeMap_tid, ppTInfo); + + return hr; } static HRESULT WINAPI xmlnodemap_GetIDsOfNames( @@ -130,8 +141,24 @@ static HRESULT WINAPI xmlnodemap_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( 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(IXMLDOMNamedNodeMap_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI xmlnodemap_Invoke( @@ -140,8 +167,22 @@ static HRESULT WINAPI xmlnodemap_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( 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(IXMLDOMNamedNodeMap_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } xmlChar *xmlChar_from_wchar( LPWSTR str )

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMProcessingInstruction.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 9fecdccc63e0e7d8a0cf6f161d2bb3486b3e40b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fecdccc63e0e7d8a0cf6f161… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 09:21:06 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMProcessingInstruction. --- dlls/msxml3/pi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 1129690..a0b0cf2 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -106,8 +106,13 @@ static HRESULT WINAPI dom_pi_GetTypeInfoCount( IXMLDOMProcessingInstruction *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI dom_pi_GetTypeInfo( @@ -115,8 +120,14 @@ static HRESULT WINAPI dom_pi_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, ppTInfo); + + return hr; } static HRESULT WINAPI dom_pi_GetIDsOfNames( @@ -124,8 +135,24 @@ static HRESULT WINAPI dom_pi_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( 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(IXMLDOMProcessingInstruction_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI dom_pi_Invoke( @@ -134,8 +161,22 @@ static HRESULT WINAPI dom_pi_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( 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(IXMLDOMProcessingInstruction_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 dom_pi_get_nodeName(

1 0