From 6d7aeedec2de0a06e87797b0f0d97231220fdd6e Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Mon, 7 Feb 2022 11:33:30 +0300 Subject: [PATCH] rtworkq/tests: Build without WINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/rtworkq/tests/Makefile.in | 1 - dlls/rtworkq/tests/rtworkq.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in index 7a2f6db51c7..8354cd810d1 100644 --- a/dlls/rtworkq/tests/Makefile.in +++ b/dlls/rtworkq/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rtworkq.dll IMPORTS = rtworkq ole32 diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c index 627e024d761..2ff74d57b84 100644 --- a/dlls/rtworkq/tests/rtworkq.c +++ b/dlls/rtworkq/tests/rtworkq.c @@ -33,72 +33,72 @@ static void test_platform_init(void) /* Startup initializes MTA. */ hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); /* Try with STA initialized before startup. */ hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); CoUninitialize(); /* Startup -> init main STA -> uninitialize -> shutdown */ hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); CoUninitialize(); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); } START_TEST(rtworkq)