[CMAKE]

- Use SIZE_T in MIDL_user_allocate. This reverts r49295.

svn path=/branches/cmake-bringup/; revision=50118

diff --git a/base/services/eventlog/rpc.c b/base/services/eventlog/rpc.c
index fccfc6e..d0efdad 100644 (file)
--- a/base/services/eventlog/rpc.c
+++ b/base/services/eventlog/rpc.c
@@ -694,7 +694,7 @@ NTSTATUS ElfrReportEventAndSourceW(
 }
 
 
-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(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/base/services/rpcss/irotp.c b/base/services/rpcss/irotp.c
index 00b282e..f766beb 100644 (file)
--- a/base/services/rpcss/irotp.c
+++ b/base/services/rpcss/irotp.c
@@ -368,7 +368,7 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle)
     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);
 }

diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c
index b06f1c4..2352efe 100644 (file)
--- a/base/services/umpnpmgr/umpnpmgr.c
+++ b/base/services/umpnpmgr/umpnpmgr.c
@@ -137,7 +137,7 @@ RpcServerThread(LPVOID lpParameter)
 }
 
 
-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(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/base/services/wlansvc/rpcserver.c b/base/services/wlansvc/rpcserver.c
index 4528481..bb01036 100644 (file)
--- a/base/services/wlansvc/rpcserver.c
+++ b/base/services/wlansvc/rpcserver.c
@@ -525,7 +525,7 @@ DWORD _RpcGetSecuritySettings(
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
-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(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c
index 58de5e6..cc45ff5 100644 (file)
--- a/base/system/services/rpcserver.c
+++ b/base/system/services/rpcserver.c
@@ -5391,7 +5391,7 @@ DWORD RFunction55(
 }
 
 
-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(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/dll/win32/advapi32/service/rpc.c b/dll/win32/advapi32/service/rpc.c
index 8f73560..2ee75ab 100644 (file)
--- a/dll/win32/advapi32/service/rpc.c
+++ b/dll/win32/advapi32/service/rpc.c
@@ -12,7 +12,7 @@
 
 
 void __RPC_FAR * __RPC_USER
-midl_user_allocate(size_t len)
+midl_user_allocate(SIZE_T len)
 {
     return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/dll/win32/lsasrv/lsasrv.c b/dll/win32/lsasrv/lsasrv.c
index be06039..1a007ec 100644 (file)
--- a/dll/win32/lsasrv/lsasrv.c
+++ b/dll/win32/lsasrv/lsasrv.c
@@ -72,7 +72,7 @@ ServiceInit(VOID)
 }
 
 
-void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len)
+void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len)
 {
     return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/dll/win32/ole32/moniker.c b/dll/win32/ole32/moniker.c
index f4321bb..b0030de 100644 (file)
--- a/dll/win32/ole32/moniker.c
+++ b/dll/win32/ole32/moniker.c
@@ -1657,7 +1657,7 @@ HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer)
     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);
 }

diff --git a/dll/win32/rpcrt4/rpc_epmap.c b/dll/win32/rpcrt4/rpc_epmap.c
index 544ad74..286ffbf 100644 (file)
--- a/dll/win32/rpcrt4/rpc_epmap.c
+++ b/dll/win32/rpcrt4/rpc_epmap.c
@@ -596,7 +596,7 @@ RPC_STATUS WINAPI TowerConstruct(
     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);
 }

diff --git a/dll/win32/setupapi/rpc.c b/dll/win32/setupapi/rpc.c
index 71ff884..3d55315 100644 (file)
--- a/dll/win32/setupapi/rpc.c
+++ b/dll/win32/setupapi/rpc.c
@@ -111,7 +111,7 @@ PnpUnbindLocalBindingHandle(VOID)
 
 
 void __RPC_FAR * __RPC_USER
-midl_user_allocate(size_t len)
+midl_user_allocate(SIZE_T len)
 {
     return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/dll/win32/wlanapi/main.c b/dll/win32/wlanapi/main.c
index 8a37a9e..3740f91 100644 (file)
--- a/dll/win32/wlanapi/main.c
+++ b/dll/win32/wlanapi/main.c
@@ -198,7 +198,7 @@ WlanScan(IN HANDLE hClientHandle,
 }
 
 void __RPC_FAR * __RPC_USER
-midl_user_allocate(size_t len)
+midl_user_allocate(SIZE_T len)
 {
     return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
 }

diff --git a/include/psdk/rpcndr.h b/include/psdk/rpcndr.h
index c7847cb..8ffb521 100644 (file)
--- a/include/psdk/rpcndr.h
+++ b/include/psdk/rpcndr.h
@@ -118,7 +118,7 @@ typedef unsigned char boolean;
 #define midl_user_free MIDL_user_free
 #define midl_user_allocate MIDL_user_allocate
 
-void  * __RPC_USER MIDL_user_allocate(size_t size);
+void  * __RPC_USER MIDL_user_allocate(SIZE_T size);
 void             __RPC_USER MIDL_user_free( void  * );
 
 #define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8)