February 2008 - Wine-commits

Zachary Goldberg : WWN 341
by Jeremy Newman 25 Feb '08

25 Feb '08

Module: website Branch: master Commit: 72999d0584444ff1899ad6f78058bef3f3d77ca1 URL: http://source.winehq.org/git/website.git/?a=commit;h=72999d0584444ff1899ad6… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Sun Feb 24 17:12:34 2008 -0500 WWN 341 Sorry about the delay folks! 341 is out! --- news/2008022401.xml | 7 + wwn/wn20080224_341.xml | 4612 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 4619 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=72999d0584444ff189…

1 0

Alexandre Julliard : include: Fixed definition of IXMLDOMComment interface.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 72cbaa8fbfaeff2b6e907222c13441149d66318d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cbaa8fbfaeff2b6e907222c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 13:40:49 2008 +0100 include: Fixed definition of IXMLDOMComment interface. --- include/xmldom.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/xmldom.idl b/include/xmldom.idl index 7461131..1aac0ba 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -550,7 +550,7 @@ oleautomation, uuid(2933bf88-7b36-11d2-b20e-00c04f983e60), pointer_default(unique) ] -interface IXMLDOMComment : IXMLDOMNode +interface IXMLDOMComment : IXMLDOMCharacterData { /* empty */ }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment put_data.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: dfe23babe2846f450a7f7efc59ab61a4d4cbad65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe23babe2846f450a7f7efc5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 25 19:53:06 2008 +1100 msxml3: Implement IXMLDOMComment put_data. --- dlls/msxml3/comment.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index bbc9c47..3b09502 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -482,8 +482,18 @@ static HRESULT WINAPI domcomment_put_data( IXMLDOMComment *iface, BSTR data) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + HRESULT hr = E_FAIL; + VARIANT val; + + TRACE("%p %s\n", This, debugstr_w(data) ); + + V_VT(&val) = VT_BSTR; + V_BSTR(&val) = data; + + hr = IXMLDOMNode_put_nodeValue( This->node, val ); + + return hr; } static HRESULT WINAPI domcomment_get_length(

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMCDATASection put_data.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: d0cd1ea89391daa21e4cabff290752e7ae9dbee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cd1ea89391daa21e4cabff2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 25 19:47:57 2008 +1100 msxml3: Implement IXMLDOMCDATASection put_data. --- dlls/msxml3/cdata.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 446b58c..e9203b1 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -483,8 +483,18 @@ static HRESULT WINAPI domcdata_put_data( IXMLDOMCDATASection *iface, BSTR data) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + HRESULT hr = E_FAIL; + VARIANT val; + + TRACE("%p %s\n", This, debugstr_w(data) ); + + V_VT(&val) = VT_BSTR; + V_BSTR(&val) = data; + + hr = IXMLDOMNode_put_nodeValue( This->element, val ); + + return hr; } static HRESULT WINAPI domcdata_get_length(

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMProcessingInstruction put_data.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: cd3f18fbf2c63b249773891c94416fb60dfb970d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3f18fbf2c63b249773891c9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 25 19:49:18 2008 +1100 msxml3: Implement IXMLDOMProcessingInstruction put_data. --- dlls/msxml3/pi.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index fcef7a0..90425fd 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -503,8 +503,18 @@ static HRESULT WINAPI dom_pi_put_data( IXMLDOMProcessingInstruction *iface, BSTR data) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + HRESULT hr = E_FAIL; + VARIANT val; + + TRACE("%p %s\n", This, debugstr_w(data) ); + + V_VT(&val) = VT_BSTR; + V_BSTR(&val) = data; + + hr = IXMLDOMNode_put_nodeValue( This->node, val ); + + return hr; } static const struct IXMLDOMProcessingInstructionVtbl dom_pi_vtbl =

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMText put_data.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 1e3153a7b7f8f2d44f11af63946cbc42775c9eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3153a7b7f8f2d44f11af639… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 25 19:50:33 2008 +1100 msxml3: Implement IXMLDOMText put_data. --- dlls/msxml3/text.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 031e5a9..d3a1542 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -483,8 +483,18 @@ static HRESULT WINAPI domtext_put_data( IXMLDOMText *iface, BSTR data) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + HRESULT hr = E_FAIL; + VARIANT val; + + TRACE("%p %s\n", This, debugstr_w(data) ); + + V_VT(&val) = VT_BSTR; + V_BSTR(&val) = data; + + hr = IXMLDOMNode_put_nodeValue( This->element, val ); + + return hr; } static HRESULT WINAPI domtext_get_length(

1 0

Alistair Leslie-Hughes : msxml3: Tests for put_data.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 5579d2f9951b95f332a1565ecf3039e75c104104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5579d2f9951b95f332a1565ec… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 25 20:05:00 2008 +1100 msxml3: Tests for put_data. --- dlls/msxml3/tests/domdoc.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ccd20e5..16a7e77 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -569,6 +569,22 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("text") ), "incorrect nodeTypeString string\n"); SysFreeString(str); + /* put data Tests */ + r = IXMLDOMText_put_data(nodetext, _bstr_("This &is a ; test <>\\")); + ok(r == S_OK, "ret %08x\n", r ); + + /* Confirm XML text is good */ + r = IXMLDOMText_get_xml(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); + SysFreeString(str); + + /* Confirm we get the put_data Text back */ + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); + SysFreeString(str); + IXMLDOMText_Release( nodetext ); } SysFreeString( str ); @@ -657,12 +673,29 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("version=\"1.0\"") ), "incorrect data string\n"); SysFreeString(str); + /* test put_data */ + r = IXMLDOMProcessingInstruction_put_data(nodePI, _bstr_("version=\"1.0\" encoding=\"UTF-8\"")); + ok(r == S_OK, "ret %08x\n", r ); + SysFreeString(str); + + r = IXMLDOMProcessingInstruction_get_data(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("version=\"1.0\" encoding=\"UTF-8\"") ), "incorrect data string\n"); + SysFreeString(str); + + /* Confirm XML text is good */ + r = IXMLDOMProcessingInstruction_get_xml(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") ), "incorrect xml string\n"); + SysFreeString(str); + IXMLDOMProcessingInstruction_Release(nodePI); } r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n"); + free_bstrs(); } static void test_domnode( void ) @@ -2059,6 +2092,22 @@ static void test_xmlTypes(void) ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); VariantClear(&v); + /* put data Tests */ + hr = IXMLDOMComment_put_data(pComment, _bstr_("This &is a ; test <>\\")); + ok(hr == S_OK, "ret %08x\n", hr ); + + /* Confirm XML text is good */ + hr = IXMLDOMComment_get_xml(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("") ), "incorrect xml string\n"); + SysFreeString(str); + + /* Confirm we get the put_data Text back */ + hr = IXMLDOMComment_get_text(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); + SysFreeString(str); + IXMLDOMComment_Release(pComment); } @@ -2243,6 +2292,22 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("cdatasection") ), "incorrect nodeTypeString string\n"); SysFreeString(str); + /* put data Tests */ + hr = IXMLDOMCDATASection_put_data(pCDataSec, _bstr_("This &is a ; test <>\\")); + ok(hr == S_OK, "ret %08x\n", hr ); + + /* Confirm XML text is good */ + hr = IXMLDOMCDATASection_get_xml(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("<![CDATA[This &is a ; test <>\\]]>") ), "incorrect xml string\n"); + SysFreeString(str); + + /* Confirm we get the put_data Text back */ + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); + SysFreeString(str); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMNode put_nodeValue.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 75a8444a8b1408291a5aecec6311705ec469b681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a8444a8b1408291a5aecec6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 25 19:56:22 2008 +1100 msxml3: Implement IXMLDOMNode put_nodeValue. --- dlls/msxml3/node.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1b6c9d1..12a53a9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -284,8 +284,34 @@ static HRESULT WINAPI xmlnode_put_nodeValue( IXMLDOMNode *iface, VARIANT value) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT hr = S_FALSE; + xmlChar *str = NULL; + + TRACE("%p type(%d)", This, This->node->type); + + /* Document, Document Fragment, Document Type, Element, + Entity, Entity Reference, Notation arent supported. */ + switch ( This->node->type ) + { + case XML_ATTRIBUTE_NODE: + case XML_CDATA_SECTION_NODE: + case XML_COMMENT_NODE: + case XML_PI_NODE: + case XML_TEXT_NODE: + { + str = xmlChar_from_wchar((WCHAR*)V_BSTR(&value)); + + xmlNodeSetContent(This->node, str); + hr = S_OK; + break; + } + default: + /* Do nothing for unsupported types. */ + break; + } + + return hr; } static HRESULT WINAPI xmlnode_get_nodeType(

1 0

Rob Shearman : user32: Fix the number of characters passed to GetClassNameW in ClassTest.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: e154d3b29e582972e05f219f354d53e404a6d78b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e154d3b29e582972e05f219f3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:02:14 2008 +0000 user32: Fix the number of characters passed to GetClassNameW in ClassTest. --- dlls/user32/tests/class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index aa2c60a..91898e1 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -134,7 +134,7 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) } /* check GetClassName */ - i = GetClassNameW(hTestWnd, str, sizeof(str)); + i = GetClassNameW(hTestWnd, str, sizeof(str)/sizeof(str[0])); ok(i == lstrlenW(className), "GetClassName returned incorrect length\n"); ok(!lstrcmpW(className,str),

1 0

Rob Shearman : netapi32: Fix character count passed to GetUserNameW and GetComputerNameW in init_wksta_tests .
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 38a968ff52ddde3e1a509b839e0af21a7e0898fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a968ff52ddde3e1a509b839… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:02:26 2008 +0000 netapi32: Fix character count passed to GetUserNameW and GetComputerNameW in init_wksta_tests. --- dlls/netapi32/tests/wksta.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index ba68eb4..5eefba4 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -48,7 +48,7 @@ static int init_wksta_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name); + dwSize = sizeof(user_name)/sizeof(user_name[0]); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { skip("GetUserNameW is not implemented\n"); @@ -57,7 +57,7 @@ static int init_wksta_tests(void) ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name); + dwSize = sizeof(computer_name)/sizeof(computer_name[0]); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return 1; }

1 0