Huw Davies : msxml3: Correctly test the variant returned by get_nodeValue.

Alexandre Julliard julliard at winehq.org
Wed Dec 9 10:46:29 CST 2009


Module: wine
Branch: master
Commit: 318c7b24eecc0e3cf15cc7c820b30804f4d0b55d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=318c7b24eecc0e3cf15cc7c820b30804f4d0b55d

Author: Huw Davies <huw at codeweavers.com>
Date:   Wed Dec  9 13:41:23 2009 +0000

msxml3: Correctly test the variant returned by get_nodeValue.

Found by Valgrind.

---

 dlls/msxml3/tests/domdoc.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index de78b65..87ad9b5 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -3085,6 +3085,8 @@ static void test_xmlTypes(void)
                 IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1;
                 VARIANT var;
 
+                VariantInit(&var);
+
                 hr = IXMLDOMCDATASection_QueryInterface(pCDataSec, &IID_IXMLDOMElement, (LPVOID*)&pElement);
                 ok(hr == E_NOINTERFACE, "ret %08x\n", hr);
 
@@ -3155,7 +3157,8 @@ static void test_xmlTypes(void)
                 /* test get nodeValue */
                 hr = IXMLDOMCDATASection_get_nodeValue(pCDataSec, &var);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n");
+                ok(V_VT(&var) == VT_BSTR, "got vt %04x\n", V_VT(&var));
+                ok( !lstrcmpW( V_BSTR(&var), _bstr_("This &is a ; test <>\\") ), "incorrect text string\n");
                 VariantClear(&var);
 
                 /* test get data */




More information about the wine-cvs mailing list