From a3b8fbc24f99b02615d39f4c2d8c65266bf21abb Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 11 Feb 2022 09:46:35 +0300 Subject: [PATCH] combase/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/combase/tests/Makefile.in | 1 - dlls/combase/tests/roapi.c | 14 +++++++------- dlls/combase/tests/string.c | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in index b98b0e37c6a..1c3d77725b3 100644 --- a/dlls/combase/tests/Makefile.in +++ b/dlls/combase/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = combase.dll IMPORTS = combase diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index 1efcc801dcb..b1ac15a08cb 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -37,27 +37,27 @@ static void test_ActivationFactories(void) hr = WindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = WindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str2); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = RoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory); - ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#lx.\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if(factory) IActivationFactory_Release(factory); hr = RoActivateInstance(str2, &inspect); - ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#lx.\n", hr); hr = RoActivateInstance(str, &inspect); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "UNexpected hr %#lx.\n", hr); if(inspect) IInspectable_Release(inspect); diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 232d37304d6..ceb8ffa6e09 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -514,7 +514,7 @@ static void test_hstring_struct(void) ok(prv->header.flags == 0, "Expected 0 in flags field, got %#x.\n", prv->header.flags); ok(prv->header.length == 6, "Expected 6 in length field, got %u.\n", prv->header.length); ok(prv->header.str == prv->buffer, "Expected str to point at buffer, instead pointing at %p.\n", prv->header.str); - ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + ok(prv->refcount == 1, "Expected 1 in refcount, got %lu.\n", prv->refcount); ok(wcscmp(input_string, prv->buffer) == 0, "Expected strings to match.\n"); ok(prv->buffer[prv->header.length] == '\0', "Expected buffer to be null terminated.\n"); @@ -522,13 +522,13 @@ static void test_hstring_struct(void) prv2 = CONTAINING_RECORD(str2, struct hstring_private, header); - ok(prv->refcount == 2, "Expected 2 in refcount, got %u.\n", prv->refcount); - ok(prv2->refcount == 2, "Expected 2 in refcount, got %u.\n", prv2->refcount); + ok(prv->refcount == 2, "Expected 2 in refcount, got %lu.\n", prv->refcount); + ok(prv2->refcount == 2, "Expected 2 in refcount, got %lu.\n", prv2->refcount); ok(wcscmp(input_string, prv2->buffer) == 0, "Expected strings to match.\n"); ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); - ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + ok(prv->refcount == 1, "Expected 1 in refcount, got %lu.\n", prv->refcount); ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n");