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

Alexandre Julliard julliard at winehq.org
Wed Mar 2 15:39:50 CST 2022


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

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Wed Mar  2 09:04:47 2022 +0100

oledlg/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/oledlg/tests/Makefile.in | 1 -
 dlls/oledlg/tests/main.c      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/oledlg/tests/Makefile.in b/dlls/oledlg/tests/Makefile.in
index 10f77e8042e..5c6227bb59d 100644
--- a/dlls/oledlg/tests/Makefile.in
+++ b/dlls/oledlg/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = oledlg.dll
 IMPORTS   = oledlg ole32 user32
 
diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c
index 919cd008542..384b7b38626 100644
--- a/dlls/oledlg/tests/main.c
+++ b/dlls/oledlg/tests/main.c
@@ -51,7 +51,7 @@ static ULONG WINAPI enumverbs_Release(IEnumOLEVERB *iface)
 static int g_enumpos;
 static HRESULT WINAPI enumverbs_Next(IEnumOLEVERB *iface, ULONG count, OLEVERB *verbs, ULONG *fetched)
 {
-    ok(count == 1, "got %u\n", count);
+    ok(count == 1, "got %lu\n", count);
     ok(fetched == NULL, "got %p\n", fetched);
     ok(g_enumpos == 0 || g_enumpos == 1, "got pos %d\n", g_enumpos);
 
@@ -209,7 +209,7 @@ static HRESULT WINAPI oleobject_GetUserClassID(IOleObject *iface, CLSID *clsid)
 static HRESULT WINAPI oleobject_GetUserType(IOleObject *iface, DWORD formoftype,
     LPOLESTR *usertype)
 {
-    ok(formoftype == USERCLASSTYPE_SHORT, "got %d\n", formoftype);
+    ok(formoftype == USERCLASSTYPE_SHORT, "got %ld\n", formoftype);
     *usertype = CoTaskMemAlloc(sizeof(L"test"));
     lstrcpyW(*usertype, L"test");
     return S_OK;




More information about the wine-cvs mailing list