[PATCH] dlls/wiaservc/tests: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Wed Mar 9 01:21:08 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/wiaservc/tests/Makefile.in | 1 -
dlls/wiaservc/tests/wia.c | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/wiaservc/tests/Makefile.in b/dlls/wiaservc/tests/Makefile.in
index 7eadf649a35..594e1b2a988 100644
--- a/dlls/wiaservc/tests/Makefile.in
+++ b/dlls/wiaservc/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = wiaservc.dll
IMPORTS = ole32
diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c
index 48050f4ecc9..b2ac607a8dd 100644
--- a/dlls/wiaservc/tests/wia.c
+++ b/dlls/wiaservc/tests/wia.c
@@ -39,19 +39,19 @@ static void test_EnumDeviceInfo(void)
ULONG count;
hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, NULL);
- ok(FAILED(hr), "got 0x%08x\n", hr);
+ ok(FAILED(hr), "got 0x%08lx\n", hr);
hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(hr == S_OK, "got 0x%08lx\n", hr);
hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL);
- ok(FAILED(hr), "got 0x%08x\n", hr);
+ ok(FAILED(hr), "got 0x%08lx\n", hr);
count = 1000;
hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count);
todo_wine
- ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(count != 1000, "got %u\n", count);
+ ok(hr == S_OK, "got 0x%08lx\n", hr);
+ ok(count != 1000, "got %lu\n", count);
IEnumWIA_DEV_INFO_Release(devenum);
}
@@ -62,11 +62,11 @@ static void test_SelectDeviceDlg(void)
IWiaItem *root;
hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL);
todo_wine
- ok(hr == E_POINTER, "got 0x%08x\n", hr);
+ ok(hr == E_POINTER, "got 0x%08lx\n", hr);
hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root);
todo_wine
- ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr);
+ ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08lx\n", hr);
}
START_TEST(wia)
@@ -77,7 +77,7 @@ START_TEST(wia)
hr = CoCreateInstance(&CLSID_WiaDevMgr, NULL, CLSCTX_LOCAL_SERVER, &IID_IWiaDevMgr, (void**)&devmanager);
if (FAILED(hr)) {
- win_skip("Failed to create WiaDevMgr instance, 0x%08x\n", hr);
+ win_skip("Failed to create WiaDevMgr instance, 0x%08lx\n", hr);
CoUninitialize();
return;
}
More information about the wine-devel
mailing list