ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcproxy.h: Use LONG/ULONG for Win64 compatibility instead of long and unsigned long.

This commit is contained in:
Michael Stefaniuc 2006-11-07 22:02:27 +01:00 committed by Alexandre Julliard
parent 4e2b462d4f
commit e9ae478c14
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/rpcrt4/tests/cstub.c
View File

@ -516,7 +516,7 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void)
#undef VTBL_TEST_CHANGE_TO #undef VTBL_TEST_CHANGE_TO
#undef VTBL_TEST_ZERO #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; return ppsf;
} }
@ -608,7 +608,7 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf)
CInterfaceStubHeader *header = ((CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1; CInterfaceStubHeader *header = ((CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1;
ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n"); 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 */ /* 0xdeadbeef returned from create_stub_test_QI */
ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject);
ok(cstd_stub->pPSFactory == ppsf, "pPSFactory %p\n", cstd_stub->pPSFactory); ok(cstd_stub->pPSFactory == ppsf, "pPSFactory %p\n", cstd_stub->pPSFactory);
@ -780,21 +780,21 @@ static void test_Release(IPSFactoryBuffer *ppsf)
facbuf_refs = PSFactoryBuffer.RefCount; facbuf_refs = PSFactoryBuffer.RefCount;
/* This shows that NdrCStdStubBuffer_Release doesn't call Disconnect */ /* 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; connect_test_orig_release_called = 0;
IRpcStubBuffer_Release(pstub); IRpcStubBuffer_Release(pstub);
todo_wine { todo_wine {
ok(connect_test_orig_release_called == 0, "release called %d\n", connect_test_orig_release_called); 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 /* 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). */ (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); 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); 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(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) static HRESULT WINAPI delegating_invoke_test_QI(ITypeLib *pUnk, REFIID iid, void** ppv)

10
include/rpcproxy.h
View File

@ -91,7 +91,7 @@ typedef struct tagCInterfaceStubHeader
{ {
const IID *piid; const IID *piid;
const MIDL_SERVER_INFO *pServerInfo; const MIDL_SERVER_INFO *pServerInfo;
unsigned long DispatchTableCount; ULONG DispatchTableCount;
const PRPC_STUB_FUNCTION *pDispatchTable; const PRPC_STUB_FUNCTION *pDispatchTable;
} CInterfaceStubHeader; } CInterfaceStubHeader;
@ -104,7 +104,7 @@ typedef struct tagCInterfaceStubVtbl
typedef struct tagCStdStubBuffer typedef struct tagCStdStubBuffer
{ {
const IRpcStubBufferVtbl *lpVtbl; const IRpcStubBufferVtbl *lpVtbl;
long RefCount; LONG RefCount;
struct IUnknown *pvServerObject; struct IUnknown *pvServerObject;
const struct ICallFactoryVtbl *pCallFactoryVtbl; const struct ICallFactoryVtbl *pCallFactoryVtbl;
const IID *pAsyncIID; const IID *pAsyncIID;
@ -114,9 +114,9 @@ typedef struct tagCStdStubBuffer
typedef struct tagCStdPSFactoryBuffer typedef struct tagCStdPSFactoryBuffer
{ {
const IPSFactoryBufferVtbl *lpVtbl; const IPSFactoryBufferVtbl *lpVtbl;
long RefCount; LONG RefCount;
const ProxyFileInfo **pProxyFileList; const ProxyFileInfo **pProxyFileList;
long Filler1; LONG Filler1;
} CStdPSFactoryBuffer; } CStdPSFactoryBuffer;
#define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction #define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction
@ -180,7 +180,7 @@ RPCRTAPI void RPC_ENTRY
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
NdrStubInitializePartial( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, NdrStubInitializePartial( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg,
PMIDL_STUB_DESC pStubDescriptor, IRpcChannelBuffer *pRpcChannelBuffer, PMIDL_STUB_DESC pStubDescriptor, IRpcChannelBuffer *pRpcChannelBuffer,
unsigned long RequestedBufferSize ); ULONG RequestedBufferSize );
void __RPC_STUB NdrStubForwardingFunction( IRpcStubBuffer *This, IRpcChannelBuffer *pChannel, void __RPC_STUB NdrStubForwardingFunction( IRpcStubBuffer *This, IRpcChannelBuffer *pChannel,
PRPC_MESSAGE pMsg, DWORD *pdwStubPhase ); PRPC_MESSAGE pMsg, DWORD *pdwStubPhase );
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY