[MSXML3_WINETEST] Sync with Wine Staging 2.2. CORE-12823

svn path=/trunk/; revision=73970

diff --git a/rostests/winetests/msxml3/httpreq.c b/rostests/winetests/msxml3/httpreq.c
index 3131317..a17e627 100644 (file)
--- a/rostests/winetests/msxml3/httpreq.c
+++ b/rostests/winetests/msxml3/httpreq.c
@@ -1439,7 +1439,7 @@ static void test_XMLHTTP(void)
     IXMLHttpRequest *xhr;
     IObjectWithSite *obj_site, *obj_site2;
     BSTR bstrResponse, str, str1;
-    VARIANT varbody, varbody_ref;
+    VARIANT varbody;
     VARIANT dummy;
     LONG state, status, bound;
     IDispatch *event;
@@ -1625,12 +1625,11 @@ static void test_XMLHTTP(void)
         SysFreeString(bstrResponse);
     }
 
-    /* POST: VT_VARIANT|VT_BYREF body */
+    /* POST: VT_VARIANT body */
+    /* VT_VARIANT|VT_BYREF fails on Windows 10 */
     test_open(xhr, "POST", urlA, S_OK);
 
-    V_VT(&varbody_ref) = VT_VARIANT|VT_BYREF;
-    V_VARIANTREF(&varbody_ref) = &varbody;
-    hr = IXMLHttpRequest_send(xhr, varbody_ref);
+    hr = IXMLHttpRequest_send(xhr, varbody);
     EXPECT_HR(hr, S_OK);
 
     /* GET request */

diff --git a/rostests/winetests/msxml3/xmlview.c b/rostests/winetests/msxml3/xmlview.c
index db02bf8..e99971a 100644 (file)
--- a/rostests/winetests/msxml3/xmlview.c
+++ b/rostests/winetests/msxml3/xmlview.c
@@ -188,7 +188,7 @@ static void test_QueryInterface(void)
     ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument) returned %x, expected S_OK\n", hres);
     hres = IHTMLDocument_QueryInterface(htmldoc, &IID_IUnknown, (void**)&unk);
     ok(hres == S_OK, "QueryInterface(IID_IUnknown) returned %x, expected S_OK\n", hres);
-    todo_wine ok(unk == xmlview, "Aggregation is not working as expected\n");
+    ok(unk == xmlview, "Aggregation is not working as expected\n");
     IUnknown_Release(unk);
     IHTMLDocument_Release(htmldoc);