[greatlrd] 27322: fixing comping issue, wrong protypes thx to the new headers

Author: greatlrd
Date: Fri Jun 29 15:43:18 2007
New Revision: 27322

URL: http://svn.reactos.org/svn/reactos?rev=27322&view=rev
Log:
fixing comping issue, wrong protypes thx to the new headers

Modified:
    branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c
    branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c
    branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c
    branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c
    branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c
    branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c
    branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c
    branches/ddk2003/dll/win32/rpcrt4/rpc_message.c
    branches/ddk2003/dll/win32/rpcrt4/rpc_server.c
    branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c

Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_co…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c Fri Jun 29 15:43:18 2007
@@ -133,7 +133,7 @@
 /***********************************************************************
  *           NDRCContextBinding
  */
-RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext)
+RPC_BINDING_HANDLE RPC_ENTRY NDRCContextBinding(NDR_CCONTEXT CContext)
 {
   if(!CContext)
     RpcRaiseException(ERROR_INVALID_HANDLE);
@@ -144,7 +144,7 @@
 /***********************************************************************
  *           NDRCContextMarshall
  */
-void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff )
+void RPC_ENTRY NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff )
 {
   CContextHandle *ctx = (CContextHandle*)CContext;
   memcpy(pBuff, &ctx->Ndr, sizeof(ContextHandleNdr));
@@ -153,7 +153,7 @@
 /***********************************************************************
  *           NdrClientContextMarshall
  */
-void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                      NDR_CCONTEXT ContextHandle,
                                      int fCheck)
 {
@@ -169,7 +169,7 @@
 /***********************************************************************
  *           NDRCContextUnmarshall
  */
-void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, 
+void RPC_ENTRY NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, 
                                   RPC_BINDING_HANDLE hBinding,
                                   void *pBuff, 
                                   unsigned long DataRepresentation )
@@ -203,7 +203,7 @@
 /***********************************************************************
  *           NdrClientContextUnmarshall
  */
-void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                        NDR_CCONTEXT * pContextHandle,
                                        RPC_BINDING_HANDLE BindHandle)
 {
@@ -222,7 +222,7 @@
 /***********************************************************************
  *           RpcSmDestroyClientContext
  */
-RPC_STATUS WINAPI RpcSmDestroyClientContext(void** ContextHandle)
+RPC_STATUS RPC_ENTRY RpcSmDestroyClientContext(void** ContextHandle)
 {
   CContextHandle *ctx = (CContextHandle*)ContextHandle;
 
@@ -239,7 +239,7 @@
 /***********************************************************************
  *           RpcSsDestroyClientContext
  */
-void WINAPI RpcSsDestroyClientContext(void** ContextHandle)
+void RPC_ENTRY RpcSsDestroyClientContext(void** ContextHandle)
 {
   RPC_STATUS status;
 
@@ -252,7 +252,7 @@
 /***********************************************************************
  *           NdrContextHandleSize
  */
-void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg,
                                  unsigned char* pMemory,
                                  PFORMAT_STRING pFormat)
 {
@@ -262,7 +262,7 @@
 /***********************************************************************
  *           NdrContextHandleInitialize
  */
-NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg,
+NDR_SCONTEXT RPC_ENTRY NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg,
                                                PFORMAT_STRING pFormat)
 {
   FIXME("(%p, %p): stub\n", pStubMsg, pFormat);
@@ -272,7 +272,7 @@
 /***********************************************************************
  *           NdrServerContextMarshall
  */
-void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                      NDR_SCONTEXT ContextHandle,
                                      NDR_RUNDOWN RundownRoutine)
 {
@@ -293,7 +293,7 @@
 /***********************************************************************
  *           NdrServerContextUnmarshall
  */
-NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg)
+NDR_SCONTEXT RPC_ENTRY NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg)
 {
   SContextHandle *Hdl;
 
@@ -304,7 +304,7 @@
 /***********************************************************************
  *           NdrServerContextNewMarshall
  */
-void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                         NDR_SCONTEXT ContextHandle,
                                         NDR_RUNDOWN RundownRoutine,
                                         PFORMAT_STRING pFormat)
@@ -315,7 +315,7 @@
 /***********************************************************************
  *           NdrServerContextNewUnmarshall
  */
-NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+NDR_SCONTEXT RPC_ENTRY NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                   PFORMAT_STRING pFormat)
 {
   FIXME("(%p, %p): stub\n", pStubMsg, pFormat);
@@ -325,7 +325,7 @@
 /***********************************************************************
  *           NDRSContextMarshall
  */
-void WINAPI NDRSContextMarshall(IN NDR_SCONTEXT CContext,
+void RPC_ENTRY NDRSContextMarshall(IN NDR_SCONTEXT CContext,
                                 OUT void *pBuff,
                                 IN NDR_RUNDOWN userRunDownIn)
 {
@@ -342,7 +342,7 @@
 /***********************************************************************
  *           NDRSContextUnmarshall
  */
-NDR_SCONTEXT WINAPI NDRSContextUnmarshall(IN void *pBuff,
+NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshall(IN void *pBuff,
                                           IN unsigned long DataRepresentation)
 {
   return (NDR_SCONTEXT) RPCRT4_SrvUnmarshallCtxHdl((ContextHandleNdr*)pBuff);
@@ -351,7 +351,7 @@
 /***********************************************************************
  *           NDRSContextMarshallEx
  */
-void WINAPI NDRSContextMarshallEx(IN RPC_BINDING_HANDLE BindingHandle,
+void RPC_ENTRY NDRSContextMarshallEx(IN RPC_BINDING_HANDLE BindingHandle,
                                   IN NDR_SCONTEXT CContext,
                                   OUT void *pBuff,
                                   IN NDR_RUNDOWN userRunDownIn)
@@ -362,7 +362,7 @@
 /***********************************************************************
  *           NDRSContextUnmarshallEx
  */
-NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(IN RPC_BINDING_HANDLE BindingHandle,
+NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshallEx(IN RPC_BINDING_HANDLE BindingHandle,
                                             IN void *pBuff,
                                             IN unsigned long DataRepresentation)
 {

Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_ma…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c Fri Jun 29 15:43:18 2007
@@ -292,7 +292,7 @@
   NdrUserMarshalFree
 };
 
-void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len)
+void * RPC_ENTRY NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len)
 {
   /* hmm, this is probably supposed to do more? */
   return pStubMsg->pfnAllocate(len);
@@ -480,7 +480,7 @@
 /***********************************************************************
  *            NdrConformantStringMarshall [RPCRT4.@]
  */
-unsigned char *WINAPI NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg,
+unsigned char *RPC_ENTRY NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg,
   unsigned char *pszMessage, PFORMAT_STRING pFormat)
 { 
   unsigned long len, esize;
@@ -490,13 +490,13 @@
   
   assert(pFormat);
   if (pszMessage == NULL) {
-    TRACE("string=%s\n", debugstr_a(pszMessage));
+
     len = 0;
     esize = 0;
   }
   else if (*pFormat == RPC_FC_C_CSTRING) {
-    TRACE("string=%s\n", debugstr_a(pszMessage));
-    len = strlen(pszMessage)+1;
+
+    len = (unsigned long ) strlen((char *)pszMessage)+1;
     esize = 1;
   }
   else if (*pFormat == RPC_FC_C_WSTRING) {
@@ -537,7 +537,7 @@
 /***********************************************************************
  *           NdrConformantStringBufferSize [RPCRT4.@]
  */
-void WINAPI NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
   unsigned char* pMemory, PFORMAT_STRING pFormat)
 {
   TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg,
pMemory, pFormat);
@@ -571,7 +571,7 @@
 /************************************************************************
  *            NdrConformantStringMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrConformantStringMemorySize( PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrConformantStringMemorySize( PMIDL_STUB_MESSAGE pStubMsg,
   PFORMAT_STRING pFormat )
 {
   unsigned long rslt = 0;
@@ -602,7 +602,7 @@
 /************************************************************************
  *           NdrConformantStringUnmarshall [RPCRT4.@]
  */
-unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *RPC_ENTRY NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg,
   unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc )
 {
   unsigned long len, esize, ofs;
@@ -650,7 +650,7 @@
 /***********************************************************************
  *           NdrNonConformantStringMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -661,7 +661,7 @@
 /***********************************************************************
  *           NdrNonConformantStringUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -673,7 +673,7 @@
 /***********************************************************************
  *           NdrNonConformantStringBufferSize [RPCRT4.@]
  */
-void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -683,7 +683,7 @@
 /***********************************************************************
  *           NdrNonConformantStringMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -1253,7 +1253,7 @@
 /***********************************************************************
  *           NdrPointerMarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                           unsigned char *pMemory,
                                           PFORMAT_STRING pFormat)
 {
@@ -1270,7 +1270,7 @@
 /***********************************************************************
  *           NdrPointerUnmarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                             unsigned char **ppMemory,
                                             PFORMAT_STRING pFormat,
                                             unsigned char fMustAlloc)
@@ -1286,7 +1286,7 @@
 /***********************************************************************
  *           NdrPointerBufferSize [RPCRT4.@]
  */
-void WINAPI NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                       unsigned char *pMemory,
                                       PFORMAT_STRING pFormat)
 {
@@ -1297,7 +1297,7 @@
 /***********************************************************************
  *           NdrPointerMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                           PFORMAT_STRING pFormat)
 {
   /* unsigned size = *(LPWORD)(pFormat+2); */
@@ -1309,7 +1309,7 @@
 /***********************************************************************
  *           NdrPointerFree [RPCRT4.@]
  */
-void WINAPI NdrPointerFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrPointerFree(PMIDL_STUB_MESSAGE pStubMsg,
                            unsigned char *pMemory,
                            PFORMAT_STRING pFormat)
 {
@@ -1320,7 +1320,7 @@
 /***********************************************************************
  *           NdrSimpleStructMarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                unsigned char *pMemory,
                                                PFORMAT_STRING pFormat)
 {
@@ -1350,7 +1350,7 @@
 /***********************************************************************
  *           NdrSimpleStructUnmarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                  unsigned char **ppMemory,
                                                  PFORMAT_STRING pFormat,
                                                  unsigned char fMustAlloc)
@@ -1384,7 +1384,7 @@
 /***********************************************************************
  *           NdrSimpleTypeUnmarshall [RPCRT4.@]
  */
-void WINAPI NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                   unsigned char *pMemory,
                                   unsigned char FormatChar)
 {
@@ -1395,7 +1395,7 @@
 /***********************************************************************
  *           NdrSimpleTypeUnmarshall [RPCRT4.@]
  */
-void WINAPI NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                     unsigned char *pMemory,
                                     unsigned char FormatChar)
 {
@@ -1406,7 +1406,7 @@
 /***********************************************************************
  *           NdrSimpleStructBufferSize [RPCRT4.@]
  */
-void WINAPI NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                       unsigned char *pMemory,
                                       PFORMAT_STRING pFormat)
 {
@@ -1420,7 +1420,7 @@
 /***********************************************************************
  *           NdrSimpleStructMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                                PFORMAT_STRING pFormat)
 {
   /* unsigned size = *(LPWORD)(pFormat+2); */
@@ -1433,7 +1433,7 @@
 /***********************************************************************
  *           NdrSimpleStructFree [RPCRT4.@]
  */
-void WINAPI NdrSimpleStructFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrSimpleStructFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -1443,7 +1443,7 @@
 }
 
 
-unsigned long WINAPI EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg,
                                          PFORMAT_STRING pFormat)
 {
   switch (*pFormat) {
@@ -1461,7 +1461,7 @@
 }
 
 
-unsigned char * WINAPI ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                        unsigned char *pMemory,
                                        PFORMAT_STRING pFormat,
                                        PFORMAT_STRING pPointer)
@@ -1525,7 +1525,7 @@
   return pMemory;
 }
 
-unsigned char * WINAPI ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                          unsigned char *pMemory,
                                          PFORMAT_STRING pFormat,
                                          PFORMAT_STRING pPointer,
@@ -1592,7 +1592,7 @@
   return pMemory;
 }
 
-unsigned char * WINAPI ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                          unsigned char *pMemory,
                                          PFORMAT_STRING pFormat,
                                          PFORMAT_STRING pPointer)
@@ -1650,7 +1650,7 @@
   return pMemory;
 }
 
-unsigned char * WINAPI ComplexFree(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY ComplexFree(PMIDL_STUB_MESSAGE pStubMsg,
                                    unsigned char *pMemory,
                                    PFORMAT_STRING pFormat,
                                    PFORMAT_STRING pPointer)
@@ -1706,7 +1706,7 @@
   return pMemory;
 }
 
-unsigned long WINAPI ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg,
                                        PFORMAT_STRING pFormat)
 {
   PFORMAT_STRING desc;
@@ -1755,7 +1755,7 @@
 /***********************************************************************
  *           NdrComplexStructMarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                 unsigned char *pMemory,
                                                 PFORMAT_STRING pFormat)
 {
@@ -1788,7 +1788,7 @@
 /***********************************************************************
  *           NdrComplexStructUnmarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                   unsigned char **ppMemory,
                                                   PFORMAT_STRING pFormat,
                                                   unsigned char fMustAlloc)
@@ -1823,7 +1823,7 @@
 /***********************************************************************
  *           NdrComplexStructBufferSize [RPCRT4.@]
  */
-void WINAPI NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                        unsigned char *pMemory,
                                        PFORMAT_STRING pFormat)
 {
@@ -1852,7 +1852,7 @@
 /***********************************************************************
  *           NdrComplexStructMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                                 PFORMAT_STRING pFormat)
 {
   /* unsigned size = *(LPWORD)(pFormat+2); */
@@ -1873,7 +1873,7 @@
 /***********************************************************************
  *           NdrComplexStructFree [RPCRT4.@]
  */
-void WINAPI NdrComplexStructFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrComplexStructFree(PMIDL_STUB_MESSAGE pStubMsg,
                                  unsigned char *pMemory,
                                  PFORMAT_STRING pFormat)
 {
@@ -1902,7 +1902,7 @@
 /***********************************************************************
  *           NdrConformantArrayMarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                   unsigned char *pMemory,
                                                   PFORMAT_STRING pFormat)
 {
@@ -1930,7 +1930,7 @@
 /***********************************************************************
  *           NdrConformantArrayUnmarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                     unsigned char **ppMemory,
                                                     PFORMAT_STRING pFormat,
                                                     unsigned char fMustAlloc)
@@ -1958,7 +1958,7 @@
 /***********************************************************************
  *           NdrConformantArrayBufferSize [RPCRT4.@]
  */
-void WINAPI NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                          unsigned char *pMemory,
                                          PFORMAT_STRING pFormat)
 {
@@ -1978,7 +1978,7 @@
 /***********************************************************************
  *           NdrConformantArrayMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                                   PFORMAT_STRING pFormat)
 {
   DWORD size = 0, esize = *(const WORD*)(pFormat+2);
@@ -1998,7 +1998,7 @@
 /***********************************************************************
  *           NdrConformantArrayFree [RPCRT4.@]
  */
-void WINAPI NdrConformantArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
                                    unsigned char *pMemory,
                                    PFORMAT_STRING pFormat)
 {
@@ -2012,7 +2012,7 @@
 /***********************************************************************
  *           NdrConformantVaryingArrayMarshall  [RPCRT4.@]
  */
-unsigned char* WINAPI NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char* RPC_ENTRY NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg,
                                                          unsigned char* pMemory,
                                                          PFORMAT_STRING pFormat )
 {
@@ -2052,7 +2052,7 @@
 /***********************************************************************
  *           NdrConformantVaryingArrayUnmarshall  [RPCRT4.@]
  */
-unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char* RPC_ENTRY NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE
pStubMsg,
                                                            unsigned char** ppMemory,
                                                            PFORMAT_STRING pFormat,
                                                            unsigned char fMustAlloc )
@@ -2084,7 +2084,7 @@
 /***********************************************************************
  *           NdrConformantVaryingArrayFree  [RPCRT4.@]
  */
-void WINAPI NdrConformantVaryingArrayFree( PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantVaryingArrayFree( PMIDL_STUB_MESSAGE pStubMsg,
                                            unsigned char* pMemory,
                                            PFORMAT_STRING pFormat )
 {
@@ -2095,7 +2095,7 @@
 /***********************************************************************
  *           NdrConformantVaryingArrayBufferSize  [RPCRT4.@]
  */
-void WINAPI NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg,
                                                  unsigned char* pMemory, PFORMAT_STRING
pFormat )
 {
     DWORD esize = *(const WORD*)(pFormat+2);
@@ -2124,7 +2124,7 @@
 /***********************************************************************
  *           NdrConformantVaryingArrayMemorySize  [RPCRT4.@]
  */
-unsigned long WINAPI NdrConformantVaryingArrayMemorySize( PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrConformantVaryingArrayMemorySize( PMIDL_STUB_MESSAGE
pStubMsg,
                                                           PFORMAT_STRING pFormat )
 {
     FIXME( "stub\n" );
@@ -2135,7 +2135,7 @@
 /***********************************************************************
  *           NdrComplexArrayMarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                unsigned char *pMemory,
                                                PFORMAT_STRING pFormat)
 {
@@ -2182,7 +2182,7 @@
 /***********************************************************************
  *           NdrComplexArrayUnmarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                  unsigned char **ppMemory,
                                                  PFORMAT_STRING pFormat,
                                                  unsigned char fMustAlloc)
@@ -2222,7 +2222,7 @@
 /***********************************************************************
  *           NdrComplexArrayBufferSize [RPCRT4.@]
  */
-void WINAPI NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                       unsigned char *pMemory,
                                       PFORMAT_STRING pFormat)
 {
@@ -2259,7 +2259,7 @@
 /***********************************************************************
  *           NdrComplexArrayMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                                PFORMAT_STRING pFormat)
 {
   DWORD size = 0;
@@ -2286,7 +2286,7 @@
 /***********************************************************************
  *           NdrComplexArrayFree [RPCRT4.@]
  */
-void WINAPI NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2323,7 +2323,7 @@
 /***********************************************************************
  *           NdrUserMarshalMarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                               unsigned char *pMemory,
                                               PFORMAT_STRING pFormat)
 {
@@ -2345,7 +2345,7 @@
 /***********************************************************************
  *           NdrUserMarshalUnmarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                  unsigned char **ppMemory,
                                                  PFORMAT_STRING pFormat,
                                                  unsigned char fMustAlloc)
@@ -2370,7 +2370,7 @@
 /***********************************************************************
  *           NdrUserMarshalBufferSize [RPCRT4.@]
  */
-void WINAPI NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                       unsigned char *pMemory,
                                       PFORMAT_STRING pFormat)
 {
@@ -2395,7 +2395,7 @@
 /***********************************************************************
  *           NdrUserMarshalMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                               PFORMAT_STRING pFormat)
 {
   unsigned index = *(const WORD*)&pFormat[2];
@@ -2409,7 +2409,7 @@
 /***********************************************************************
  *           NdrUserMarshalFree [RPCRT4.@]
  */
-void WINAPI NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2426,7 +2426,7 @@
 /***********************************************************************
  *           NdrClearOutParameters [RPCRT4.@]
  */
-void WINAPI NdrClearOutParameters(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrClearOutParameters(PMIDL_STUB_MESSAGE pStubMsg,
                                   PFORMAT_STRING pFormat,
                                   void *ArgAddr)
 {
@@ -2436,7 +2436,7 @@
 /***********************************************************************
  *           NdrConvert [RPCRT4.@]
  */
-void WINAPI NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat )
+void RPC_ENTRY NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat )
 {
   FIXME("(pStubMsg == ^%p, pFormat == ^%p): stub.\n", pStubMsg, pFormat);
   /* FIXME: since this stub doesn't do any converting, the proper behavior
@@ -2446,7 +2446,7 @@
 /***********************************************************************
  *           NdrConvert2 [RPCRT4.@]
  */
-void WINAPI NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, long
NumberParams )
+void RPC_ENTRY NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, long
NumberParams )
 {
   FIXME("(pStubMsg == ^%p, pFormat == ^%p, NumberParams == %ld): stub.\n",
     pStubMsg, pFormat, NumberParams);
@@ -2465,7 +2465,7 @@
 /***********************************************************************
  *           NdrConformantStructMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2501,7 +2501,7 @@
 /***********************************************************************
  *           NdrConformantStructUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2558,7 +2558,7 @@
 /***********************************************************************
  *           NdrConformantStructBufferSize [RPCRT4.@]
  */
-void WINAPI NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2591,7 +2591,7 @@
 /***********************************************************************
  *           NdrConformantStructMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2601,7 +2601,7 @@
 /***********************************************************************
  *           NdrConformantStructFree [RPCRT4.@]
  */
-void WINAPI NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2611,7 +2611,7 @@
 /***********************************************************************
  *           NdrConformantVaryingStructMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE
pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2622,7 +2622,7 @@
 /***********************************************************************
  *           NdrConformantVaryingStructUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE
pStubMsg,
+unsigned char *  RPC_ENTRY NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE
pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2634,7 +2634,7 @@
 /***********************************************************************
  *           NdrConformantVaryingStructBufferSize [RPCRT4.@]
  */
-void WINAPI NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2644,7 +2644,7 @@
 /***********************************************************************
  *           NdrConformantVaryingStructMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE
pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2654,7 +2654,7 @@
 /***********************************************************************
  *           NdrConformantVaryingStructFree [RPCRT4.@]
  */
-void WINAPI NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2664,7 +2664,7 @@
 /***********************************************************************
  *           NdrFixedArrayMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2675,7 +2675,7 @@
 /***********************************************************************
  *           NdrFixedArrayUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2687,7 +2687,7 @@
 /***********************************************************************
  *           NdrFixedArrayBufferSize [RPCRT4.@]
  */
-void WINAPI NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2697,7 +2697,7 @@
 /***********************************************************************
  *           NdrFixedArrayMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2707,7 +2707,7 @@
 /***********************************************************************
  *           NdrFixedArrayFree [RPCRT4.@]
  */
-void WINAPI NdrFixedArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrFixedArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2717,7 +2717,7 @@
 /***********************************************************************
  *           NdrVaryingArrayMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2728,7 +2728,7 @@
 /***********************************************************************
  *           NdrVaryingArrayUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2740,7 +2740,7 @@
 /***********************************************************************
  *           NdrVaryingArrayBufferSize [RPCRT4.@]
  */
-void WINAPI NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2750,7 +2750,7 @@
 /***********************************************************************
  *           NdrVaryingArrayMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2760,7 +2760,7 @@
 /***********************************************************************
  *           NdrVaryingArrayFree [RPCRT4.@]
  */
-void WINAPI NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2770,7 +2770,7 @@
 /***********************************************************************
  *           NdrEncapsulatedUnionMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2781,7 +2781,7 @@
 /***********************************************************************
  *           NdrEncapsulatedUnionUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2793,7 +2793,7 @@
 /***********************************************************************
  *           NdrEncapsulatedUnionBufferSize [RPCRT4.@]
  */
-void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2803,7 +2803,7 @@
 /***********************************************************************
  *           NdrEncapsulatedUnionMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2813,7 +2813,7 @@
 /***********************************************************************
  *           NdrEncapsulatedUnionFree [RPCRT4.@]
  */
-void WINAPI NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2823,7 +2823,7 @@
 /***********************************************************************
  *           NdrNonEncapsulatedUnionMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2834,7 +2834,7 @@
 /***********************************************************************
  *           NdrNonEncapsulatedUnionUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE
pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2846,7 +2846,7 @@
 /***********************************************************************
  *           NdrNonEncapsulatedUnionBufferSize [RPCRT4.@]
  */
-void WINAPI NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2856,7 +2856,7 @@
 /***********************************************************************
  *           NdrNonEncapsulatedUnionMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2866,7 +2866,7 @@
 /***********************************************************************
  *           NdrNonEncapsulatedUnionFree [RPCRT4.@]
  */
-void WINAPI NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2876,7 +2876,7 @@
 /***********************************************************************
  *           NdrByteCountPointerMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2887,7 +2887,7 @@
 /***********************************************************************
  *           NdrByteCountPointerUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2899,7 +2899,7 @@
 /***********************************************************************
  *           NdrByteCountPointerBufferSize [RPCRT4.@]
  */
-void WINAPI NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2909,7 +2909,7 @@
 /***********************************************************************
  *           NdrByteCountPointerMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2919,7 +2919,7 @@
 /***********************************************************************
  *           NdrByteCountPointerFree [RPCRT4.@]
  */
-void WINAPI NdrByteCountPointerFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrByteCountPointerFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2929,7 +2929,7 @@
 /***********************************************************************
  *           NdrXmitOrRepAsMarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2940,7 +2940,7 @@
 /***********************************************************************
  *           NdrXmitOrRepAsUnmarshall [RPCRT4.@]
  */
-unsigned char *  WINAPI NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char *  RPC_ENTRY NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char **ppMemory,
                                 PFORMAT_STRING pFormat,
                                 unsigned char fMustAlloc)
@@ -2952,7 +2952,7 @@
 /***********************************************************************
  *           NdrXmitOrRepAsBufferSize [RPCRT4.@]
  */
-void WINAPI NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {
@@ -2962,7 +2962,7 @@
 /***********************************************************************
  *           NdrXmitOrRepAsMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                 PFORMAT_STRING pFormat)
 {
     FIXME("stub\n");
@@ -2972,7 +2972,7 @@
 /***********************************************************************
  *           NdrXmitOrRepAsFree [RPCRT4.@]
  */
-void WINAPI NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg,
                                 unsigned char *pMemory,
                                 PFORMAT_STRING pFormat)
 {

Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_mi…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c Fri Jun 29 15:43:18 2007
@@ -49,7 +49,7 @@
 /***********************************************************************
  *           NdrProxyInitialize [RPCRT4.@]
  */
-void WINAPI NdrProxyInitialize(void *This,
+void RPC_ENTRY NdrProxyInitialize(void *This,
                               PRPC_MESSAGE pRpcMsg,
                               PMIDL_STUB_MESSAGE pStubMsg,
                               PMIDL_STUB_DESC pStubDescriptor,
@@ -71,7 +71,7 @@
 /***********************************************************************
  *           NdrProxyGetBuffer [RPCRT4.@]
  */
-void WINAPI NdrProxyGetBuffer(void *This,
+void RPC_ENTRY NdrProxyGetBuffer(void *This,
                              PMIDL_STUB_MESSAGE pStubMsg)
 {
   HRESULT hr;
@@ -93,7 +93,7 @@
 /***********************************************************************
  *           NdrProxySendReceive [RPCRT4.@]
  */
-void WINAPI NdrProxySendReceive(void *This,
+void RPC_ENTRY NdrProxySendReceive(void *This,
                                PMIDL_STUB_MESSAGE pStubMsg)
 {
   ULONG Status = 0;
@@ -125,7 +125,7 @@
 /***********************************************************************
  *           NdrProxyFreeBuffer [RPCRT4.@]
  */
-void WINAPI NdrProxyFreeBuffer(void *This,
+void RPC_ENTRY NdrProxyFreeBuffer(void *This,
                               PMIDL_STUB_MESSAGE pStubMsg)
 {
   HRESULT hr;
@@ -138,7 +138,7 @@
 /***********************************************************************
  *           NdrProxyErrorHandler [RPCRT4.@]
  */
-HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode)
+HRESULT RPC_ENTRY NdrProxyErrorHandler(DWORD dwExceptionCode)
 {
   WARN("(0x%08lx): a proxy call failed\n", dwExceptionCode);
 
@@ -151,7 +151,7 @@
 /***********************************************************************
  *           NdrStubInitialize [RPCRT4.@]
  */
-void WINAPI NdrStubInitialize(PRPC_MESSAGE pRpcMsg,
+void RPC_ENTRY NdrStubInitialize(PRPC_MESSAGE pRpcMsg,
                              PMIDL_STUB_MESSAGE pStubMsg,
                              PMIDL_STUB_DESC pStubDescriptor,
                              LPRPCCHANNELBUFFER pRpcChannelBuffer)
@@ -164,7 +164,7 @@
 /***********************************************************************
  *           NdrStubGetBuffer [RPCRT4.@]
  */
-void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER This,
+void RPC_ENTRY NdrStubGetBuffer(LPRPCSTUBBUFFER This,
                             LPRPCCHANNELBUFFER pRpcChannelBuffer,
                             PMIDL_STUB_MESSAGE pStubMsg)
 {
@@ -180,7 +180,7 @@
 /************************************************************************
  *             NdrClientInitializeNew [RPCRT4.@]
  */
-void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE
pStubMsg, 
+void RPC_ENTRY NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE
pStubMsg, 
                                     PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum )
 {
   TRACE("(pRpcMessage == ^%p, pStubMsg == ^%p, pStubDesc == ^%p, ProcNum ==
%d)\n",
@@ -208,7 +208,7 @@
 /***********************************************************************
  *             NdrServerInitializeNew [RPCRT4.@]
  */
-unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE
pStubMsg,
+unsigned char* RPC_ENTRY NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE
pStubMsg,
                                               PMIDL_STUB_DESC pStubDesc )
 {
   TRACE("(pRpcMsg == ^%p, pStubMsg == ^%p, pStubDesc == ^%p)\n", pRpcMsg,
pStubMsg, pStubDesc);
@@ -235,7 +235,7 @@
 /***********************************************************************
  *           NdrGetBuffer [RPCRT4.@]
  */
-unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen,
RPC_BINDING_HANDLE handle)
+unsigned char *RPC_ENTRY NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen,
RPC_BINDING_HANDLE handle)
 {
   TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p): wild guess.\n",
stubmsg, buflen, handle);
   
@@ -256,7 +256,7 @@
 /***********************************************************************
  *           NdrFreeBuffer [RPCRT4.@]
  */
-void WINAPI NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg)
+void RPC_ENTRY NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg)
 {
   TRACE("(pStubMsg == ^%p): wild guess.\n", pStubMsg);
   I_RpcFreeBuffer(pStubMsg->RpcMsg);
@@ -267,7 +267,7 @@
 /************************************************************************
  *           NdrSendReceive [RPCRT4.@]
  */
-unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer 
)
+unsigned char *RPC_ENTRY NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char
*buffer  )
 {
   RPC_STATUS status;
 

Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_ol…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c Fri Jun 29 15:43:18 2007
@@ -243,7 +243,7 @@
 /***********************************************************************
  *           NdrInterfacePointerMarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                   unsigned char *pMemory,
                                                   PFORMAT_STRING pFormat)
 {
@@ -275,7 +275,7 @@
 /***********************************************************************
  *           NdrInterfacePointerUnmarshall [RPCRT4.@]
  */
-unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned char * RPC_ENTRY NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                                     unsigned char **ppMemory,
                                                     PFORMAT_STRING pFormat,
                                                     unsigned char fMustAlloc)
@@ -301,7 +301,7 @@
 /***********************************************************************
  *           NdrInterfacePointerBufferSize [RPCRT4.@]
  */
-void WINAPI NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
                                          unsigned char *pMemory,
                                          PFORMAT_STRING pFormat)
 {
@@ -321,7 +321,7 @@
 /***********************************************************************
  *           NdrInterfacePointerMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+unsigned long RPC_ENTRY NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
                                                   PFORMAT_STRING pFormat)
 {
   FIXME("(%p,%p): stub\n", pStubMsg, pFormat);
@@ -331,7 +331,7 @@
 /***********************************************************************
  *           NdrInterfacePointerFree [RPCRT4.@]
  */
-void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg,
+void RPC_ENTRY NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg,
                                    unsigned char *pMemory,
                                    PFORMAT_STRING pFormat)
 {
@@ -343,7 +343,7 @@
 /***********************************************************************
  *           NdrOleAllocate [RPCRT4.@]
  */
-void * WINAPI NdrOleAllocate(size_t Size)
+void * RPC_ENTRY NdrOleAllocate(size_t Size)
 {
   if (!LoadCOM()) return NULL;
   return COM_MemAlloc(Size);
@@ -352,7 +352,7 @@
 /***********************************************************************
  *           NdrOleFree [RPCRT4.@]
  */
-void WINAPI NdrOleFree(void *NodeToFree)
+void RPC_ENTRY NdrOleFree(void *NodeToFree)
 {
   if (!LoadCOM()) return;
   COM_MemFree(NodeToFree);

Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_st…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c Fri Jun 29 15:43:18 2007
@@ -382,7 +382,7 @@
 
 #include "poppack.h"
 
-void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage)
+void RPC_ENTRY NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage)
 {
 #if 0 /* these functions are not defined yet */
     pMessage->pfnAllocate = NdrRpcSmClientAllocate;
@@ -974,7 +974,7 @@
 #endif
 
 /* FIXME: need to free some stuff in here too */
-long WINAPI NdrStubCall2(
+long RPC_ENTRY NdrStubCall2(
     struct IRpcStubBuffer * pThis,
     struct IRpcChannelBuffer * pChannel,
     PRPC_MESSAGE pRpcMsg,
@@ -1471,7 +1471,7 @@
     return S_OK;
 }
 
-void WINAPI NdrServerCall2(PRPC_MESSAGE pRpcMsg)
+void RPC_ENTRY NdrServerCall2(PRPC_MESSAGE pRpcMsg)
 {
     DWORD dwPhase;
     NdrStubCall2(NULL, NULL, pRpcMsg, &dwPhase);

Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_bi…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c Fri Jun 29 15:43:18 2007
@@ -632,7 +632,7 @@
 /***********************************************************************
  *             RpcStringBindingComposeA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcStringBindingComposeA(unsigned char *ObjUuid, unsigned char
*Protseq,
+RPC_STATUS RPC_ENTRY RpcStringBindingComposeA(unsigned char *ObjUuid, unsigned char
*Protseq,
                                            unsigned char *NetworkAddr, unsigned char
*Endpoint,
                                            unsigned char *Options, unsigned char**
StringBinding )
 {
@@ -684,7 +684,7 @@
 /***********************************************************************
  *             RpcStringBindingComposeW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq,
+RPC_STATUS RPC_ENTRY RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq,
                                             LPWSTR NetworkAddr, LPWSTR Endpoint,
                                             LPWSTR Options, LPWSTR* StringBinding )
 {
@@ -737,7 +737,7 @@
 /***********************************************************************
  *             RpcStringBindingParseA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcStringBindingParseA( unsigned char *StringBinding, unsigned char
**ObjUuid,
+RPC_STATUS RPC_ENTRY RpcStringBindingParseA( unsigned char *StringBinding, unsigned char
**ObjUuid,
                                           unsigned char **Protseq, unsigned char
**NetworkAddr,
                                           unsigned char **Endpoint, unsigned char
**Options)
 {
@@ -828,7 +828,7 @@
 /***********************************************************************
  *             RpcStringBindingParseW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcStringBindingParseW( LPWSTR StringBinding, LPWSTR *ObjUuid,
+RPC_STATUS RPC_ENTRY RpcStringBindingParseW( LPWSTR StringBinding, LPWSTR *ObjUuid,
                                           LPWSTR *Protseq, LPWSTR *NetworkAddr,
                                           LPWSTR *Endpoint, LPWSTR *Options)
 {
@@ -918,7 +918,7 @@
 /***********************************************************************
  *             RpcBindingFree (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding )
+RPC_STATUS RPC_ENTRY RpcBindingFree( RPC_BINDING_HANDLE* Binding )
 {
   RPC_STATUS status;
   TRACE("(%p) = %p\n", Binding, *Binding);
@@ -930,7 +930,7 @@
 /***********************************************************************
  *             RpcBindingVectorFree (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector )
+RPC_STATUS RPC_ENTRY RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector )
 {
   RPC_STATUS status;
   unsigned long c;
@@ -947,7 +947,7 @@
 /***********************************************************************
  *             RpcBindingInqObject (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid )
+RPC_STATUS RPC_ENTRY RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid )
 {
   RpcBinding* bind = (RpcBinding*)Binding;
 
@@ -959,7 +959,7 @@
 /***********************************************************************
  *             RpcBindingSetObject (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid )
+RPC_STATUS RPC_ENTRY RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid )
 {
   RpcBinding* bind = (RpcBinding*)Binding;
 
@@ -971,7 +971,7 @@
 /***********************************************************************
  *             RpcBindingFromStringBindingA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingFromStringBindingA( unsigned char *StringBinding,
RPC_BINDING_HANDLE* Binding )
+RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingA( unsigned char *StringBinding,
RPC_BINDING_HANDLE* Binding )
 {
   RPC_STATUS ret;
   RpcBinding* bind = NULL;
@@ -1010,7 +1010,7 @@
 /***********************************************************************
  *             RpcBindingFromStringBindingW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingFromStringBindingW( LPWSTR StringBinding, RPC_BINDING_HANDLE*
Binding )
+RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingW( LPWSTR StringBinding,
RPC_BINDING_HANDLE* Binding )
 {
   RPC_STATUS ret;
   RpcBinding* bind = NULL;
@@ -1049,7 +1049,7 @@
 /***********************************************************************
  *             RpcBindingToStringBindingA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned char**
StringBinding )
+RPC_STATUS RPC_ENTRY RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned
char** StringBinding )
 {
   RPC_STATUS ret;
   RpcBinding* bind = (RpcBinding*)Binding;
@@ -1071,7 +1071,7 @@
 /***********************************************************************
  *             RpcBindingToStringBindingW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, unsigned
short** StringBinding )
+RPC_STATUS RPC_ENTRY RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, unsigned
short** StringBinding )
 {
   RPC_STATUS ret;
   unsigned char *str = NULL;
@@ -1088,7 +1088,7 @@
  *  Exists in win9x and winNT, but with different number of arguments
  *  (9x version has 3 arguments, NT has 2).
  */
-RPC_STATUS WINAPI I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN
BlockingFn)
+RPC_STATUS RPC_ENTRY I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN
BlockingFn)
 {
   RpcBinding* bind = (RpcBinding*)Binding;
 
@@ -1102,7 +1102,7 @@
 /***********************************************************************
  *             RpcNetworkIsProtseqValidA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcNetworkIsProtseqValidA(unsigned char *protseq) {
+RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA(unsigned char *protseq) {
   UNICODE_STRING protseqW;
 
   if (!protseq) return RPC_S_INVALID_RPC_PROTSEQ; /* ? */
@@ -1124,7 +1124,7 @@
  *   ncalrpc   local-only rpc over LPC (LPC is not really used)
  *   ncacn_np  rpc over named pipes
  */
-RPC_STATUS WINAPI RpcNetworkIsProtseqValidW(LPWSTR protseq) {
+RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidW(LPWSTR protseq) {
   static const WCHAR protseqsW[][15] = { 
    
{'n','c','a','l','r','p','c',0},
    
{'n','c','a','c','n','_','n','p',0}

Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_ep…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c Fri Jun 29 15:43:18 2007
@@ -66,7 +66,7 @@
 /***********************************************************************
  *             RpcEpRegisterA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR
*BindingVector,
+RPC_STATUS RPC_ENTRY RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR
*BindingVector,
                                   UUID_VECTOR *UuidVector, unsigned char *Annotation )
 {
   RPCSS_NP_MESSAGE msg;
@@ -139,7 +139,7 @@
 /***********************************************************************
  *             RpcEpUnregister (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR
*BindingVector,
+RPC_STATUS RPC_ENTRY RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR
*BindingVector,
                                    UUID_VECTOR *UuidVector )
 {
   RPCSS_NP_MESSAGE msg;
@@ -209,7 +209,7 @@
 /***********************************************************************
  *             RpcEpResolveBinding (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE IfSpec
)
+RPC_STATUS RPC_ENTRY RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE
IfSpec )
 {
   RPCSS_NP_MESSAGE msg;
   RPCSS_NP_REPLY reply;

Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_message.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_me…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/rpc_message.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/rpc_message.c Fri Jun 29 15:43:18 2007
@@ -481,7 +481,7 @@
 /***********************************************************************
  *           I_RpcGetBuffer [RPCRT4.@]
  */
-RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg)
+RPC_STATUS RPC_ENTRY I_RpcGetBuffer(PRPC_MESSAGE pMsg)
 {
   TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength);
   /* FIXME: pfnAllocate? */
@@ -495,7 +495,7 @@
 /***********************************************************************
  *           I_RpcFreeBuffer [RPCRT4.@]
  */
-RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg)
+RPC_STATUS RPC_ENTRY I_RpcFreeBuffer(PRPC_MESSAGE pMsg)
 {
   TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer);
   /* FIXME: pfnFree? */
@@ -507,7 +507,7 @@
 /***********************************************************************
  *           I_RpcSend [RPCRT4.@]
  */
-RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg)
+RPC_STATUS RPC_ENTRY I_RpcSend(PRPC_MESSAGE pMsg)
 {
   RpcBinding* bind = (RpcBinding*)pMsg->Handle;
   RpcConnection* conn;
@@ -566,7 +566,7 @@
 /***********************************************************************
  *           I_RpcReceive [RPCRT4.@]
  */
-RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg)
+RPC_STATUS RPC_ENTRY I_RpcReceive(PRPC_MESSAGE pMsg)
 {
   RpcBinding* bind = (RpcBinding*)pMsg->Handle;
   RpcConnection* conn;
@@ -635,7 +635,7 @@
 /***********************************************************************
  *           I_RpcSendReceive [RPCRT4.@]
  */
-RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg)
+RPC_STATUS RPC_ENTRY I_RpcSendReceive(PRPC_MESSAGE pMsg)
 {
   RPC_STATUS status;
 

Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_server.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_se…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/rpc_server.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/rpc_server.c Fri Jun 29 15:43:18 2007
@@ -645,7 +645,7 @@
 /***********************************************************************
  *             RpcServerInqBindings (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector )
+RPC_STATUS RPC_ENTRY RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector )
 {
   RPC_STATUS status;
   DWORD count;
@@ -699,7 +699,7 @@
 /***********************************************************************
  *             RpcServerUseProtseqEpA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls, unsigned
char *Endpoint, LPVOID SecurityDescriptor )
+RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls,
unsigned char *Endpoint, LPVOID SecurityDescriptor )
 {
   RPC_POLICY policy;
   
@@ -716,7 +716,7 @@
 /***********************************************************************
  *             RpcServerUseProtseqEpW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint,
LPVOID SecurityDescriptor )
+RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR
Endpoint, LPVOID SecurityDescriptor )
 {
   RPC_POLICY policy;
   
@@ -733,7 +733,7 @@
 /***********************************************************************
  *             RpcServerUseProtseqEpExA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls,
unsigned char *Endpoint, LPVOID SecurityDescriptor,
+RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls,
unsigned char *Endpoint, LPVOID SecurityDescriptor,
                                             PRPC_POLICY lpPolicy )
 {
   RpcServerProtseq* ps;
@@ -753,7 +753,7 @@
 /***********************************************************************
  *             RpcServerUseProtseqEpExW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWSTR
Endpoint, LPVOID SecurityDescriptor,
+RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWSTR
Endpoint, LPVOID SecurityDescriptor,
                                             PRPC_POLICY lpPolicy )
 {
   RpcServerProtseq* ps;
@@ -773,7 +773,7 @@
 /***********************************************************************
  *             RpcServerUseProtseqA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls,
void *SecurityDescriptor)
+RPC_STATUS RPC_ENTRY RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls,
void *SecurityDescriptor)
 {
   TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n",
debugstr_a((char*)Protseq), MaxCalls, SecurityDescriptor);
   return RpcServerUseProtseqEpA(Protseq, MaxCalls, NULL, SecurityDescriptor);
@@ -782,7 +782,7 @@
 /***********************************************************************
  *             RpcServerUseProtseqW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUseProtseqW(LPWSTR Protseq, unsigned int MaxCalls, void
*SecurityDescriptor)
+RPC_STATUS RPC_ENTRY RpcServerUseProtseqW(LPWSTR Protseq, unsigned int MaxCalls, void
*SecurityDescriptor)
 {
   TRACE("Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n",
debugstr_w(Protseq), MaxCalls, SecurityDescriptor);
   return RpcServerUseProtseqEpW(Protseq, MaxCalls, NULL, SecurityDescriptor);
@@ -791,7 +791,7 @@
 /***********************************************************************
  *             RpcServerRegisterIf (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
RPC_MGR_EPV* MgrEpv )
+RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
RPC_MGR_EPV* MgrEpv )
 {
   TRACE("(%p,%s,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv);
   return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, 0,
RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL );
@@ -800,7 +800,7 @@
 /***********************************************************************
  *             RpcServerRegisterIfEx (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
RPC_MGR_EPV* MgrEpv,
+RPC_STATUS RPC_ENTRY RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
RPC_MGR_EPV* MgrEpv,
                        UINT Flags, UINT MaxCalls, RPC_IF_CALLBACK_FN* IfCallbackFn )
 {
   TRACE("(%p,%s,%p,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv,
Flags, MaxCalls, IfCallbackFn);
@@ -810,7 +810,7 @@
 /***********************************************************************
  *             RpcServerRegisterIf2 (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
RPC_MGR_EPV* MgrEpv,
+RPC_STATUS RPC_ENTRY RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
RPC_MGR_EPV* MgrEpv,
                       UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN*
IfCallbackFn )
 {
   PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec;
@@ -870,7 +870,7 @@
 /***********************************************************************
  *             RpcServerUnregisterIf (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, UINT
WaitForCallsToComplete )
+RPC_STATUS RPC_ENTRY RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, UINT
WaitForCallsToComplete )
 {
   FIXME("(IfSpec == (RPC_IF_HANDLE)^%p, MgrTypeUuid == %s, WaitForCallsToComplete ==
%u): stub\n",
     IfSpec, debugstr_guid(MgrTypeUuid), WaitForCallsToComplete);
@@ -881,7 +881,7 @@
 /***********************************************************************
  *             RpcServerUnregisterIfEx (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerUnregisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, int
RundownContextHandles )
+RPC_STATUS RPC_ENTRY RpcServerUnregisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
int RundownContextHandles )
 {
   FIXME("(IfSpec == (RPC_IF_HANDLE)^%p, MgrTypeUuid == %s, RundownContextHandles ==
%d): stub\n",
     IfSpec, debugstr_guid(MgrTypeUuid), RundownContextHandles);
@@ -909,7 +909,7 @@
  * types.  There's no need to call this if a server only supports the nil
  * type, as is typical.
  */
-RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid )
+RPC_STATUS RPC_ENTRY RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid )
 {
   RpcObjTypeMap *map = RpcObjTypeMaps, *prev = NULL;
   RPC_STATUS dummy;
@@ -956,7 +956,7 @@
 /***********************************************************************
  *             RpcServerRegisterAuthInfoA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned
long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
+RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned
long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
                             LPVOID Arg )
 {
   FIXME( "(%s,%lu,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg );
@@ -967,7 +967,7 @@
 /***********************************************************************
  *             RpcServerRegisterAuthInfoW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long
AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
+RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long
AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
                             LPVOID Arg )
 {
   FIXME( "(%s,%lu,%p,%p): stub\n", debugstr_w( ServerPrincName ), AuthnSvc,
GetKeyFn, Arg );
@@ -978,7 +978,7 @@
 /***********************************************************************
  *             RpcServerListen (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT DontWait
)
+RPC_STATUS RPC_ENTRY RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT
DontWait )
 {
   RPC_STATUS status;
 
@@ -1000,7 +1000,7 @@
 /***********************************************************************
  *             RpcMgmtServerWaitListen (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcMgmtWaitServerListen( void )
+RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void )
 {
   TRACE("()\n");
 
@@ -1019,7 +1019,7 @@
 /***********************************************************************
  *             RpcMgmtStopServerListening (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding )
+RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding )
 {
   TRACE("(Binding == (RPC_BINDING_HANDLE)^%p)\n", Binding);
 
@@ -1036,7 +1036,7 @@
 /***********************************************************************
  *             I_RpcServerStartListening (RPCRT4.@)
  */
-RPC_STATUS WINAPI I_RpcServerStartListening( HWND hWnd )
+RPC_STATUS RPC_ENTRY I_RpcServerStartListening( HWND hWnd )
 {
   FIXME( "(%p): stub\n", hWnd );
 
@@ -1046,7 +1046,7 @@
 /***********************************************************************
  *             I_RpcServerStopListening (RPCRT4.@)
  */
-RPC_STATUS WINAPI I_RpcServerStopListening( void )
+RPC_STATUS RPC_ENTRY I_RpcServerStopListening( void )
 {
   FIXME( "(): stub\n" );
 
@@ -1056,7 +1056,7 @@
 /***********************************************************************
  *             I_RpcWindowProc (RPCRT4.@)
  */
-UINT WINAPI I_RpcWindowProc( void *hWnd, UINT Message, UINT wParam, ULONG lParam )
+UINT RPC_ENTRY I_RpcWindowProc( void *hWnd, UINT Message, UINT wParam, ULONG lParam )
 {
   FIXME( "(%p,%08x,%08x,%08lx): stub\n", hWnd, Message, wParam, lParam );
 

Modified: branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpcrt4…
==============================================================================
--- branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c (original)
+++ branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c Fri Jun 29 15:43:18 2007
@@ -172,7 +172,7 @@
  *
  *  S_OK if successful.
  */
-RPC_STATUS WINAPI RpcStringFreeA(unsigned char** String)
+RPC_STATUS RPC_ENTRY RpcStringFreeA(unsigned char** String)
 {
   HeapFree( GetProcessHeap(), 0, *String);
 
@@ -188,7 +188,7 @@
  *
  *  S_OK if successful.
  */
-RPC_STATUS WINAPI RpcStringFreeW(unsigned short** String)
+RPC_STATUS RPC_ENTRY RpcStringFreeW(unsigned short** String)
 {
   HeapFree( GetProcessHeap(), 0, *String);
 
@@ -200,7 +200,7 @@
  *
  * Raises an exception.
  */
-void WINAPI RpcRaiseException(RPC_STATUS exception)
+void RPC_ENTRY RpcRaiseException(RPC_STATUS exception)
 {
   /* FIXME: translate exception? */
   RaiseException(exception, 0, 0, NULL);
@@ -219,7 +219,7 @@
  *     0  if Uuid1 and Uuid2 are equal
  *     1  if Uuid1 is greater than Uuid2
  */
-int WINAPI UuidCompare(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status)
+int RPC_ENTRY UuidCompare(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status)
 {
   int i;
 
@@ -262,7 +262,7 @@
  * RETURNS
  *     TRUE/FALSE
  */
-int WINAPI UuidEqual(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status)
+int RPC_ENTRY UuidEqual(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status)
 {
   TRACE("(%s,%s)\n", debugstr_guid(Uuid1), debugstr_guid(Uuid2));
   return !UuidCompare(Uuid1, Uuid2, Status);
@@ -278,7 +278,7 @@
  * RETURNS
  *     TRUE/FALSE
  */
-int WINAPI UuidIsNil(UUID *Uuid, RPC_STATUS *Status)
+int RPC_ENTRY UuidIsNil(UUID *Uuid, RPC_STATUS *Status)
 {
   TRACE("(%s)\n", debugstr_guid(Uuid));
   if (!Uuid) return TRUE;
@@ -294,7 +294,7 @@
  * RETURNS
  *     RPC_S_OK
  */
-RPC_STATUS WINAPI UuidCreateNil(UUID *Uuid)
+RPC_STATUS RPC_ENTRY UuidCreateNil(UUID *Uuid)
 {
   *Uuid = uuid_nil;
   return RPC_S_OK;
@@ -391,7 +391,7 @@
  *         suggests using NVRAM for storing persistent 
  *         values.
  */
-RPC_STATUS WINAPI UuidCreate(UUID *Uuid)
+RPC_STATUS RPC_ENTRY UuidCreate(UUID *Uuid)
 {
     static int initialised, count;
 
@@ -475,7 +475,7 @@
  *  RPC_S_UUID_LOCAL_ONLY if UUID is only locally unique.
  *
  */
-RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid)
+RPC_STATUS RPC_ENTRY UuidCreateSequential(UUID *Uuid)
 {
    return UuidCreate(Uuid);
 }
@@ -489,7 +489,7 @@
  * Code based on FreeDCE implementation
  *
  */
-unsigned short WINAPI UuidHash(UUID *uuid, RPC_STATUS *Status)
+unsigned short RPC_ENTRY UuidHash(UUID *uuid, RPC_STATUS *Status)
 {
   BYTE *data = (BYTE*)uuid;
   short c0 = 0, c1 = 0, x, y;
@@ -527,7 +527,7 @@
  *  S_OK if successful.
  *  S_OUT_OF_MEMORY if unsucessful.
  */
-RPC_STATUS WINAPI UuidToStringA(UUID *Uuid, unsigned char** StringUuid)
+RPC_STATUS RPC_ENTRY UuidToStringA(UUID *Uuid, unsigned char** StringUuid)
 {
   *StringUuid = HeapAlloc( GetProcessHeap(), 0, sizeof(char) * 37);
 
@@ -553,7 +553,7 @@
  *  S_OK if successful.
  *  S_OUT_OF_MEMORY if unsucessful.
  */
-RPC_STATUS WINAPI UuidToStringW(UUID *Uuid, unsigned short** StringUuid)
+RPC_STATUS RPC_ENTRY UuidToStringW(UUID *Uuid, unsigned short** StringUuid)
 {
   char buf[37];
 
@@ -587,7 +587,7 @@
 /***********************************************************************
  *		UuidFromStringA (RPCRT4.@)
  */
-RPC_STATUS WINAPI UuidFromStringA(unsigned char* s, UUID *uuid)
+RPC_STATUS RPC_ENTRY UuidFromStringA(unsigned char* s, UUID *uuid)
 {
     int i;
 
@@ -627,7 +627,7 @@
 /***********************************************************************
  *		UuidFromStringW (RPCRT4.@)
  */
-RPC_STATUS WINAPI UuidFromStringW(unsigned short* s, UUID *uuid)
+RPC_STATUS RPC_ENTRY UuidFromStringW(unsigned short* s, UUID *uuid)
 {
     int i;