[MSXML3_WINETEST]

[reactos.git] / rostests / winetests / msxml3 / saxreader.c

diff --git a/rostests/winetests/msxml3/saxreader.c b/rostests/winetests/msxml3/saxreader.c
index 426fe36..a932bf9 100644 (file)
--- a/rostests/winetests/msxml3/saxreader.c
+++ b/rostests/winetests/msxml3/saxreader.c
@@ -117,13 +117,6 @@ static content_handler_test contentHandlerTest2[] = {
 static content_handler_test *expectCall;
 static ISAXLocator *locator;
 
-static const char *debugstr_wn(const WCHAR *szStr, int len)
-{
-    static char buf[1024];
-    WideCharToMultiByte(CP_ACP, 0, szStr, len, buf, sizeof(buf), NULL, NULL);
-    return buf;
-}
-
 static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char *szTest)
 {
     WCHAR buf[1024];
@@ -142,7 +135,7 @@ static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char
 
     MultiByteToWideChar(CP_ACP, 0, szTest, -1, buf, sizeof(buf)/sizeof(WCHAR));
     ok_(__FILE__,line) (!memcmp(szStr, buf, len*sizeof(WCHAR)), "unexpected szStr %s, expected %s\n",
-                        debugstr_wn(szStr, nStr), szTest);
+                        wine_dbgstr_wn(szStr, nStr), szTest);
 }
 
 static BOOL test_expect_call(CH id)
@@ -527,6 +520,8 @@ static void test_saxreader(void)
     ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
     test_expect_call(CH_ENDTEST);
 
+    VariantClear(&var);
+
     SADim[0].lLbound= 0;
     SADim[0].cElements= sizeof(szTestXML)-1;
     pSA = SafeArrayCreate(VT_UI1, 1, SADim);
@@ -567,6 +562,8 @@ static void test_saxreader(void)
     ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
     test_expect_call(CH_ENDTEST);
 
+    VariantClear(&var);
+
     file = CreateFileA(testXmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError());
     WriteFile(file, szTestXML, sizeof(szTestXML)-1, &bytesWritten, NULL);
@@ -598,6 +595,7 @@ static void test_saxreader(void)
     IXMLDOMDocument_Release(domDocument);
 
     ISAXXMLReader_Release(reader);
+    SysFreeString(bstrData);
 }
 
 START_TEST(saxreader)