[PATCH] dmloader/tests: Build without -DWINE_NO_LONG_TYPES
Michael Stefaniuc
mstefani at winehq.org
Thu Feb 10 15:32:18 CST 2022
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/dmloader/tests/Makefile.in | 1 -
dlls/dmloader/tests/loader.c | 28 ++++++++++++++--------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dlls/dmloader/tests/Makefile.in b/dlls/dmloader/tests/Makefile.in
index 8eef83551d4..d8be1bce3e4 100644
--- a/dlls/dmloader/tests/Makefile.in
+++ b/dlls/dmloader/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = dmloader.dll
IMPORTS = ole32
diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c
index 418a4ebb7a5..01f9fb435fd 100644
--- a/dlls/dmloader/tests/loader.c
+++ b/dlls/dmloader/tests/loader.c
@@ -266,12 +266,12 @@ static void test_COM(void)
&IID_IDirectMusicLoader8, (void**)&dml8);
ok(hr == S_OK, "DirectMusicLoader create failed: %08x, expected S_OK\n", hr);
refcount = IDirectMusicLoader8_AddRef(dml8);
- ok(refcount == 2, "refcount == %u, expected 2\n", refcount);
+ ok(refcount == 2, "refcount == %lu, expected 2\n", refcount);
hr = IDirectMusicLoader8_QueryInterface(dml8, &IID_IUnknown, (void**)&unk);
ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);
refcount = IUnknown_AddRef(unk);
- ok(refcount == 4, "refcount == %u, expected 4\n", refcount);
+ ok(refcount == 4, "refcount == %lu, expected 4\n", refcount);
refcount = IUnknown_Release(unk);
while (IDirectMusicLoader8_Release(dml8));
@@ -303,24 +303,24 @@ static void test_COM_container(void)
&IID_IDirectMusicContainer, (void**)&dmc);
ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr);
refcount = IDirectMusicContainer_AddRef(dmc);
- ok(refcount == 2, "refcount == %u, expected 2\n", refcount);
+ ok(refcount == 2, "refcount == %lu, expected 2\n", refcount);
hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo);
ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr);
refcount = IDirectMusicObject_AddRef(dmo);
- ok(refcount == 4, "refcount == %u, expected 4\n", refcount);
+ ok(refcount == 4, "refcount == %lu, expected 4\n", refcount);
refcount = IDirectMusicObject_Release(dmo);
hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps);
ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
refcount = IPersistStream_AddRef(ps);
- ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
+ ok(refcount == 5, "refcount == %lu, expected 5\n", refcount);
refcount = IPersistStream_Release(ps);
hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IUnknown, (void**)&unk);
ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);
refcount = IUnknown_AddRef(unk);
- ok(refcount == 6, "refcount == %u, expected 6\n", refcount);
+ ok(refcount == 6, "refcount == %lu, expected 6\n", refcount);
refcount = IUnknown_Release(unk);
while (IDirectMusicContainer_Release(dmc));
@@ -355,13 +355,13 @@ static void test_container(void)
hr = IDirectMusicObject_GetDescriptor(dmo, &desc);
ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr);
ok(desc.dwValidData == DMUS_OBJ_CLASS,
- "Fresh object has more valid data (%08x) than DMUS_OBJ_CLASS\n", desc.dwValidData);
+ "Fresh object has more valid data (%#lx) than DMUS_OBJ_CLASS\n", desc.dwValidData);
/* DMUS_OBJ_CLASS is immutable */
desc.dwValidData = DMUS_OBJ_CLASS;
desc.dwSize = 1; /* size is ignored */
hr = IDirectMusicObject_SetDescriptor(dmo, &desc);
ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %08x\n", hr);
- ok(!desc.dwValidData, "dwValidData wasn't cleared: %08x\n", desc.dwValidData);
+ ok(!desc.dwValidData, "dwValidData wasn't cleared: %#lx\n", desc.dwValidData);
desc.dwValidData = DMUS_OBJ_CLASS;
desc.guidClass = CLSID_DirectMusicSegment;
hr = IDirectMusicObject_SetDescriptor(dmo, &desc);
@@ -509,7 +509,7 @@ static void test_parsedescriptor(void)
ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr);
ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ ||
broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */
- "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData);
+ "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n", desc.dwValidData);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer),
"Got class guid %s, expected CLSID_DirectMusicContainer\n",
wine_dbgstr_guid(&desc.guidClass));
@@ -522,7 +522,7 @@ static void test_parsedescriptor(void)
desc.dwSize = sizeof(desc);
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n",
+ ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n",
desc.dwValidData);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer),
"Got class guid %s, expected CLSID_DirectMusicContainer\n",
@@ -555,7 +555,7 @@ static void test_parsedescriptor(void)
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION;
- ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid);
+ ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer),
"Got class guid %s, expected CLSID_DirectMusicContainer\n",
wine_dbgstr_guid(&desc.guidClass));
@@ -572,7 +572,7 @@ static void test_parsedescriptor(void)
desc.dwSize = sizeof(desc);
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n",
+ ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n",
desc.dwValidData);
IStream_Release(stream);
@@ -583,7 +583,7 @@ static void test_parsedescriptor(void)
desc.dwSize = sizeof(desc);
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n",
+ ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n",
desc.dwValidData);
IStream_Release(stream);
@@ -594,7 +594,7 @@ static void test_parsedescriptor(void)
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION;
- ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid);
+ ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid);
ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n",
wine_dbgstr_w(desc.wszName));
IStream_Release(stream);
--
2.34.1
More information about the wine-devel
mailing list