Commit d3085abc authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

Change parameter type from size_t to SIZE_T for MIDL_user_allocate.

parent 8e39646a
...@@ -49,7 +49,7 @@ static const WCHAR szServiceManagerKey[] = { 'S','y','s','t','e','m','\\', ...@@ -49,7 +49,7 @@ static const WCHAR szServiceManagerKey[] = { 'S','y','s','t','e','m','\\',
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
'S','e','r','v','i','c','e','s',0 }; 'S','e','r','v','i','c','e','s',0 };
void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len)
{ {
return HeapAlloc(GetProcessHeap(), 0, len); return HeapAlloc(GetProcessHeap(), 0, len);
} }
......
...@@ -1660,7 +1660,7 @@ HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) ...@@ -1660,7 +1660,7 @@ HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer)
return S_OK; return S_OK;
} }
void * __RPC_USER MIDL_user_allocate(size_t size) void * __RPC_USER MIDL_user_allocate(SIZE_T size)
{ {
return HeapAlloc(GetProcessHeap(), 0, size); return HeapAlloc(GetProcessHeap(), 0, size);
} }
......
...@@ -354,7 +354,7 @@ void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, ...@@ -354,7 +354,7 @@ void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg,
/*********************************************************************** /***********************************************************************
* NdrOleAllocate [RPCRT4.@] * NdrOleAllocate [RPCRT4.@]
*/ */
void * WINAPI NdrOleAllocate(size_t Size) void * WINAPI NdrOleAllocate(SIZE_T Size)
{ {
if (!LoadCOM()) return NULL; if (!LoadCOM()) return NULL;
return COM_MemAlloc(Size); return COM_MemAlloc(Size);
......
...@@ -596,7 +596,7 @@ RPC_STATUS WINAPI TowerConstruct( ...@@ -596,7 +596,7 @@ RPC_STATUS WINAPI TowerConstruct(
return RPC_S_OK; return RPC_S_OK;
} }
void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len)
{ {
return HeapAlloc(GetProcessHeap(), 0, len); return HeapAlloc(GetProcessHeap(), 0, len);
} }
......
...@@ -48,7 +48,7 @@ static GUID IID_if4 = {0x1234567b, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; ...@@ -48,7 +48,7 @@ static GUID IID_if4 = {0x1234567b, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}};
static int my_alloc_called; static int my_alloc_called;
static int my_free_called; static int my_free_called;
static void * CALLBACK my_alloc(size_t size) static void * CALLBACK my_alloc(SIZE_T size)
{ {
my_alloc_called++; my_alloc_called++;
return NdrOleAllocate(size); return NdrOleAllocate(size);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
static int my_alloc_called; static int my_alloc_called;
static int my_free_called; static int my_free_called;
static void * CALLBACK my_alloc(size_t size) static void * CALLBACK my_alloc(SIZE_T size)
{ {
my_alloc_called++; my_alloc_called++;
return NdrOleAllocate(size); return NdrOleAllocate(size);
......
...@@ -51,7 +51,7 @@ static void InitFunctionPointers(void) ...@@ -51,7 +51,7 @@ static void InitFunctionPointers(void)
} }
void __RPC_FAR *__RPC_USER void __RPC_FAR *__RPC_USER
midl_user_allocate(size_t n) midl_user_allocate(SIZE_T n)
{ {
return malloc(n); return malloc(n);
} }
......
...@@ -195,7 +195,7 @@ typedef struct _MIDL_STUB_MESSAGE ...@@ -195,7 +195,7 @@ typedef struct _MIDL_STUB_MESSAGE
ULONG_PTR MaxCount; ULONG_PTR MaxCount;
ULONG Offset; ULONG Offset;
ULONG ActualCount; ULONG ActualCount;
void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T);
void (__RPC_API *pfnFree)(void *); void (__RPC_API *pfnFree)(void *);
unsigned char *StackTop; unsigned char *StackTop;
unsigned char *pPresentedType; unsigned char *pPresentedType;
...@@ -322,7 +322,7 @@ typedef struct _USER_MARSHAL_CB ...@@ -322,7 +322,7 @@ typedef struct _USER_MARSHAL_CB
typedef struct _MALLOC_FREE_STRUCT typedef struct _MALLOC_FREE_STRUCT
{ {
void * (__WINE_ALLOC_SIZE(1) __RPC_USER *pfnAllocate)(size_t); void * (__WINE_ALLOC_SIZE(1) __RPC_USER *pfnAllocate)(SIZE_T);
void (__RPC_USER *pfnFree)(void *); void (__RPC_USER *pfnFree)(void *);
} MALLOC_FREE_STRUCT; } MALLOC_FREE_STRUCT;
...@@ -335,7 +335,7 @@ typedef struct _COMM_FAULT_OFFSETS ...@@ -335,7 +335,7 @@ typedef struct _COMM_FAULT_OFFSETS
typedef struct _MIDL_STUB_DESC typedef struct _MIDL_STUB_DESC
{ {
void *RpcInterfaceInformation; void *RpcInterfaceInformation;
void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T);
void (__RPC_API *pfnFree)(void *); void (__RPC_API *pfnFree)(void *);
union { union {
handle_t *pAutoHandle; handle_t *pAutoHandle;
...@@ -474,7 +474,7 @@ typedef struct _NDR_USER_MARSHAL_INFO_LEVEL1 ...@@ -474,7 +474,7 @@ typedef struct _NDR_USER_MARSHAL_INFO_LEVEL1
{ {
void *Buffer; void *Buffer;
ULONG BufferSize; ULONG BufferSize;
void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T);
void (__RPC_API *pfnFree)(void *); void (__RPC_API *pfnFree)(void *);
struct IRpcChannelBuffer *pRpcChannelBuffer; struct IRpcChannelBuffer *pRpcChannelBuffer;
ULONG_PTR Reserved[5]; ULONG_PTR Reserved[5];
...@@ -678,7 +678,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ...@@ -678,7 +678,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY
ULONG *pFaultStatus, RPC_STATUS Status_ ); ULONG *pFaultStatus, RPC_STATUS Status_ );
RPCRTAPI void* RPC_ENTRY RPCRTAPI void* RPC_ENTRY
NdrOleAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); NdrOleAllocate( SIZE_T Size ) __WINE_ALLOC_SIZE(1);
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
NdrOleFree( void* NodeToFree ); NdrOleFree( void* NodeToFree );
...@@ -739,11 +739,11 @@ RPCRTAPI void RPC_ENTRY ...@@ -739,11 +739,11 @@ RPCRTAPI void RPC_ENTRY
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage );
RPCRTAPI void * RPC_ENTRY RPCRTAPI void * RPC_ENTRY
NdrRpcSmClientAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); NdrRpcSmClientAllocate( SIZE_T Size ) __WINE_ALLOC_SIZE(1);
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
NdrRpcSmClientFree( void *NodeToFree ); NdrRpcSmClientFree( void *NodeToFree );
RPCRTAPI void * RPC_ENTRY RPCRTAPI void * RPC_ENTRY
NdrRpcSsDefaultAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); NdrRpcSsDefaultAllocate( SIZE_T Size ) __WINE_ALLOC_SIZE(1);
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
NdrRpcSsDefaultFree( void *NodeToFree ); NdrRpcSsDefaultFree( void *NodeToFree );
......
...@@ -368,7 +368,7 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) ...@@ -368,7 +368,7 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle)
rot_entry_release(rot_entry); rot_entry_release(rot_entry);
} }
void * __RPC_USER MIDL_user_allocate(size_t size) void * __RPC_USER MIDL_user_allocate(SIZE_T size)
{ {
return HeapAlloc(GetProcessHeap(), 0, size); return HeapAlloc(GetProcessHeap(), 0, size);
} }
......
...@@ -1234,7 +1234,7 @@ void __RPC_USER SC_RPC_HANDLE_rundown(SC_RPC_HANDLE handle) ...@@ -1234,7 +1234,7 @@ void __RPC_USER SC_RPC_HANDLE_rundown(SC_RPC_HANDLE handle)
SC_RPC_HANDLE_destroy(handle); SC_RPC_HANDLE_destroy(handle);
} }
void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len)
{ {
return HeapAlloc(GetProcessHeap(), 0, len); return HeapAlloc(GetProcessHeap(), 0, len);
} }
......
...@@ -990,7 +990,7 @@ static void write_rpc_interface_start(FILE *header, const type_t *iface) ...@@ -990,7 +990,7 @@ static void write_rpc_interface_start(FILE *header, const type_t *iface)
if (!allocate_written) if (!allocate_written)
{ {
allocate_written = 1; allocate_written = 1;
fprintf(header, "void * __RPC_USER MIDL_user_allocate(size_t);\n"); fprintf(header, "void * __RPC_USER MIDL_user_allocate(SIZE_T);\n");
fprintf(header, "void __RPC_USER MIDL_user_free(void *);\n\n"); fprintf(header, "void __RPC_USER MIDL_user_free(void *);\n\n");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment