Michael Stefaniuc : rpcproxy.h: Use LONG/
ULONG for Win64 compatibility instead of long and unsigned long.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Nov 8 14:12:09 CST 2006
Module: wine
Branch: master
Commit: e9ae478c14a9a075fe95a5f2b66353fb94830f14
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ae478c14a9a075fe95a5f2b66353fb94830f14
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Nov 7 22:02:27 2006 +0100
rpcproxy.h: Use LONG/ULONG for Win64 compatibility instead of long and unsigned long.
---
dlls/rpcrt4/tests/cstub.c | 12 ++++++------
include/rpcproxy.h | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c
index 0377092..b90c948 100644
--- a/dlls/rpcrt4/tests/cstub.c
+++ b/dlls/rpcrt4/tests/cstub.c
@@ -516,7 +516,7 @@ #undef VTBL_TEST_NOT_CHANGE_TO
#undef VTBL_TEST_CHANGE_TO
#undef VTBL_TEST_ZERO
- ok(PSFactoryBuffer.RefCount == 1, "ref count %ld\n", PSFactoryBuffer.RefCount);
+ ok(PSFactoryBuffer.RefCount == 1, "ref count %d\n", PSFactoryBuffer.RefCount);
return ppsf;
}
@@ -608,7 +608,7 @@ static void test_CreateStub(IPSFactoryBu
CInterfaceStubHeader *header = ((CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1;
ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n");
- ok(cstd_stub->RefCount == 1, "ref count %ld\n", cstd_stub->RefCount);
+ ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount);
/* 0xdeadbeef returned from create_stub_test_QI */
ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject);
ok(cstd_stub->pPSFactory == ppsf, "pPSFactory %p\n", cstd_stub->pPSFactory);
@@ -780,21 +780,21 @@ static void test_Release(IPSFactoryBuffe
facbuf_refs = PSFactoryBuffer.RefCount;
/* This shows that NdrCStdStubBuffer_Release doesn't call Disconnect */
- ok(cstd_stub->RefCount == 1, "ref count %ld\n", cstd_stub->RefCount);
+ ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount);
connect_test_orig_release_called = 0;
IRpcStubBuffer_Release(pstub);
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 %d\n", PSFactoryBuffer.RefCount, facbuf_refs);
+ ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %d 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 %d\n", PSFactoryBuffer.RefCount, facbuf_refs);
+ ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %d 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 %d\n", PSFactoryBuffer.RefCount, facbuf_refs);
+ ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %d orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs);
}
static HRESULT WINAPI delegating_invoke_test_QI(ITypeLib *pUnk, REFIID iid, void** ppv)
diff --git a/include/rpcproxy.h b/include/rpcproxy.h
index a4adc02..1ebc5d8 100644
--- a/include/rpcproxy.h
+++ b/include/rpcproxy.h
@@ -91,7 +91,7 @@ typedef struct tagCInterfaceStubHeader
{
const IID *piid;
const MIDL_SERVER_INFO *pServerInfo;
- unsigned long DispatchTableCount;
+ ULONG DispatchTableCount;
const PRPC_STUB_FUNCTION *pDispatchTable;
} CInterfaceStubHeader;
@@ -104,7 +104,7 @@ typedef struct tagCInterfaceStubVtbl
typedef struct tagCStdStubBuffer
{
const IRpcStubBufferVtbl *lpVtbl;
- long RefCount;
+ LONG RefCount;
struct IUnknown *pvServerObject;
const struct ICallFactoryVtbl *pCallFactoryVtbl;
const IID *pAsyncIID;
@@ -114,9 +114,9 @@ typedef struct tagCStdStubBuffer
typedef struct tagCStdPSFactoryBuffer
{
const IPSFactoryBufferVtbl *lpVtbl;
- long RefCount;
+ LONG RefCount;
const ProxyFileInfo **pProxyFileList;
- long Filler1;
+ LONG Filler1;
} CStdPSFactoryBuffer;
#define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction
@@ -180,7 +180,7 @@ RPCRTAPI void RPC_ENTRY
RPCRTAPI void RPC_ENTRY
NdrStubInitializePartial( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg,
PMIDL_STUB_DESC pStubDescriptor, IRpcChannelBuffer *pRpcChannelBuffer,
- unsigned long RequestedBufferSize );
+ ULONG RequestedBufferSize );
void __RPC_STUB NdrStubForwardingFunction( IRpcStubBuffer *This, IRpcChannelBuffer *pChannel,
PRPC_MESSAGE pMsg, DWORD *pdwStubPhase );
RPCRTAPI void RPC_ENTRY
More information about the wine-cvs
mailing list