Eric Pouech : infosoft/tests: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Mon Feb 28 15:50:22 CST 2022
Module: wine
Branch: master
Commit: 7ebbc4f8cd438a22fc7b039c7b4d3b12a0270490
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ebbc4f8cd438a22fc7b039c7b4d3b12a0270490
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Feb 28 08:26:57 2022 +0100
infosoft/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/infosoft/tests/Makefile.in | 1 -
dlls/infosoft/tests/infosoft.c | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/infosoft/tests/Makefile.in b/dlls/infosoft/tests/Makefile.in
index 037957adef9..971d67b9f48 100644
--- a/dlls/infosoft/tests/Makefile.in
+++ b/dlls/infosoft/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = infosoft.dll
IMPORTS = ole32
diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c
index 996af73ca20..72b33f25ce7 100644
--- a/dlls/infosoft/tests/infosoft.c
+++ b/dlls/infosoft/tests/infosoft.c
@@ -76,10 +76,10 @@ static HRESULT WINAPI ws_PutWord(IWordSink *iface, ULONG cwc, const WCHAR *pwcIn
winetest_push_context("word %d", wordnum);
if (wordnum < ARRAY_SIZE(testres))
{
- ok(testres[wordnum].len == cwcSrcLen, "expected length %d, got %d\n",
+ ok(testres[wordnum].len == cwcSrcLen, "expected length %d, got %ld\n",
testres[wordnum].len, cwcSrcLen);
ok(!cwcSrcPos || (testres[wordnum].ofs == cwcSrcPos),
- "expected offset %d, got %d\n", testres[wordnum].ofs, cwcSrcPos);
+ "expected offset %d, got %ld\n", testres[wordnum].ofs, cwcSrcPos);
ok(!memcmp(testres[wordnum].data, pwcInBuf, cwcSrcLen),
"expected data %s, got %s\n",
wine_dbgstr_wn(testres[wordnum].data, cwcSrcLen),
@@ -176,7 +176,7 @@ START_TEST(infosoft)
TEXT_SOURCE ts;
r = CoInitialize(NULL);
- ok( r == S_OK, "failed: %08x\n", r);
+ ok( r == S_OK, "failed: %08lx\n", r);
r = CoCreateInstance( &CLSID_wb_neutral, NULL, CLSCTX_INPROC_SERVER,
&_IID_IWordBreaker, (LPVOID)&wb);
@@ -194,7 +194,7 @@ START_TEST(infosoft)
ts.iEnd = lstrlenW(ts.awcBuffer);
ts.iCur = 0;
r = IWordBreaker_BreakText(wb, &ts, &wordsink.IWordSink_iface, NULL);
- ok( r == S_OK, "failed: %08x\n", r);
+ ok( r == S_OK, "failed: %08lx\n", r);
ok(wordnum == 4, "expected 4 words, got %d\n", wordnum);
@@ -205,10 +205,10 @@ START_TEST(infosoft)
ts.iCur = 0;
r = fillbuf_many(&ts);
- ok( r == S_OK, "failed: %08x\n", r);
+ ok( r == S_OK, "failed: %08lx\n", r);
r = IWordBreaker_BreakText(wb, &ts, &wordsink.IWordSink_iface, NULL);
- ok( r == S_OK, "failed: %08x\n", r);
+ ok( r == S_OK, "failed: %08lx\n", r);
ok(wordnum == 4, "expected 4 words, got %d\n", wordnum);
IWordBreaker_Release( wb );
More information about the wine-cvs
mailing list