rpcrt4/tests: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sat Oct 7 17:48:22 CDT 2006
---
dlls/rpcrt4/tests/Makefile.in | 1 -
dlls/rpcrt4/tests/cstub.c | 18 +++++++++---------
dlls/rpcrt4/tests/ndr_marshall.c | 6 +++---
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in
index 4511cad..036cd21 100644
--- a/dlls/rpcrt4/tests/Makefile.in
+++ b/dlls/rpcrt4/tests/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
TESTDLL = rpcrt4.dll
IMPORTS = ole32 rpcrt4 kernel32
EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \
cstub.c \
diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c
index 3a4c7b4..0377092 100644
--- a/dlls/rpcrt4/tests/cstub.c
+++ b/dlls/rpcrt4/tests/cstub.c
@@ -447,7 +447,7 @@ static IPSFactoryBuffer *test_NdrDllGetC
r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list,
&PSDispatch, &PSFactoryBuffer);
- ok(r == S_OK, "ret %08lx\n", r);
+ ok(r == S_OK, "ret %08x\n", r);
ok(ppsf != NULL, "ppsf == NULL\n");
ok(PSFactoryBuffer.pProxyFileList == proxy_file_list, "pfl not the same\n");
@@ -567,7 +567,7 @@ static IRpcStubBuffer *create_stub(IPSFa
HRESULT r;
r = IPSFactoryBuffer_CreateStub(ppsf, iid, obj, &pstub);
- ok(r == expected_result, "CreateStub returned %08lx expected %08lx\n", r, expected_result);
+ ok(r == expected_result, "CreateStub returned %08x expected %08x\n", r, expected_result);
return pstub;
}
@@ -704,14 +704,14 @@ static void test_Connect(IPSFactoryBuffe
obj = (IUnknown*)&new_vtbl;
r = IRpcStubBuffer_Connect(pstub, obj);
- ok(r == S_OK, "r %08lx\n", r);
+ ok(r == S_OK, "r %08x\n", r);
ok(connect_test_orig_release_called == 1, "release called %d\n", connect_test_orig_release_called);
ok(cstd_stub->pvServerObject == (void*)0xcafebabe, "pvServerObject %p\n", cstd_stub->pvServerObject);
cstd_stub->pvServerObject = (IUnknown*)&orig_vtbl;
obj = (IUnknown*)&new_fail_vtbl;
r = IRpcStubBuffer_Connect(pstub, obj);
- ok(r == E_NOINTERFACE, "r %08lx\n", r);
+ ok(r == E_NOINTERFACE, "r %08x\n", r);
ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject);
ok(connect_test_orig_release_called == 2, "release called %d\n", connect_test_orig_release_called);
@@ -786,15 +786,15 @@ static void test_Release(IPSFactoryBuffe
todo_wine {
ok(connect_test_orig_release_called == 0, "release called %d\n", connect_test_orig_release_called);
}
- ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs);
+ ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs);
/* This shows that NdrCStdStubBuffer_Release calls Release on its 2nd arg, rather than on This->pPSFactory
(which are usually the same and indeed it's odd that _Release requires this 2nd arg). */
pstub = create_stub(ppsf, &IID_if1, obj, S_OK);
- ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs);
+ ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs);
NdrCStdStubBuffer_Release(pstub, (IPSFactoryBuffer*)pretend_psfacbuf);
ok(release_test_psfacbuf_release_called == 1, "pretend_psfacbuf_release called %d\n", release_test_psfacbuf_release_called);
- ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs);
+ ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs);
}
static HRESULT WINAPI delegating_invoke_test_QI(ITypeLib *pUnk, REFIID iid, void** ppv)
@@ -877,8 +877,8 @@ #else
#endif
if(r == S_OK)
{
- ok(*(DWORD*)msg.Buffer == 0xabcdef, "buf[0] %08lx\n", *(DWORD*)msg.Buffer);
- ok(*((DWORD*)msg.Buffer + 1) == S_OK, "buf[1] %08lx\n", *((DWORD*)msg.Buffer + 1));
+ ok(*(DWORD*)msg.Buffer == 0xabcdef, "buf[0] %08x\n", *(DWORD*)msg.Buffer);
+ ok(*((DWORD*)msg.Buffer + 1) == S_OK, "buf[1] %08x\n", *((DWORD*)msg.Buffer + 1));
}
IRpcStubBuffer_Release(pstub);
}
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index 67ac531..086f587 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -447,7 +447,7 @@ static void test_simple_struct_marshal(c
ptr = NdrSimpleStructMarshall( &StubMsg, (unsigned char*)memsrc, formattypes );
ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart);
- ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled %08lx %08lx %08lx\n", msgpfx, *(DWORD*)StubMsg.BufferStart,*((DWORD*)StubMsg.BufferStart+1),*((DWORD*)StubMsg.BufferStart+2));
+ ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled %08x %08x %08x\n", msgpfx, *(DWORD*)StubMsg.BufferStart,*((DWORD*)StubMsg.BufferStart+1),*((DWORD*)StubMsg.BufferStart+2));
#if 0
StubMsg.Buffer = StubMsg.BufferStart;
@@ -929,13 +929,13 @@ todo_wine {
}
if(mem_list)
{
- ok(mem_list->magic == magic_MEML, "magic %08lx\n", mem_list->magic);
+ ok(mem_list->magic == magic_MEML, "magic %08x\n", mem_list->magic);
ok(mem_list->ptr == p2, "ptr != p2\n");
ok(mem_list->next != NULL, "next NULL\n");
mem_list = mem_list->next;
if(mem_list)
{
- ok(mem_list->magic == magic_MEML, "magic %08lx\n", mem_list->magic);
+ ok(mem_list->magic == magic_MEML, "magic %08x\n", mem_list->magic);
ok(mem_list->ptr == p1, "ptr != p2\n");
ok(mem_list->next == NULL, "next %p\n", mem_list->next);
}
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061008/9b68fbfe/attachment-0001.pgp
More information about the wine-patches
mailing list