[PATCH 20/20] dlls/wevtapi/tests: enable compilation with long types

Eric Pouech eric.pouech at gmail.com
Tue Mar 8 02:31:53 CST 2022


Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/wevtapi/tests/Makefile.in |    1 -
 dlls/wevtapi/tests/wevtapi.c   |   16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in
index db69ecb71d2..47fde74b0eb 100644
--- a/dlls/wevtapi/tests/Makefile.in
+++ b/dlls/wevtapi/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = wevtapi.dll
 IMPORTS   = wevtapi advapi32
 
diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c
index a0a21aa9971..51dbbd33970 100644
--- a/dlls/wevtapi/tests/wevtapi.c
+++ b/dlls/wevtapi/tests/wevtapi.c
@@ -42,24 +42,24 @@ static void test_EvtGetChannelConfigProperty(void)
         skip("Not enough privileges to modify HKLM\n");
         return;
     }
-    ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret);
+    ok(ret == ERROR_SUCCESS, "RegCreateKey error %lu\n", ret);
 
     config = EvtOpenChannelConfig(NULL, L"Winetest", 0);
-    ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError());
+    ok(config != NULL, "EvtOpenChannelConfig error %lu\n", GetLastError());
 
     ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size);
     ok(!ret, "EvtGetChannelConfigProperty should fail\n");
-    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError());
-    ok(size < sizeof(path), "got %u\n", size);
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError());
+    ok(size < sizeof(path), "got %lu\n", size);
 
     memset(&path, 0, sizeof(path));
     path.var.Count = 0xdeadbeef;
     path.var.Type = 0xdeadbeef;
     ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size);
-    ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError());
-    ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count);
-    ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type);
-    ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size);
+    ok(ret, "EvtGetChannelConfigProperty error %lu\n", GetLastError());
+    ok(path.var.Count == 0xdeadbeef, "got %lu\n", path.var.Count);
+    ok(path.var.Type == EvtVarTypeString, "got %lu\n", path.var.Type);
+    ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %lu\n", size);
     ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf);
 
     EvtClose(config);




More information about the wine-devel mailing list