February 2010 - Wine-commits

Jacek Caban : mshtml: Added IViewObject::SetSink tests.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 38933b1a31b1a389f78a65430e79e03f3983ff13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38933b1a31b1a389f78a65430… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 16:04:06 2010 +0100 mshtml: Added IViewObject::SetSink tests. --- dlls/mshtml/tests/htmldoc.c | 104 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 87 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1cb18c1..d49a6ff 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -152,6 +152,7 @@ DEFINE_EXPECT(Frame_EnableModeless_FALSE); DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(Advise_Close); +DEFINE_EXPECT(OnViewChange); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -2678,50 +2679,60 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; -static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSink *iface, +static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSinkEx *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); } -static ULONG WINAPI AdviseSink_AddRef(IAdviseSink *iface) +static ULONG WINAPI AdviseSink_AddRef(IAdviseSinkEx *iface) { return 2; } -static ULONG WINAPI AdviseSink_Release(IAdviseSink *iface) +static ULONG WINAPI AdviseSink_Release(IAdviseSinkEx *iface) { return 1; } -static void WINAPI AdviseSink_OnDataChange(IAdviseSink *iface, +static void WINAPI AdviseSink_OnDataChange(IAdviseSinkEx *iface, FORMATETC *pFormatetc, STGMEDIUM *pStgmed) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnViewChange(IAdviseSink *iface, +static void WINAPI AdviseSink_OnViewChange(IAdviseSinkEx *iface, DWORD dwAspect, LONG lindex) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnRename(IAdviseSink *iface, IMoniker *pmk) +static void WINAPI AdviseSink_OnRename(IAdviseSinkEx *iface, IMoniker *pmk) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnSave(IAdviseSink *iface) +static void WINAPI AdviseSink_OnSave(IAdviseSinkEx *iface) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnClose(IAdviseSink *iface) +static void WINAPI AdviseSink_OnClose(IAdviseSinkEx *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSinkEx_OnViewStatusChange(IAdviseSinkEx *iface, DWORD dwViewStatus) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI ObjectAdviseSink_OnClose(IAdviseSinkEx *iface) { CHECK_EXPECT(Advise_Close); } -static const IAdviseSinkVtbl AdviseSinkVtbl = { +static const IAdviseSinkExVtbl AdviseSinkVtbl = { AdviseSink_QueryInterface, AdviseSink_AddRef, AdviseSink_Release, @@ -2729,10 +2740,47 @@ static const IAdviseSinkVtbl AdviseSinkVtbl = { AdviseSink_OnViewChange, AdviseSink_OnRename, AdviseSink_OnSave, - AdviseSink_OnClose + ObjectAdviseSink_OnClose, + AdviseSinkEx_OnViewStatusChange +}; + +static IAdviseSinkEx AdviseSink = { &AdviseSinkVtbl }; + +static HRESULT WINAPI ViewAdviseSink_QueryInterface(IAdviseSinkEx *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IAdviseSinkEx, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static void WINAPI ViewAdviseSink_OnViewChange(IAdviseSinkEx *iface, + DWORD dwAspect, LONG lindex) +{ + CHECK_EXPECT2(OnViewChange); + + ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %d\n", dwAspect); + ok(lindex == -1, "lindex = %d\n", lindex); +} + +static const IAdviseSinkExVtbl ViewAdviseSinkVtbl = { + ViewAdviseSink_QueryInterface, + AdviseSink_AddRef, + AdviseSink_Release, + AdviseSink_OnDataChange, + ViewAdviseSink_OnViewChange, + AdviseSink_OnRename, + AdviseSink_OnSave, + AdviseSink_OnClose, + AdviseSinkEx_OnViewStatusChange }; -static IAdviseSink AdviseSink = { &AdviseSinkVtbl }; +static IAdviseSinkEx ViewAdviseSink = { &ViewAdviseSinkVtbl }; DEFINE_GUID(IID_unk1, 0xD48A6EC6,0x6A4A,0x11CF,0x94,0xA7,0x44,0x45,0x53,0x54,0x00,0x00); /* HTMLWindow2 ? */ DEFINE_GUID(IID_IThumbnailView, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4F,0x79,0xAB,0xCD); @@ -2919,6 +2967,20 @@ static void _test_readyState(unsigned line, IUnknown *unk) IHTMLDocument2_Release(htmldoc); } +static void test_ViewAdviseSink(IHTMLDocument2 *doc) +{ + IViewObject *view; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IViewObject, (void**)&view); + ok(hres == S_OK, "QueryInterface(IID_IViewObject) failed: %08x\n", hres); + + hres = IViewObject_SetAdvise(view, DVASPECT_CONTENT, ADVF_PRIMEFIRST, (IAdviseSink*)&ViewAdviseSink); + ok(hres == S_OK, "SetAdvise failed: %08x\n", hres); + + IViewObject_Release(view); +} + static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID riid) { IConnectionPointContainer *tmp_container = NULL; @@ -3100,6 +3162,7 @@ static void test_download(DWORD flags) SET_EXPECT(SetStatusText); if(!(flags & DWL_EMPTY)) SET_EXPECT(Exec_SETDOWNLOADSTATE_1); + SET_EXPECT(OnViewChange); SET_EXPECT(GetDropTarget); if(flags & DWL_TRYCSS) SET_EXPECT(Exec_ShellDocView_84); @@ -3148,6 +3211,7 @@ static void test_download(DWORD flags) CHECK_CALLED(SetStatusText); if(!(flags & DWL_EMPTY)) CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); + CHECK_CALLED(OnViewChange); CHECK_CALLED(GetDropTarget); if(flags & DWL_TRYCSS) SET_CALLED(Exec_ShellDocView_84); @@ -3845,14 +3909,14 @@ static void test_Advise(IHTMLDocument2 *doc) ok(hres == E_INVALIDARG || hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 0 || conn == 1, "conn = %d\n", conn); - hres = IOleObject_Advise(oleobj, &AdviseSink, NULL); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, NULL); ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 1, "conn = %d\n", conn); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 2, "conn = %d\n", conn); @@ -4281,6 +4345,7 @@ static void test_HTMLDocument(BOOL do_load) test_IsDirty(doc, S_FALSE); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_external(doc, FALSE); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, &Moniker); @@ -4376,6 +4441,7 @@ static void test_HTMLDocument_hlink(void) return; doc_unk = (IUnknown*)doc; + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, &Moniker); @@ -4476,6 +4542,7 @@ static void test_HTMLDocument_http(void) hres = CreateURLMoniker(NULL, http_urlW, &http_mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, http_mon); @@ -4551,11 +4618,12 @@ static void test_HTMLDocument_StreamLoad(void) hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); test_readyState((IUnknown*)doc); test_IsDirty(doc, S_FALSE); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_QueryService(doc, FALSE); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); @@ -4608,11 +4676,12 @@ static void test_HTMLDocument_StreamInitNew(void) hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); test_readyState((IUnknown*)doc); test_IsDirty(doc, S_FALSE); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); @@ -4691,10 +4760,11 @@ static void test_editing_mode(BOOL do_load) hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); test_readyState((IUnknown*)doc); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj);

1 0

Hans Leidekker : msi: Implement and test MsiGetPatchInfoA/W.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 438ad93b223dc8cb722b1550adca160a59812e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=438ad93b223dc8cb722b1550a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 16:18:30 2010 +0100 msi: Implement and test MsiGetPatchInfoA/W. --- dlls/msi/msi.c | 87 ++++++++++++++++++++++++ dlls/msi/msi.spec | 4 +- dlls/msi/tests/msi.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/msi.h | 4 + 4 files changed, 271 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=438ad93b223dc8cb722b1…

1 0

Nikolay Sivov : msxml3: Reimplement IXMLDOMDocument:: createProcessingInstruction() on top of ::createNode().
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 20a240fe417a0f26bd095abc290fd0c3e7a71689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a240fe417a0f26bd095abc2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 23:06:42 2010 +0300 msxml3: Reimplement IXMLDOMDocument::createProcessingInstruction() on top of ::createNode(). --- dlls/msxml3/domdoc.c | 43 ++++++++++++++++++++++--------------------- dlls/msxml3/tests/domdoc.c | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4e9deb9..479c98c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1189,35 +1189,36 @@ static HRESULT WINAPI domdoc_createProcessingInstruction( BSTR data, IXMLDOMProcessingInstruction** pi ) { -#ifdef HAVE_XMLNEWDOCPI - xmlNodePtr xmlnode; domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlChar *xml_target, *xml_content; + IXMLDOMNode *node; + VARIANT type; + HRESULT hr; - TRACE("%p->(%s %s %p)\n", iface, debugstr_w(target), debugstr_w(data), pi); + TRACE("%p->(%s %s %p)\n", This, debugstr_w(target), debugstr_w(data), pi); - if(!pi) - return E_INVALIDARG; + if (!pi) return E_INVALIDARG; - if(!target || lstrlenW(target) == 0) - return E_FAIL; + *pi = NULL; - xml_target = xmlChar_from_wchar(target); - xml_content = xmlChar_from_wchar(data); + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_PROCESSING_INSTRUCTION; - xmlnode = xmlNewDocPI(get_doc(This), xml_target, xml_content); - xmldoc_add_orphan(xmlnode->doc, xmlnode); - TRACE("created xmlptr %p\n", xmlnode); - *pi = (IXMLDOMProcessingInstruction*)create_pi(xmlnode); + hr = IXMLDOMDocument2_createNode(iface, type, target, NULL, &node); + if (hr == S_OK) + { + VARIANT v_data; - heap_free(xml_content); - heap_free(xml_target); + /* this is to bypass check in ::put_data() that blocks "<?xml" PIs */ + V_VT(&v_data) = VT_BSTR; + V_BSTR(&v_data) = data; - return S_OK; -#else - FIXME("Libxml 2.6.15 or greater required.\n"); - return E_NOTIMPL; -#endif + hr = IXMLDOMNode_put_nodeValue( node, v_data ); + + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)pi); + IXMLDOMNode_Release(node); + } + + return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 63c3e15..88acb2c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1887,6 +1887,26 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + /* NODE_PROCESSING_INSTRUCTION */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_PROCESSING_INSTRUCTION; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_PROCESSING_INSTRUCTION; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_PROCESSING_INSTRUCTION; + r = IXMLDOMDocument_createNode( doc, var, _bstr_("pi"), NULL, NULL ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT;

1 0

Nikolay Sivov : msxml3: Accept NODE_ENTITY_REFERENCE in ::createNode() and use it for ::createEntityReference().
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 5262c570f10495fb1ede90dc086b391c5a999e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5262c570f10495fb1ede90dc0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 23:24:40 2010 +0300 msxml3: Accept NODE_ENTITY_REFERENCE in ::createNode() and use it for ::createEntityReference(). --- dlls/msxml3/domdoc.c | 38 ++++++++++++++++++++------------------ dlls/msxml3/tests/domdoc.c | 21 +++++++++++++++++++++ 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 479c98c..3e73242 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1253,32 +1253,30 @@ static HRESULT WINAPI domdoc_createAttribute( static HRESULT WINAPI domdoc_createEntityReference( IXMLDOMDocument2 *iface, BSTR name, - IXMLDOMEntityReference** entityRef ) + IXMLDOMEntityReference** entityref ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlNodePtr xmlnode; - xmlChar *xml_name; - - TRACE("%p\n", iface); + IXMLDOMNode *node; + VARIANT type; + HRESULT hr; - if(!entityRef) - return E_INVALIDARG; + TRACE("%p->(%s %p)\n", This, debugstr_w(name), entityref); - *entityRef = NULL; + if (!entityref) return E_INVALIDARG; - xml_name = xmlChar_from_wchar(name); - xmlnode = xmlNewReference(get_doc( This ), xml_name ); - heap_free(xml_name); + *entityref = NULL; - if(!xmlnode) - return E_FAIL; - - xmlnode->doc = get_doc( This ); - xmldoc_add_orphan(xmlnode->doc, xmlnode); + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_ENTITY_REFERENCE; - *entityRef = (IXMLDOMEntityReference*)create_doc_entity_ref(xmlnode); + hr = IXMLDOMDocument2_createNode(iface, type, name, NULL, &node); + if (hr == S_OK) + { + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMEntityReference, (void**)entityref); + IXMLDOMNode_Release(node); + } - return S_OK; + return hr; } @@ -1358,6 +1356,7 @@ static HRESULT WINAPI domdoc_createNode( { case NODE_ELEMENT: case NODE_ATTRIBUTE: + case NODE_ENTITY_REFERENCE: case NODE_PROCESSING_INSTRUCTION: if (!name || SysStringLen(name) == 0) return E_FAIL; default: @@ -1380,6 +1379,9 @@ static HRESULT WINAPI domdoc_createNode( case NODE_CDATA_SECTION: xmlnode = xmlNewCDataBlock(get_doc(This), NULL, 0); break; + case NODE_ENTITY_REFERENCE: + xmlnode = xmlNewReference(get_doc(This), xml_name); + break; case NODE_PROCESSING_INSTRUCTION: #ifdef HAVE_XMLNEWDOCPI xmlnode = xmlNewDocPI(get_doc(This), xml_name, NULL); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 88acb2c..c6937e6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1907,6 +1907,22 @@ static void test_create(void) r = IXMLDOMDocument_createNode( doc, var, _bstr_("pi"), NULL, NULL ); ok( r == E_INVALIDARG, "returns %08x\n", r ); + /* NODE_ENTITY_REFERENCE */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ENTITY_REFERENCE; + str = SysAllocString( szlc ); + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ENTITY_REFERENCE; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; @@ -3882,6 +3898,11 @@ static void test_xmlTypes(void) } /* Entity References */ + hr = IXMLDOMDocument_createEntityReference(doc, NULL, &pEntityRef); + ok(hr == E_FAIL, "ret %08x\n", hr ); + hr = IXMLDOMDocument_createEntityReference(doc, _bstr_(""), &pEntityRef); + ok(hr == E_FAIL, "ret %08x\n", hr ); + str = SysAllocString(szEntityRef); hr = IXMLDOMDocument_createEntityReference(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr );

1 0

Nikolay Sivov : msxml3: Fix return value for IXMLDOMNode_put_nodeValue() for unsupported types.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: c1464f8ab9dadf41196dab6a40a24142f9ab3929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1464f8ab9dadf41196dab6a4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Feb 13 02:25:08 2010 +0300 msxml3: Fix return value for IXMLDOMNode_put_nodeValue() for unsupported types. --- dlls/msxml3/node.c | 35 +++++++++++----------- dlls/msxml3/tests/domdoc.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 5691c52..54782f9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -327,23 +327,11 @@ static HRESULT WINAPI xmlnode_put_nodeValue( { xmlnode *This = impl_from_IXMLDOMNode( iface ); HRESULT hr; - xmlChar *str = NULL; - VARIANT string_value; TRACE("%p type(%d)\n", This, This->node->type); - VariantInit(&string_value); - hr = VariantChangeType(&string_value, &value, 0, VT_BSTR); - if(FAILED(hr)) - { - VariantClear(&string_value); - WARN("Couldn't convert to VT_BSTR\n"); - return hr; - } - - hr = S_FALSE; /* Document, Document Fragment, Document Type, Element, - Entity, Entity Reference, Notation aren't supported. */ + Entity, Entity Reference, Notation aren't supported. */ switch ( This->node->type ) { case XML_ATTRIBUTE_NODE: @@ -351,20 +339,33 @@ static HRESULT WINAPI xmlnode_put_nodeValue( case XML_COMMENT_NODE: case XML_PI_NODE: case XML_TEXT_NODE: - { + { + VARIANT string_value; + xmlChar *str; + + VariantInit(&string_value); + hr = VariantChangeType(&string_value, &value, 0, VT_BSTR); + if(FAILED(hr)) + { + VariantClear(&string_value); + WARN("Couldn't convert to VT_BSTR\n"); + return hr; + } + str = xmlChar_from_wchar(V_BSTR(&string_value)); + VariantClear(&string_value); + xmlNodeSetContent(This->node, str); heap_free(str); hr = S_OK; break; - } + } default: /* Do nothing for unsupported types. */ + hr = E_FAIL; break; } - VariantClear(&string_value); - return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c6937e6..dc86881 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5000,6 +5000,73 @@ static void test_TransformWithLoadingLocalFile(void) free_bstrs(); } +static void test_put_nodeValue(void) +{ + IXMLDOMDocument *doc; + IXMLDOMEntityReference *entityref; + IXMLDOMNode *node; + HRESULT hr; + VARIANT data, type; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + /* test for unsupported types */ + /* NODE_DOCUMENT */ + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMNode, (void**)&node); + ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&data) = VT_BSTR; + V_BSTR(&data) = _bstr_("one two three"); + hr = IXMLDOMNode_put_nodeValue(node, data); + ok(hr == E_FAIL, "ret %08x\n", hr ); + IXMLDOMNode_Release(node); + + /* NODE_DOCUMENT_FRAGMENT */ + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_DOCUMENT_FRAGMENT; + hr = IXMLDOMDocument_createNode(doc, type, _bstr_("test"), NULL, &node); + ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&data) = VT_BSTR; + V_BSTR(&data) = _bstr_("one two three"); + hr = IXMLDOMNode_put_nodeValue(node, data); + ok(hr == E_FAIL, "ret %08x\n", hr ); + IXMLDOMNode_Release(node); + + /* NODE_ELEMENT */ + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_ELEMENT; + hr = IXMLDOMDocument_createNode(doc, type, _bstr_("test"), NULL, &node); + ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&data) = VT_BSTR; + V_BSTR(&data) = _bstr_("one two three"); + hr = IXMLDOMNode_put_nodeValue(node, data); + ok(hr == E_FAIL, "ret %08x\n", hr ); + IXMLDOMNode_Release(node); + + /* NODE_ENTITY_REFERENCE */ + hr = IXMLDOMDocument_createEntityReference(doc, _bstr_("ref"), &entityref); + ok(hr == S_OK, "ret %08x\n", hr ); + + V_VT(&data) = VT_BSTR; + V_BSTR(&data) = _bstr_("one two three"); + hr = IXMLDOMEntityReference_put_nodeValue(node, data); + ok(hr == E_FAIL, "ret %08x\n", hr ); + + hr = IXMLDOMEntityReference_QueryInterface(entityref, &IID_IXMLDOMNode, (void**)&node); + ok(hr == S_OK, "ret %08x\n", hr ); + V_VT(&data) = VT_BSTR; + V_BSTR(&data) = _bstr_("one two three"); + hr = IXMLDOMNode_put_nodeValue(node, data); + ok(hr == E_FAIL, "ret %08x\n", hr ); + IXMLDOMNode_Release(node); + IXMLDOMEntityReference_Release(entityref); + + free_bstrs(); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT r; @@ -5030,6 +5097,7 @@ START_TEST(domdoc) test_FormattingXML(); test_NodeTypeValue(); test_TransformWithLoadingLocalFile(); + test_put_nodeValue(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Reimplement IXMLDOMDocument::createTextNode() on top of ::createNode().
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 24e198e2ffa9cc7f180794e1e6f11ecf96b6f85c URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e198e2ffa9cc7f180794e1e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 21:44:27 2010 +0300 msxml3: Reimplement IXMLDOMDocument::createTextNode() on top of ::createNode(). --- dlls/msxml3/domdoc.c | 31 ++++++++++++------------- dlls/msxml3/tests/domdoc.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cb734b6..cc27932 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1087,29 +1087,28 @@ static HRESULT WINAPI domdoc_createTextNode( IXMLDOMText** text ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlNodePtr xmlnode; - xmlChar *xml_content; + IXMLDOMNode *node; + VARIANT type; + HRESULT hr; - TRACE("%p->(%s %p)\n", iface, debugstr_w(data), text); + TRACE("%p->(%s %p)\n", This, debugstr_w(data), text); - if(!text) - return E_INVALIDARG; + if (!text) return E_INVALIDARG; *text = NULL; - xml_content = xmlChar_from_wchar(data); - xmlnode = xmlNewText(xml_content); - heap_free(xml_content); - - if(!xmlnode) - return E_FAIL; - - xmlnode->doc = get_doc( This ); - xmldoc_add_orphan(xmlnode->doc, xmlnode); + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_TEXT; - *text = (IXMLDOMText*)create_text(xmlnode); + hr = IXMLDOMDocument2_createNode(iface, type, NULL, NULL, &node); + if (hr == S_OK) + { + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)text); + IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(*text, data); + } - return S_OK; + return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 031f701..1664443 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -692,7 +692,11 @@ static void test_domdoc( void ) ok( code == 0, "code %d\n", code ); IXMLDOMParseError_Release( error ); - /* test createTextNode */ + /* test createTextNode */ + r = IXMLDOMDocument_createTextNode(doc, _bstr_(""), &nodetext); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMText_Release(nodetext); + str = SysAllocString( szOpen ); r = IXMLDOMDocument_createTextNode(doc, str, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); @@ -1677,6 +1681,7 @@ static void test_create(void) IXMLDOMDocument *doc; IXMLDOMElement *element; IXMLDOMComment *comment; + IXMLDOMText *text; IXMLDOMNode *root, *node, *child; IXMLDOMNamedNodeMap *attr_map; IUnknown *unk; @@ -1764,6 +1769,53 @@ static void test_create(void) ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMComment_Release(comment); + /* NODE_TEXT */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_TEXT; + node = NULL; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + ok( node != NULL, "\n"); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMText_get_data(text, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMText_Release(comment); + SysFreeString(str); + + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMText_get_data(text, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMText_Release(text); + + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMText_get_data(text, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMText_Release(text); + /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT;

1 0

Nikolay Sivov : msxml3: Fix IXMLDOMDocument::createElement(), cast from node to element isn't possible.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: ce2372667e4f677870a1126439a4250a45546907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2372667e4f677870a112643… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 21:48:01 2010 +0300 msxml3: Fix IXMLDOMDocument::createElement(), cast from node to element isn't possible. --- dlls/msxml3/domdoc.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cc27932..8cbe2a9 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1039,7 +1039,9 @@ static HRESULT WINAPI domdoc_createElement( IXMLDOMElement** element ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); + IXMLDOMNode *node; VARIANT type; + HRESULT hr; TRACE("(%p)->(%s,%p)\n", This, debugstr_w(tagname), element); @@ -1048,7 +1050,14 @@ static HRESULT WINAPI domdoc_createElement( V_VT(&type) = VT_I1; V_I1(&type) = NODE_ELEMENT; - return IXMLDOMDocument_createNode(iface, type, tagname, NULL, (IXMLDOMNode**)element); + hr = IXMLDOMDocument_createNode(iface, type, tagname, NULL, &node); + if (hr == S_OK) + { + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)element); + IXMLDOMNode_Release(node); + } + + return hr; }

1 0

Nikolay Sivov : msxml3: Reimplement IXMLDOMDocument::createCDATASection() on top ::createNode().
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: f0e885759e9b06d197f670c89e032292c3d81c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e885759e9b06d197f670c89… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 21:58:17 2010 +0300 msxml3: Reimplement IXMLDOMDocument::createCDATASection() on top ::createNode(). --- dlls/msxml3/domdoc.c | 31 +++++++++++++-------------- dlls/msxml3/tests/domdoc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8cbe2a9..59f36f3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1158,29 +1158,28 @@ static HRESULT WINAPI domdoc_createCDATASection( IXMLDOMCDATASection** cdata ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlNodePtr xmlnode; - xmlChar *xml_content; + IXMLDOMNode *node; + VARIANT type; + HRESULT hr; - TRACE("%p->(%s %p)\n", iface, debugstr_w(data), cdata); + TRACE("%p->(%s %p)\n", This, debugstr_w(data), cdata); - if(!cdata) - return E_INVALIDARG; + if (!cdata) return E_INVALIDARG; *cdata = NULL; - xml_content = xmlChar_from_wchar(data); - xmlnode = xmlNewCDataBlock(get_doc( This ), xml_content, strlen( (char*)xml_content) ); - heap_free(xml_content); - - if(!xmlnode) - return E_FAIL; - - xmlnode->doc = get_doc( This ); - xmldoc_add_orphan(xmlnode->doc, xmlnode); + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_CDATA_SECTION; - *cdata = (IXMLDOMCDATASection*)create_cdata(xmlnode); + hr = IXMLDOMDocument2_createNode(iface, type, NULL, NULL, &node); + if (hr == S_OK) + { + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)cdata); + IXMLDOMNode_Release(node); + hr = IXMLDOMCDATASection_put_data(*cdata, data); + } - return S_OK; + return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1664443..6be7408 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1682,6 +1682,7 @@ static void test_create(void) IXMLDOMElement *element; IXMLDOMComment *comment; IXMLDOMText *text; + IXMLDOMCDATASection *cdata; IXMLDOMNode *root, *node, *child; IXMLDOMNamedNodeMap *attr_map; IUnknown *unk; @@ -1816,6 +1817,53 @@ static void test_create(void) ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMText_Release(text); + /* NODE_CDATA_SECTION */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_CDATA_SECTION; + node = NULL; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + ok( node != NULL, "\n"); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&cdata); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMCDATASection_get_data(cdata, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMCDATASection_Release(cdata); + SysFreeString(str); + + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&cdata); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMCDATASection_get_data(cdata, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMCDATASection_Release(cdata); + + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&text); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release(node); + + str = NULL; + r = IXMLDOMCDATASection_get_data(cdata, &str); + ok( r == S_OK, "returns %08x\n", r ); + ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); + IXMLDOMCDATASection_Release(cdata); + /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT;

1 0

Nikolay Sivov : msxml3: Reimplement IXMLDOMDocument::createAttribute() on top of ::createNode().
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: f414d3cf60081d47edc88783fc71ddd933c31cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f414d3cf60081d47edc88783f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 22:34:50 2010 +0300 msxml3: Reimplement IXMLDOMDocument::createAttribute() on top of ::createNode(). --- dlls/msxml3/domdoc.c | 44 +++++++++++++++------------- dlls/msxml3/tests/domdoc.c | 67 ++++++++++++++++++++++++++++++++----------- 2 files changed, 74 insertions(+), 37 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 59f36f3..4e9deb9 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1227,29 +1227,25 @@ static HRESULT WINAPI domdoc_createAttribute( IXMLDOMAttribute** attribute ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlNodePtr xmlnode; - xmlChar *xml_name; - - TRACE("%p->(%s %p)\n", iface, debugstr_w(name), attribute); - - if(!attribute) - return E_INVALIDARG; - - *attribute = NULL; + IXMLDOMNode *node; + VARIANT type; + HRESULT hr; - xml_name = xmlChar_from_wchar(name); - xmlnode = (xmlNode *)xmlNewProp(NULL, xml_name, NULL); - heap_free(xml_name); + TRACE("%p->(%s %p)\n", This, debugstr_w(name), attribute); - if(!xmlnode) - return E_FAIL; + if (!attribute || !name) return E_INVALIDARG; - xmlnode->doc = get_doc( This ); - xmldoc_add_orphan(xmlnode->doc, xmlnode); + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_ATTRIBUTE; - *attribute = (IXMLDOMAttribute*)create_attribute(xmlnode); + hr = IXMLDOMDocument_createNode(iface, type, name, NULL, &node); + if (hr == S_OK) + { + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMAttribute, (void**)attribute); + IXMLDOMNode_Release(node); + } - return S_OK; + return hr; } @@ -1356,8 +1352,16 @@ static HRESULT WINAPI domdoc_createNode( TRACE("node_type %d\n", node_type); - if ((!name || SysStringLen(name) == 0) && (node_type == NODE_ELEMENT)) - return E_FAIL; + /* exit earlier for types that need name */ + switch(node_type) + { + case NODE_ELEMENT: + case NODE_ATTRIBUTE: + case NODE_PROCESSING_INSTRUCTION: + if (!name || SysStringLen(name) == 0) return E_FAIL; + default: + break; + } xml_name = xmlChar_from_wchar(name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6be7408..63c3e15 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1864,6 +1864,29 @@ static void test_create(void) ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMCDATASection_Release(cdata); + /* NODE_ATTRIBUTE */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + str = SysAllocString( szlc ); + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; @@ -2965,7 +2988,7 @@ static void test_xmlTypes(void) HRESULT hr; IXMLDOMComment *pComment; IXMLDOMElement *pElement; - IXMLDOMAttribute *pAttrubute; + IXMLDOMAttribute *pAttribute; IXMLDOMNamedNodeMap *pAttribs; IXMLDOMCDATASection *pCDataSec; IXMLDOMImplementation *pIXMLDOMImplementation = NULL; @@ -3369,41 +3392,51 @@ static void test_xmlTypes(void) VariantClear(&v); /* Attribute */ + pAttribute = (IXMLDOMAttribute*)0x1; + hr = IXMLDOMDocument_createAttribute(doc, NULL, &pAttribute); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + ok(pAttribute == (void*)0x1, "Expect same ptr, got %p\n", pAttribute); + + pAttribute = (IXMLDOMAttribute*)0x1; + hr = IXMLDOMDocument_createAttribute(doc, _bstr_(""), &pAttribute); + ok(hr == E_FAIL, "ret %08x\n", hr ); + ok(pAttribute == (void*)0x1, "Expect same ptr, got %p\n", pAttribute); + str = SysAllocString(szAttribute); - hr = IXMLDOMDocument_createAttribute(doc, str, &pAttrubute); + hr = IXMLDOMDocument_createAttribute(doc, str, &pAttribute); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { IXMLDOMNode *pNewChild = (IXMLDOMNode *)0x1; - hr = IXMLDOMAttribute_get_nextSibling(pAttrubute, NULL); + hr = IXMLDOMAttribute_get_nextSibling(pAttribute, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); pNextChild = (IXMLDOMNode *)0x1; - hr = IXMLDOMAttribute_get_nextSibling(pAttrubute, &pNextChild); + hr = IXMLDOMAttribute_get_nextSibling(pAttribute, &pNextChild); ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); /* test Previous Sibling*/ - hr = IXMLDOMAttribute_get_previousSibling(pAttrubute, NULL); + hr = IXMLDOMAttribute_get_previousSibling(pAttribute, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); pNextChild = (IXMLDOMNode *)0x1; - hr = IXMLDOMAttribute_get_previousSibling(pAttrubute, &pNextChild); + hr = IXMLDOMAttribute_get_previousSibling(pAttribute, &pNextChild); ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); /* test get_attributes */ - hr = IXMLDOMAttribute_get_attributes( pAttrubute, NULL ); + hr = IXMLDOMAttribute_get_attributes( pAttribute, NULL ); ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n"); pAttribs = (IXMLDOMNamedNodeMap*)0x1; - hr = IXMLDOMAttribute_get_attributes( pAttrubute, &pAttribs); + hr = IXMLDOMAttribute_get_attributes( pAttribute, &pAttribs); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( pAttribs == NULL, "pAttribs not NULL\n"); - hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); + hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttribute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pNewChild == NULL, "pNewChild not NULL\n"); @@ -3411,46 +3444,46 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); if ( hr == S_OK ) { - hr = IXMLDOMNamedNodeMap_setNamedItem(pAttribs, (IXMLDOMNode*)pAttrubute, NULL ); + hr = IXMLDOMNamedNodeMap_setNamedItem(pAttribs, (IXMLDOMNode*)pAttribute, NULL ); ok(hr == S_OK, "ret %08x\n", hr ); IXMLDOMNamedNodeMap_Release(pAttribs); } - hr = IXMLDOMAttribute_get_nodeName(pAttrubute, &str); + hr = IXMLDOMAttribute_get_nodeName(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szAttribute ), "incorrect attribute node Name\n"); SysFreeString(str); /* test nodeTypeString */ - hr = IXMLDOMAttribute_get_nodeTypeString(pAttrubute, &str); + hr = IXMLDOMAttribute_get_nodeTypeString(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, _bstr_("attribute") ), "incorrect nodeTypeString string\n"); SysFreeString(str); /* test nodeName */ - hr = IXMLDOMAttribute_get_nodeName(pAttrubute, &str); + hr = IXMLDOMAttribute_get_nodeName(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szAttribute ), "incorrect nodeName string\n"); SysFreeString(str); /* test name property */ - hr = IXMLDOMAttribute_get_name(pAttrubute, &str); + hr = IXMLDOMAttribute_get_name(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szAttribute ), "incorrect name string\n"); SysFreeString(str); - hr = IXMLDOMAttribute_get_xml(pAttrubute, &str); + hr = IXMLDOMAttribute_get_xml(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n"); SysFreeString(str); - hr = IXMLDOMAttribute_get_dataType(pAttrubute, &v); + hr = IXMLDOMAttribute_get_dataType(pAttribute, &v); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); VariantClear(&v); - IXMLDOMAttribute_Release(pAttrubute); + IXMLDOMAttribute_Release(pAttribute); /* Check Element again with the Add Attribute*/ hr = IXMLDOMElement_get_xml(pElement, &str);

1 0

Christian Costa : d3dx9_36: Improve some stubs.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 6b6db0dcb20b20f46fcd7ea29d108b123c3dbbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6db0dcb20b20f46fcd7ea29… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:48:03 2010 +0100 d3dx9_36: Improve some stubs. --- dlls/d3dx9_36/shader.c | 4 ++-- dlls/d3dx9_36/surface.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index bd41013..16fdd78 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -142,7 +142,7 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages) { - FIXME("stub\n"); + FIXME("(%p, %d, %p, %p, %x, %p, %p): stub\n", data, data_len, defines, include, flags, shader, error_messages); return D3DERR_INVALIDCALL; } @@ -177,7 +177,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages) { - FIXME("stub\n"); + FIXME("(%s, %p, %p, %x, %p, %p): stub\n", debugstr_w(filename), defines, include, flags, shader, error_messages); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4d8d1f6..6de6de7 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); */ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info) { - FIXME("stub\n"); + FIXME("(%p, %d, %p): stub\n", data, datasize, info); if(data && datasize && !info) return D3D_OK; if( !data || !datasize ) return D3DERR_INVALIDCALL; @@ -193,7 +193,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, D3DCOLOR Colorkey, D3DXIMAGE_INFO *pSrcInfo) { - FIXME("stub\n"); + FIXME("(%p, %p, %p, %p, %d, %p, %d, %x, %p): stub\n", pDestSurface, pDestPalette, + pDestRect, pSrcData, SrcDataSize, pSrcRect, dwFilter, Colorkey, pSrcInfo); + if( !pDestSurface || !pSrcData | !SrcDataSize ) return D3DERR_INVALIDCALL; return E_NOTIMPL; }

1 0