September 2010 - Wine-commits

Andrew Nguyen : setupapi: Implement SetupDuplicateDiskSpaceListA/W.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 3eb49852317b1aadb60eb1163c9a8c5a5a6a141d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb49852317b1aadb60eb1163… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:01:11 2010 -0500 setupapi: Implement SetupDuplicateDiskSpaceListA/W. --- dlls/setupapi/diskspace.c | 38 ++++++++++ dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/diskspace.c | 156 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3eb49852317b1aadb60eb…

1 0

Andrew Nguyen : ipconfig: Permit the "Yes/No" strings to be localized.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 68a1a2678c2540125dc70660e83af79a3839a4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a1a2678c2540125dc70660e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:01:22 2010 -0500 ipconfig: Permit the "Yes/No" strings to be localized. --- programs/ipconfig/En.rc | 2 ++ programs/ipconfig/ipconfig.c | 16 ++++++++++++---- programs/ipconfig/ipconfig.h | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc index 73f112c..6606fe4 100644 --- a/programs/ipconfig/En.rc +++ b/programs/ipconfig/En.rc @@ -42,4 +42,6 @@ STRINGTABLE STRING_DESCRIPTION, "Description" STRING_PHYS_ADDR, "Physical address" STRING_DHCP_ENABLED, "DHCP enabled" + STRING_YES, "Yes" + STRING_NO, "No" } diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index da63acd..84b0ace 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -229,10 +229,18 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) return buf; } +static const WCHAR *boolean_to_string(int value) +{ + static WCHAR msg_buffer[15]; + + LoadStringW(GetModuleHandleW(NULL), value ? STRING_YES : STRING_NO, + msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); + + return msg_buffer; +} + static void print_full_information(void) { - static const WCHAR yesW[] = {'Y','e','s',0}; - static const WCHAR noW[] = {'N','o',0}; static const WCHAR newlineW[] = {'\n',0}; FIXED_INFO *info; @@ -255,7 +263,7 @@ static void print_full_information(void) /* FIXME: Output primary DNS suffix. */ print_field(STRING_NODE_TYPE, nodetype_to_string(info->NodeType)); - print_field(STRING_IP_ROUTING, info->EnableRouting ? yesW : noW); + print_field(STRING_IP_ROUTING, boolean_to_string(info->EnableRouting)); /* FIXME: Output WINS proxy status and DNS suffix search list. */ @@ -285,7 +293,7 @@ static void print_full_information(void) print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); print_field(STRING_DESCRIPTION, p->Description); print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); - print_field(STRING_DHCP_ENABLED, (p->Flags & IP_ADAPTER_DHCP_ENABLED) ? yesW : noW); + print_field(STRING_DHCP_ENABLED, boolean_to_string(p->Flags & IP_ADAPTER_DHCP_ENABLED)); /* FIXME: Output autoconfiguration status. */ diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h index 4f9325b..d209006 100644 --- a/programs/ipconfig/ipconfig.h +++ b/programs/ipconfig/ipconfig.h @@ -38,3 +38,5 @@ #define STRING_DESCRIPTION 115 #define STRING_PHYS_ADDR 116 #define STRING_DHCP_ENABLED 117 +#define STRING_YES 118 +#define STRING_NO 119

1 0

Andrew Nguyen : d3dx9_36: Fix D3DXCompileShader* spec file prototypes.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: b42a243fec28e34feb1c4cf9fd5dc744d2954824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42a243fec28e34feb1c4cf9f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:01:28 2010 -0500 d3dx9_36: Fix D3DXCompileShader* spec file prototypes. --- dlls/d3dx9_36/d3dx9_36.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index f533e82..9c84dbf 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -11,11 +11,11 @@ @ stub D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr float) @ stdcall D3DXColorAdjustSaturation(ptr ptr float) -@ stdcall D3DXCompileShader(ptr long ptr ptr ptr ptr long ptr ptr ptr) -@ stub D3DXCompileShaderFromFileA -@ stub D3DXCompileShaderFromFileW -@ stub D3DXCompileShaderFromResourceA -@ stub D3DXCompileShaderFromResourceW +@ stdcall D3DXCompileShader(ptr long ptr ptr str str long ptr ptr ptr) +@ stdcall D3DXCompileShaderFromFileA(str ptr ptr str str long ptr ptr ptr) +@ stdcall D3DXCompileShaderFromFileW(wstr ptr ptr str str long ptr ptr ptr) +@ stdcall D3DXCompileShaderFromResourceA(ptr str ptr ptr str str long ptr ptr ptr) +@ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stub D3DXComputeIMTFromPerTexelSignal

1 0

Piotr Caban : shlwapi: Improved UrlEscapeW implementation.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: f0bc60324aae58bad51007f2725286545790f9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bc60324aae58bad51007f27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Sep 5 22:13:47 2010 +0200 shlwapi: Improved UrlEscapeW implementation. --- dlls/shlwapi/tests/url.c | 11 +++++++++++ dlls/shlwapi/url.c | 20 ++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 532b947..d1da88b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -762,10 +762,13 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H static void test_UrlEscape(void) { + static const WCHAR out[] = { 'f','o','o','%','2','0','b','a','r',0 }; + DWORD size = 0; HRESULT ret; unsigned int i; char empty_string[] = ""; + WCHAR overwrite[] = { 'f','o','o',' ','b','a','r',0,0,0 }; if (!pUrlEscapeA) { win_skip("UrlEscapeA noz found\n"); @@ -796,6 +799,14 @@ static void test_UrlEscape(void) ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 34, "got %d, expected %d\n", size, 34); + if(pUrlEscapeW) { + size = sizeof(overwrite)/sizeof(WCHAR); + ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == S_OK, "got %x, expected S_OK\n", ret); + ok(size == 9, "got %d, expected 9\n", size); + ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); + } + for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags, TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].expecturl); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 4592b7e..c808a2f 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1022,8 +1022,8 @@ HRESULT WINAPI UrlEscapeW( DWORD slashes = 0; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; - TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszEscaped, - pcchEscaped, dwFlags); + TRACE("(%p(%s) %p %p 0x%08x)\n", pszUrl, debugstr_w(pszUrl), + pszEscaped, pcchEscaped, dwFlags); if(!pszUrl || !pcchEscaped) return E_INVALIDARG; @@ -1034,6 +1034,12 @@ HRESULT WINAPI UrlEscapeW( URL_ESCAPE_PERCENT)) FIXME("Unimplemented flags: %08x\n", dwFlags); + if(pszUrl == pszEscaped) { + dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); + if(!dst) + return E_OUTOFMEMORY; + } + /* fix up flags */ if (dwFlags & URL_ESCAPE_SPACES_ONLY) /* if SPACES_ONLY specified, reset the other controls */ @@ -1150,12 +1156,18 @@ HRESULT WINAPI UrlEscapeW( if(needed < *pcchEscaped) { *dst = '\0'; - ret = S_OK; + if(pszUrl == pszEscaped) + memcpy(pszEscaped, dst-needed, (needed+1)*sizeof(WCHAR)); + + ret = S_OK; } else { needed++; /* add one for the '\0' */ - ret = E_POINTER; + ret = E_POINTER; } *pcchEscaped = needed; + + if(pszUrl == pszEscaped) + HeapFree(GetProcessHeap(), 0, dst); return ret; }

1 0

Nikolay Sivov : msxml3/tests: Add a helper to create document instance, remove useless output.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: e7bfb98e60b9a43dfe0e059537e0ea62f58e2a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bfb98e60b9a43dfe0e05953… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 4 18:14:58 2010 +0400 msxml3/tests: Add a helper to create document instance, remove useless output. --- dlls/msxml3/tests/domdoc.c | 298 +++++++++++++++++--------------------------- 1 files changed, 114 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7bfb98e60b9a43dfe0e0…

1 0

Nikolay Sivov : msxml3/domdoc: Implement IXMLDOMNamedNodeMap:: removeQualifiedItem().
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 0adfd6cf4c4f5b512c10ab2a5f4c77de13a8fa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adfd6cf4c4f5b512c10ab2a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 4 18:41:10 2010 +0400 msxml3/domdoc: Implement IXMLDOMNamedNodeMap::removeQualifiedItem(). --- dlls/msxml3/nodemap.c | 99 +++++++++++++++++++++++++------------------ dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 44 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index f7818f9..78d9d46 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -250,43 +250,8 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( IXMLDOMNode** namedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlChar *element_name; - xmlAttrPtr attr; - xmlNodePtr node; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); - - if ( !name) - return E_INVALIDARG; - - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - - element_name = xmlChar_from_wchar( name ); - attr = xmlHasNsProp( node, element_name, NULL ); - heap_free( element_name ); - - if ( !attr ) - { - if( namedItem ) - *namedItem = NULL; - return S_FALSE; - } - - if ( namedItem ) - { - xmlUnlinkNode( (xmlNodePtr) attr ); - xmldoc_add_orphan( attr->doc, (xmlNodePtr) attr ); - *namedItem = create_node( (xmlNodePtr) attr ); - } - else - { - if( xmlRemoveProp( attr ) == -1 ) - ERR("xmlRemoveProp failed\n"); - } - - return S_OK; + return IXMLDOMNamedNodeMap_removeQualifiedItem(iface, name, NULL, namedItem); } static HRESULT WINAPI xmlnodemap_get_item( @@ -394,6 +359,10 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( } attr = xmlHasNsProp(node, name, href); + + heap_free(name); + heap_free(href); + if (!attr) { *qualifiedItem = NULL; @@ -402,9 +371,6 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( *qualifiedItem = create_node((xmlNodePtr)attr); - heap_free(name); - heap_free(href); - return S_OK; } @@ -415,8 +381,58 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( IXMLDOMNode** qualifiedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); - return E_NOTIMPL; + xmlAttrPtr attr; + xmlNodePtr node; + xmlChar *name; + xmlChar *href; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); + + if (!baseName) return E_INVALIDARG; + + node = xmlNodePtr_from_domnode( This->node, XML_ELEMENT_NODE ); + if ( !node ) + return E_FAIL; + + if (namespaceURI && *namespaceURI) + { + href = xmlChar_from_wchar(namespaceURI); + if (!href) return E_OUTOFMEMORY; + } + else + href = NULL; + + name = xmlChar_from_wchar(baseName); + if (!name) + { + heap_free(href); + return E_OUTOFMEMORY; + } + + attr = xmlHasNsProp( node, name, href ); + + heap_free(name); + heap_free(href); + + if ( !attr ) + { + if (qualifiedItem) *qualifiedItem = NULL; + return S_FALSE; + } + + if ( qualifiedItem ) + { + xmlUnlinkNode( (xmlNodePtr) attr ); + xmldoc_add_orphan( attr->doc, (xmlNodePtr) attr ); + *qualifiedItem = create_node( (xmlNodePtr) attr ); + } + else + { + if (xmlRemoveProp(attr) == -1) + ERR("xmlRemoveProp failed\n"); + } + + return S_OK; } static HRESULT WINAPI xmlnodemap_nextNode( @@ -497,7 +513,6 @@ static HRESULT WINAPI support_error_QueryInterface( { xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); - return IXMLDOMNamedNodeMap_QueryInterface((IXMLDOMNamedNodeMap*)&This->lpVtbl, riid, ppvObject); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8211aec..ded8175 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2791,7 +2791,7 @@ static void test_removeNamedItem(void) removed_node = (void*)0xdeadbeef; r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, NULL, &removed_node); ok ( r == E_INVALIDARG, "ret %08x\n", r); - ok ( removed_node == (void*)0xdeadbeef, "removed_node == %p\n", removed_node); + ok ( removed_node == (void*)0xdeadbeef, "got %p\n", removed_node); removed_node = (void*)0xdeadbeef; str = SysAllocString(szvr); @@ -2801,7 +2801,7 @@ static void test_removeNamedItem(void) removed_node2 = (void*)0xdeadbeef; r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node2); ok ( r == S_FALSE, "ret %08x\n", r); - ok ( removed_node2 == NULL, "removed_node == %p\n", removed_node2 ); + ok ( removed_node2 == NULL, "got %p\n", removed_node2 ); r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); ok( r == S_OK, "ret %08x\n", r); @@ -5789,6 +5789,71 @@ static void test_getQualifiedItem(void) free_bstrs(); } +static void test_removeQualifiedItem(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *pr_node, *node; + IXMLDOMNodeList *root_list; + IXMLDOMNamedNodeMap *map; + VARIANT_BOOL b; + BSTR str; + LONG len; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_get_documentElement(doc, &element); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMElement_get_childNodes(element, &root_list); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNodeList_Release(root_list); + + hr = IXMLDOMNode_get_attributes(pr_node, &map); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(pr_node); + + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok( hr == S_OK, "ret %08x\n", hr); + ok( len == 3, "length %d\n", len); + + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, NULL, NULL, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, NULL, NULL, &node); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + ok( node == (void*)0xdeadbeef, "got %p\n", node); + + /* out pointer is optional */ + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("id"), NULL, NULL); + ok( hr == S_OK, "ret %08x\n", hr); + + /* already removed */ + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("id"), NULL, NULL); + ok( hr == S_FALSE, "ret %08x\n", hr); + + hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("vr"), NULL, &node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(node); + + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5840,6 +5905,7 @@ START_TEST(domdoc) test_document_IObjectSafety(); test_splitText(); test_getQualifiedItem(); + test_removeQualifiedItem(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3/tests: Some tests for ::get_ownerDocument() returned document instance.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 97e78d9a0ebfb4ac71985330d6ad86bf02bdf0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e78d9a0ebfb4ac71985330d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 5 21:06:17 2010 +0400 msxml3/tests: Some tests for ::get_ownerDocument() returned document instance. --- dlls/msxml3/tests/domdoc.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ded8175..06532d6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5854,6 +5854,84 @@ static void test_removeQualifiedItem(void) free_bstrs(); } +static void test_get_ownerDocument(void) +{ + IXMLDOMDocument *doc1, *doc2, *doc3; + IXMLDOMDocument2 *doc, *doc_owner; + IXMLDOMNode *node; + VARIANT_BOOL b; + VARIANT var; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument2); + if (!doc) return; + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument2_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("xmlns:wi=\'www.winehq.org\'"); + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), var); + todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_get_firstChild(doc, &node); + ok( hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_get_ownerDocument(node, &doc1); + ok( hr == S_OK, "got 0x%08x\n", hr); + + VariantClear(&var); + hr = IXMLDOMDocument_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**)&doc_owner); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( doc_owner != doc, "got %p, doc %p\n", doc_owner, doc); + hr = IXMLDOMDocument2_getProperty(doc_owner, _bstr_("SelectionNamespaces"), &var); + todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok( lstrcmpW(V_BSTR(&var), _bstr_("xmlns:wi=\'www.winehq.org\'")) == 0, "expected previously set value\n"); + IXMLDOMDocument2_Release(doc_owner); + VariantClear(&var); + + hr = IXMLDOMNode_get_ownerDocument(node, &doc2); + ok( hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + + ok(doc1 != doc2, "got %p, expected %p. original %p\n", doc2, doc1, doc); + + /* reload */ + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument2_loadXML( doc, str, &b ); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + /* property retained even after reload */ + VariantClear(&var); + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var); + todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok( lstrcmpW(V_BSTR(&var), _bstr_("xmlns:wi=\'www.winehq.org\'")) == 0, "expected previously set value\n"); + VariantClear(&var); + + hr = IXMLDOMDocument2_get_firstChild(doc, &node); + ok( hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_get_ownerDocument(node, &doc3); + ok( hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + + hr = IXMLDOMDocument_QueryInterface(doc3, &IID_IXMLDOMDocument2, (void**)&doc_owner); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok(doc3 != doc1 && doc3 != doc2 && doc_owner != doc, "got %p, (%p, %p, %p)\n", doc3, doc, doc1, doc2); + + IXMLDOMDocument_Release(doc1); + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc3); + IXMLDOMDocument2_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5906,6 +5984,7 @@ START_TEST(domdoc) test_splitText(); test_getQualifiedItem(); test_removeQualifiedItem(); + test_get_ownerDocument(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3/tests: Basic test for ::setAttributeNode().
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 398e64941472273e9a0b3d39410c6843f19efd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398e64941472273e9a0b3d394… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 6 23:26:39 2010 +0400 msxml3/tests: Basic test for ::setAttributeNode(). --- dlls/msxml3/element.c | 4 +++ dlls/msxml3/tests/domdoc.c | 53 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0e8559a..e65da62 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -661,7 +661,11 @@ static HRESULT WINAPI domelem_setAttributeNode( IXMLDOMAttribute** attributeNode) { domelem *This = impl_from_IXMLDOMElement( iface ); + FIXME("(%p)->(%p %p)\n", This, domAttribute, attributeNode); + + if(!domAttribute) return E_INVALIDARG; + return E_NOTIMPL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 06532d6..4317c52 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5932,6 +5932,57 @@ static void test_get_ownerDocument(void) free_bstrs(); } +static void test_setAttributeNode(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + IXMLDOMAttribute *attr, *attr2, *ret_attr; + VARIANT_BOOL b; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument2_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, NULL, &ret_attr); + ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok( ret_attr == NULL, "got %p\n", ret_attr); + + attr2 = NULL; + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2); + todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); + if (attr2) IXMLDOMAttribute_Release(attr2); + + /* try to add it another time */ + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); + ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + IXMLDOMAttribute_Release(attr); + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5951,7 +6002,6 @@ START_TEST(domdoc) return; } - IXMLDOMDocument_Release(doc); test_domdoc(); @@ -5985,6 +6035,7 @@ START_TEST(domdoc) test_getQualifiedItem(); test_removeQualifiedItem(); test_get_ownerDocument(); + test_setAttributeNode(); CoUninitialize(); }

1 0

Thomas Mullaly : urlmon: set_builder_component now handles setting the modified property flag.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 23e312e3245faf8123e4f1307f790db93c51e3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e312e3245faf8123e4f1307… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 15:47:01 2010 -0400 urlmon: set_builder_component now handles setting the modified property flag. --- dlls/urlmon/uri.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ef6ba22..c05c0fa 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3292,9 +3292,11 @@ static HRESULT get_builder_component(LPWSTR *component, DWORD *component_len, /* Allocates 'component' and copies the string from 'new_value' into 'component'. * If 'prefix' is set and 'new_value' isn't NULL, then it checks if 'new_value' * starts with 'prefix'. If it doesn't then 'prefix' is prepended to 'component'. + * + * If everything is successful, then will set 'success_flag' in 'flags'. */ static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LPCWSTR new_value, - WCHAR prefix) + WCHAR prefix, DWORD *flags, DWORD success_flag) { if(*component) heap_free(*component); @@ -3323,6 +3325,7 @@ static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LP *component_len = len+pos; } + *flags |= success_flag; return S_OK; } @@ -4571,36 +4574,32 @@ static HRESULT WINAPI UriBuilder_SetFragment(IUriBuilder *iface, LPCWSTR pwzNewV { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_FRAGMENT; - return set_builder_component(&This->fragment, &This->fragment_len, pwzNewValue, '#'); + return set_builder_component(&This->fragment, &This->fragment_len, pwzNewValue, '#', + &This->modified_props, Uri_HAS_FRAGMENT); } static HRESULT WINAPI UriBuilder_SetHost(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_HOST; - return set_builder_component(&This->host, &This->host_len, pwzNewValue, 0); + return set_builder_component(&This->host, &This->host_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_HOST); } static HRESULT WINAPI UriBuilder_SetPassword(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_PASSWORD; - return set_builder_component(&This->password, &This->password_len, pwzNewValue, 0); + return set_builder_component(&This->password, &This->password_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_PASSWORD); } static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - - This->modified_props |= Uri_HAS_PATH; - return set_builder_component(&This->path, &This->path_len, pwzNewValue, 0); + return set_builder_component(&This->path, &This->path_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_PATH); } static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWORD dwNewValue)

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}Port.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: a4eee688183db9036cf02a973d067a884022d24b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4eee688183db9036cf02a973… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 16:34:21 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}Port. --- dlls/urlmon/tests/uri.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 21 ++++++-- 2 files changed, 152 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 684a608..6756d99 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4315,7 +4315,7 @@ static const uri_builder_test uri_builder_tests[] = { { {TRUE,"test",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE} }, - {TRUE,TRUE,120,S_OK,TRUE}, + {TRUE,TRUE,120,S_OK,FALSE}, 0,S_OK,TRUE, 0,S_OK,TRUE, 0,0,0,S_OK,TRUE, @@ -4568,6 +4568,109 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_UNKNOWN,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {FALSE}, + }, + /* 555 will be returned from GetPort even though FALSE was passed as the hasPort parameter. */ + {TRUE,FALSE,555,S_OK,FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + /* Still returns 80, even though earlier the port was disabled. */ + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {FALSE}, + }, + /* Instead of getting "TRUE" back as the "hasPort" parameter in GetPort, + * you'll get 122345 instead. + */ + {TRUE,122345,222,S_OK,FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com:222/",S_OK}, + {"google.com:222",S_OK}, + {"http://google.com:222/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com:222/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {222,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + /* IUri's created with the IUriBuilder can have ports that exceed USHORT_MAX. */ + { "http://google.com/",0,S_OK,FALSE, + { + {FALSE}, + }, + + {TRUE,TRUE,999999,S_OK,FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com:999999/",S_OK}, + {"google.com:999999",S_OK}, + {"http://google.com:999999/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com:999999/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {999999,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -7516,6 +7619,34 @@ static void test_IUriBuilder_RemoveProperties(void) { } } +static void test_IUriBuilder_Misc(void) { + HRESULT hr; + IUri *uri; + + hr = pCreateUri(http_urlW, 0, 0, &uri); + if(SUCCEEDED(hr)) { + IUriBuilder *builder; + + hr = pCreateIUriBuilder(uri, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + BOOL has = -1; + DWORD port = -1; + + hr = IUriBuilder_GetPort(builder, &has, &port); + ok(hr == S_OK, "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + /* 'has' will be set to FALSE, even though uri had a port. */ + ok(has == FALSE, "Error: Expected 'has' to be FALSE, was %d instead.\n", has); + /* Still sets 'port' to 80. */ + ok(port == 80, "Error: Expected the port to be 80, but, was %d instead.\n", port); + } + } + if(builder) IUriBuilder_Release(builder); + } + if(uri) IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -7591,4 +7722,7 @@ START_TEST(uri) { trace("test IUriBuilder_RemoveProperties...\n"); test_IUriBuilder_RemoveProperties(); + + trace("test IUriBuilder miscellaneous...\n"); + test_IUriBuilder_Misc(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c05c0fa..dbc1747 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -91,6 +91,9 @@ typedef struct { WCHAR *path; DWORD path_len; + + BOOL has_port; + DWORD port; } UriBuilder; typedef struct { @@ -4506,8 +4509,9 @@ static HRESULT WINAPI UriBuilder_GetPort(IUriBuilder *iface, BOOL *pfHasPort, DW return E_POINTER; } - FIXME("(%p)->(%p %p)\n", This, pfHasPort, pdwPort); - return E_NOTIMPL; + *pfHasPort = This->has_port; + *pdwPort = This->port; + return S_OK; } static HRESULT WINAPI UriBuilder_GetQuery(IUriBuilder *iface, DWORD *pcchQuery, LPCWSTR *ppwzQuery) @@ -4605,8 +4609,12 @@ static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWORD dwNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%d %d)\n", This, fHasPort, dwNewValue); - return E_NOTIMPL; + TRACE("(%p)->(%d %d)\n", This, fHasPort, dwNewValue); + + This->has_port = fHasPort; + This->port = dwNewValue; + This->modified_props |= Uri_HAS_PORT; + return S_OK; } static HRESULT WINAPI UriBuilder_SetQuery(IUriBuilder *iface, LPCWSTR pwzNewValue) @@ -4705,6 +4713,11 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve if((uri = get_uri_obj(pIUri))) { IUri_AddRef(pIUri); ret->uri = uri; + + if(uri->has_port) + /* Windows doesn't set 'has_port' to TRUE in this case. */ + ret->port = uri->port; + } else { heap_free(ret); *ppIUriBuilder = NULL;

1 0