Eric Pouech : comcat/tests: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cd4c58f588adfc3660a9d4f1c347da52c76a8e6f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=cd4c58f588adfc3660a9d4f1c347da52c76a8e6f

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Wed Feb 23 09:11:41 2022 +0100

comcat/tests: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comcat/tests/Makefile.in |  1 -
 dlls/comcat/tests/comcat.c    | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/comcat/tests/Makefile.in b/dlls/comcat/tests/Makefile.in
index 905bb1dcd0c..51e92329a05 100644
--- a/dlls/comcat/tests/Makefile.in
+++ b/dlls/comcat/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = comcat.dll
 IMPORTS   = ole32 advapi32
 
diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c
index 97048cc46b8..b561756f9da 100644
--- a/dlls/comcat/tests/comcat.c
+++ b/dlls/comcat/tests/comcat.c
@@ -29,7 +29,7 @@
 
 #include "wine/test.h"
 
-#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
+#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error %#08lx\n", hr)
 
 static BOOL register_testentry(void)
 {
@@ -88,8 +88,8 @@ static void do_enum(void)
 	ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories");
 
 	hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched);
-	ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x\n", hr);
-	ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched);
+	ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08lx\n", hr);
+	ok (fetched == 0,"Fetched wrong number of guids %lu\n",fetched);
 	IEnumGUID_Release(pIEnum);
 
 	if (register_testentry())
@@ -98,8 +98,8 @@ static void do_enum(void)
             ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories");
 
             hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched);
-            ok (hr == S_OK,"Expected S_OK, got 0x%08x\n", hr);
-            ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched);
+            ok (hr == S_OK,"Expected S_OK, got 0x%08lx\n", hr);
+            ok (fetched == 1,"Fetched wrong number of guids %lu\n",fetched);
             ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n");
 
             IEnumGUID_Release(pIEnum);