[PATCH] Stopped tests from crashing and a Win98 fix.

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Sat May 24 07:30:41 CDT 2008


It appears msxml3 DLL version 8.7.1113 and below cannot handle
a NULL parameter passed to the get_documentElement function.
---
 dlls/msxml3/tests/domdoc.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index bd45a77..8145b3b 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -475,11 +475,7 @@ static void test_domdoc( void )
     r = IXMLDOMDocument_loadXML( doc, str, &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
-
-    /* try with a null out pointer */
-    r = IXMLDOMDocument_get_documentElement( doc, NULL );
-    ok( r == E_INVALIDARG, "should be no document element\n");
+    SysFreeString( str );    
 
     /* check if nodename is correct */
     r = IXMLDOMDocument_get_nodeName( doc, NULL );
@@ -937,7 +933,7 @@ static void test_domnode( void )
         V_I4(&var) = 0x1234;
         r = IXMLDOMElement_getAttribute( element, str, &var );
         ok( r == E_FAIL, "getAttribute ret %08x\n", r );
-        ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var));
+        ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var));
         VariantClear(&var);
         SysFreeString( str );
 
-- 
1.5.4.1


--------------010504040509090302070206--




More information about the wine-patches mailing list