msxml3/tests: Build without -DWINE_NO_LONG_TYPES.

dlls/msxml3/tests/Makefile.in

-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = msxml3.dll
 IMPORTS   = oleaut32 ole32 user32 shlwapi
 

dlls/msxml3/tests/xmlparser.c

@@ -108,44 +108,44 @@ static void create_test(void)
     hr = CoCreateInstance(&CLSID_XMLParser30, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLParser, (void**)&parser);
     if (FAILED(hr))
     {
-        win_skip("IXMLParser is not available (0x%08x)\n", hr);
+        win_skip("IXMLParser is not available, hr %#lx.\n", hr);
         return;
     }
 
     flags = IXMLParser_GetFlags(parser);
-    ok(flags == 0, "Expected 0 got %d\n", flags);
+    ok(!flags, "Unexpected flags %#lx.\n", flags);
 
     hr = IXMLParser_SetFlags(parser, XMLFLAG_SAX);
-    ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     flags = IXMLParser_GetFlags(parser);
-    ok(flags == XMLFLAG_SAX, "Expected 0 got %d\n", flags);
+    ok(flags == XMLFLAG_SAX, "Unexpected flags %ld.\n", flags);
 
     hr = IXMLParser_GetFactory(parser, NULL);
-    ok(hr == E_INVALIDARG, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     hr = IXMLParser_GetFactory(parser, &nodefactory);
-    ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(nodefactory == NULL, "expected NULL\n");
 
     hr = IXMLParser_SetFactory(parser, &thenodefactory);
-    ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IXMLParser_GetFactory(parser, &nodefactory);
-    ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(nodefactory == &thenodefactory, "expected NULL\n");
 
     hr = IXMLParser_SetInput(parser, NULL);
-    ok(hr == E_INVALIDARG, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     hr = IXMLParser_SetFactory(parser, NULL);
-    ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IXMLParser_SetFlags(parser, 0);
-    ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IXMLParser_GetParserState(parser);
-    ok(hr == XMLPARSER_IDLE, "got 0x%08x\n", hr);
+    ok(hr == XMLPARSER_IDLE, "Unexpected hr %#lx.\n", hr);
 
     IXMLParser_Release(parser);
 }

dlls/msxml3/tests/xmlview.c

@@ -128,7 +128,7 @@ static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, R
         BSTR state;
 
         hr = IHTMLDocument2_get_readyState(html_doc, &state);
-        ok(hr == S_OK, "got 0x%08x\n", hr);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
         if (!memcmp(state, completeW, sizeof(completeW)))
             loaded = TRUE;
         SysFreeString(state);
@@ -161,28 +161,28 @@ static void test_QueryInterface(void)
         win_skip("Failed to create XMLView instance\n");
         return;
     }
-    ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
 
     hres = IUnknown_QueryInterface(xmlview, &IID_IPersistMoniker, (void**)&unk);
-    ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     IUnknown_Release(unk);
 
     hres = IUnknown_QueryInterface(xmlview, &IID_IPersistHistory, (void**)&unk);
-    ok(hres == S_OK, "QueryInterface(IID_IPersistHistory) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     IUnknown_Release(unk);
 
     hres = IUnknown_QueryInterface(xmlview, &IID_IOleCommandTarget, (void**)&unk);
-    ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     IUnknown_Release(unk);
 
     hres = IUnknown_QueryInterface(xmlview, &IID_IOleObject, (void**)&unk);
-    ok(hres == S_OK, "QueryInterface(IID_IOleObject) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     IUnknown_Release(unk);
 
     hres = IUnknown_QueryInterface(xmlview, &IID_IHTMLDocument, (void**)&htmldoc);
-    ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     hres = IHTMLDocument_QueryInterface(htmldoc, &IID_IUnknown, (void**)&unk);
-    ok(hres == S_OK, "QueryInterface(IID_IUnknown) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     ok(unk == xmlview, "Aggregation is not working as expected\n");
     IUnknown_Release(unk);
     IHTMLDocument_Release(htmldoc);
@@ -218,26 +218,26 @@ static void test_Load(void)
         win_skip("Failed to create XMLView instance\n");
         return;
     }
-    ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
 
     hres = IPersistMoniker_QueryInterface(pers_mon, &IID_IHTMLDocument2, (void**)&html_doc);
-    ok(hres == S_OK, "QueryInterface(HTMLDocument2) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     hres = IPersistMoniker_QueryInterface(pers_mon, &IID_IConnectionPointContainer, (void**)&cpc);
-    ok(hres == S_OK, "QueryInterface(IConnectionPointContainer) returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     hres = IConnectionPointContainer_FindConnectionPoint(cpc, &IID_IDispatch, &cp);
-    ok(hres == S_OK, "FindConnectionPoint returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     hres = IConnectionPoint_Advise(cp, (IUnknown*)&HTMLEvents, NULL);
-    ok(hres == S_OK, "Advise returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     IConnectionPoint_Release(cp);
     IConnectionPointContainer_Release(cpc);
 
     hres = CreateBindCtx(0, &bctx);
-    ok(hres == S_OK, "CreateBindCtx returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     hres = pCreateURLMoniker(NULL, buf, &mon);
-    ok(hres == S_OK, "CreateUrlMoniker returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     loaded = FALSE;
     hres = IPersistMoniker_Load(pers_mon, TRUE, mon, bctx, 0);
-    ok(hres == S_OK, "Load returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     IBindCtx_Release(bctx);
     IMoniker_Release(mon);
 
@@ -247,9 +247,9 @@ static void test_Load(void)
     }
 
     hres = IHTMLDocument2_get_body(html_doc, &elem);
-    ok(hres == S_OK, "get_body returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     hres = IHTMLElement_get_outerHTML(elem, &source);
-    ok(hres == S_OK, "get_outerHTML returned %x, expected S_OK\n", hres);
+    ok(hres == S_OK, "Unexpected hr %#lx.\n", hres);
     ok(!html_src_compare(source, xmlview_html), "Incorrect HTML source: %s\n", wine_dbgstr_w(source));
     IHTMLElement_Release(elem);
     SysFreeString(source);