Sync to Wine-20040914:

Mike McCormack <mike@codeweavers.com>
- Avoid non-standard types in rpcdcep.h.
Alexandre Julliard:
- Get rid of the no longer used ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
  macro.
- Removed some uses of the non-standard ICOM_THIS macro.
Francois Gouget <fgouget@free.fr>
- Fix and unify parsing of calling conventions.
- Hack handling of 'struct { } *NDR_SCONTEXT;' so we don't cause a parse
  error as this is a valid C construct.
- Generate type tests for rpcrt4.
- Remove PRPC_BINDING_VECTOR and PUUID_VECTOR, they don't exist on
  Windows.
- Fix the MIDL_STUB_MESSAGE, MIDL_SERVER_INFO and
  MIDL_STUBLESS_PROXY_INFO structs.
- Add NDR_ALLOC_ALL_NODES_CONTEXT, NDR_POINTER_QUEUE_STATE and
  CS_STUB_INFO.

svn path=/trunk/; revision=10909

reactos/lib/rpcrt4/Makefile.in

@@ -1,4 +1,4 @@
-EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H
+EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H -DMSWMSG
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

reactos/lib/rpcrt4/cproxy.c

@@ -269,7 +269,6 @@ static VOID WINAPI StdProxy_Disconnect(LPRPCPROXYBUFFER iface)
 
 static IRpcProxyBufferVtbl StdProxy_Vtbl =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   StdProxy_QueryInterface,
   StdProxy_AddRef,
   StdProxy_Release,

reactos/lib/rpcrt4/cpsf.c

@@ -55,7 +55,7 @@ static HRESULT WINAPI CStdPSFactory_QueryInterface(LPPSFACTORYBUFFER iface,
                                                   REFIID riid,
                                                   LPVOID *obj)
 {
-  ICOM_THIS(CStdPSFactoryBuffer,iface);
+  CStdPSFactoryBuffer *This = (CStdPSFactoryBuffer *)iface;
   TRACE("(%p)->QueryInterface(%s,%p)\n",iface,debugstr_guid(riid),obj);
   if (IsEqualGUID(&IID_IUnknown,riid) ||
       IsEqualGUID(&IID_IPSFactoryBuffer,riid)) {
@@ -68,14 +68,14 @@ static HRESULT WINAPI CStdPSFactory_QueryInterface(LPPSFACTORYBUFFER iface,
 
 static ULONG WINAPI CStdPSFactory_AddRef(LPPSFACTORYBUFFER iface)
 {
-  ICOM_THIS(CStdPSFactoryBuffer,iface);
+  CStdPSFactoryBuffer *This = (CStdPSFactoryBuffer *)iface;
   TRACE("(%p)->AddRef()\n",iface);
   return ++(This->RefCount);
 }
 
 static ULONG WINAPI CStdPSFactory_Release(LPPSFACTORYBUFFER iface)
 {
-  ICOM_THIS(CStdPSFactoryBuffer,iface);
+  CStdPSFactoryBuffer *This = (CStdPSFactoryBuffer *)iface;
   TRACE("(%p)->Release()\n",iface);
   return --(This->RefCount);
 }
@@ -86,7 +86,7 @@ static HRESULT WINAPI CStdPSFactory_CreateProxy(LPPSFACTORYBUFFER iface,
                                                LPRPCPROXYBUFFER *ppProxy,
                                                LPVOID *ppv)
 {
-  ICOM_THIS(CStdPSFactoryBuffer,iface);
+  CStdPSFactoryBuffer *This = (CStdPSFactoryBuffer *)iface;
   const ProxyFileInfo *ProxyInfo;
   int Index;
   TRACE("(%p)->CreateProxy(%p,%s,%p,%p)\n",iface,pUnkOuter,
@@ -103,7 +103,7 @@ static HRESULT WINAPI CStdPSFactory_CreateStub(LPPSFACTORYBUFFER iface,
                                               LPUNKNOWN pUnkServer,
                                               LPRPCSTUBBUFFER *ppStub)
 {
-  ICOM_THIS(CStdPSFactoryBuffer,iface);
+  CStdPSFactoryBuffer *This = (CStdPSFactoryBuffer *)iface;
   const ProxyFileInfo *ProxyInfo;
   int Index;
   TRACE("(%p)->CreateStub(%s,%p,%p)\n",iface,debugstr_guid(riid),
@@ -116,7 +116,6 @@ static HRESULT WINAPI CStdPSFactory_CreateStub(LPPSFACTORYBUFFER iface,
 
 static IPSFactoryBufferVtbl CStdPSFactory_Vtbl =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   CStdPSFactory_QueryInterface,
   CStdPSFactory_AddRef,
   CStdPSFactory_Release,

reactos/lib/rpcrt4/cstub.c

@@ -72,7 +72,7 @@ HRESULT WINAPI CStdStubBuffer_QueryInterface(LPRPCSTUBBUFFER iface,
                                             REFIID riid,
                                             LPVOID *obj)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj);
 
   if (IsEqualGUID(&IID_IUnknown,riid) ||
@@ -86,7 +86,7 @@ HRESULT WINAPI CStdStubBuffer_QueryInterface(LPRPCSTUBBUFFER iface,
 
 ULONG WINAPI CStdStubBuffer_AddRef(LPRPCSTUBBUFFER iface)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->AddRef()\n",This);
   return ++(This->RefCount);
 }
@@ -94,7 +94,7 @@ ULONG WINAPI CStdStubBuffer_AddRef(LPRPCSTUBBUFFER iface)
 ULONG WINAPI NdrCStdStubBuffer_Release(LPRPCSTUBBUFFER iface,
                                       LPPSFACTORYBUFFER pPSF)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->Release()\n",This);
 
   if (!--(This->RefCount)) {
@@ -111,7 +111,7 @@ ULONG WINAPI NdrCStdStubBuffer_Release(LPRPCSTUBBUFFER iface,
 HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface,
                                      LPUNKNOWN lpUnkServer)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->Connect(%p)\n",This,lpUnkServer);
   This->pvServerObject = lpUnkServer;
   return S_OK;
@@ -119,7 +119,7 @@ HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface,
 
 void WINAPI CStdStubBuffer_Disconnect(LPRPCSTUBBUFFER iface)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->Disconnect()\n",This);
   This->pvServerObject = NULL;
 }
@@ -128,7 +128,7 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface,
                                     PRPCOLEMESSAGE pMsg,
                                     LPRPCCHANNELBUFFER pChannel)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   DWORD dwPhase = STUB_UNMARSHAL;
   TRACE("(%p)->Invoke(%p,%p)\n",This,pMsg,pChannel);
 
@@ -139,14 +139,14 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface,
 LPRPCSTUBBUFFER WINAPI CStdStubBuffer_IsIIDSupported(LPRPCSTUBBUFFER iface,
                                                     REFIID riid)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->IsIIDSupported(%s)\n",This,debugstr_guid(riid));
   return IsEqualGUID(STUB_HEADER(This).piid, riid) ? iface : NULL;
 }
 
 ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->CountRefs()\n",This);
   return This->RefCount;
 }
@@ -154,7 +154,7 @@ ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface)
 HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface(LPRPCSTUBBUFFER iface,
                                                        LPVOID *ppv)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->DebugServerQueryInterface(%p)\n",This,ppv);
   return S_OK;
 }
@@ -162,6 +162,6 @@ HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface(LPRPCSTUBBUFFER iface,
 void WINAPI CStdStubBuffer_DebugServerRelease(LPRPCSTUBBUFFER iface,
                                              LPVOID pv)
 {
-  ICOM_THIS(CStdStubBuffer,iface);
+  CStdStubBuffer *This = (CStdStubBuffer *)iface;
   TRACE("(%p)->DebugServerRelease(%p)\n",This,pv);
 }

reactos/lib/rpcrt4/ndr_midl.c

@@ -178,7 +178,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE
   memset(pRpcMessage, 0, sizeof(RPC_MESSAGE));
 
   /* not everyone allocates stack space for w2kReserved */
-  memset(pStubMsg, 0, sizeof(*pStubMsg) - sizeof(pStubMsg->w2kReserved));
+  memset(pStubMsg, 0, FIELD_OFFSET(MIDL_STUB_MESSAGE,pCSInfo));
 
   pStubMsg->ReuseBuffer = FALSE;
   pStubMsg->IsClient = TRUE;
@@ -202,7 +202,7 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M
   assert( pRpcMsg && pStubMsg && pStubDesc );
 
   /* not everyone allocates stack space for w2kReserved */
-  memset(pStubMsg, 0, sizeof(*pStubMsg) - sizeof(pStubMsg->w2kReserved));
+  memset(pStubMsg, 0, FIELD_OFFSET(MIDL_STUB_MESSAGE,pCSInfo));
 
   pStubMsg->ReuseBuffer = TRUE;
   pStubMsg->IsClient = FALSE;

reactos/lib/rpcrt4/ndr_ole.c

@@ -89,7 +89,7 @@ static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface,
                                               REFIID riid,
                                               LPVOID *obj)
 {
-  ICOM_THIS(RpcStreamImpl, iface);
+  RpcStreamImpl *This = (RpcStreamImpl *)iface;
   if (IsEqualGUID(&IID_IUnknown, riid) ||
       IsEqualGUID(&IID_ISequentialStream, riid) ||
       IsEqualGUID(&IID_IStream, riid)) {
@@ -102,13 +102,13 @@ static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface,
 
 static ULONG WINAPI RpcStream_AddRef(LPSTREAM iface)
 {
-  ICOM_THIS(RpcStreamImpl, iface);
+  RpcStreamImpl *This = (RpcStreamImpl *)iface;
   return ++(This->RefCount);
 }
 
 static ULONG WINAPI RpcStream_Release(LPSTREAM iface)
 {
-  ICOM_THIS(RpcStreamImpl, iface);
+  RpcStreamImpl *This = (RpcStreamImpl *)iface;
   if (!--(This->RefCount)) {
     TRACE("size=%ld\n", *This->size);
     This->pMsg->Buffer = This->data + *This->size;
@@ -123,7 +123,7 @@ static HRESULT WINAPI RpcStream_Read(LPSTREAM iface,
                                     ULONG cb,
                                     ULONG *pcbRead)
 {
-  ICOM_THIS(RpcStreamImpl, iface);
+  RpcStreamImpl *This = (RpcStreamImpl *)iface;
   if (This->pos + cb > *This->size) cb = *This->size - This->pos;
   if (cb) {
     memcpy(pv, This->data + This->pos, cb);
@@ -138,7 +138,7 @@ static HRESULT WINAPI RpcStream_Write(LPSTREAM iface,
                                      ULONG cb,
                                      ULONG *pcbWritten)
 {
-  ICOM_THIS(RpcStreamImpl, iface);
+  RpcStreamImpl *This = (RpcStreamImpl *)iface;
   memcpy(This->data + This->pos, pv, cb);
   This->pos += cb;
   if (This->pos > *This->size) *This->size = This->pos;
@@ -151,7 +151,7 @@ static HRESULT WINAPI RpcStream_Seek(LPSTREAM iface,
                                     DWORD origin,
                                     ULARGE_INTEGER *newPos)
 {
-  ICOM_THIS(RpcStreamImpl, iface);
+  RpcStreamImpl *This = (RpcStreamImpl *)iface;
   switch (origin) {
   case STREAM_SEEK_SET:
     This->pos = move.u.LowPart;
@@ -175,14 +175,13 @@ static HRESULT WINAPI RpcStream_Seek(LPSTREAM iface,
 static HRESULT WINAPI RpcStream_SetSize(LPSTREAM iface,
                                        ULARGE_INTEGER newSize)
 {
-  ICOM_THIS(RpcStreamImpl, iface);
+  RpcStreamImpl *This = (RpcStreamImpl *)iface;
   *This->size = newSize.u.LowPart;
   return S_OK;
 }
 
 static IStreamVtbl RpcStream_Vtbl =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   RpcStream_QueryInterface,
   RpcStream_AddRef,
   RpcStream_Release,

reactos/lib/rpcrt4/rpc_binding.c

@@ -1024,7 +1024,7 @@ RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsign
 /***********************************************************************
  *             RpcBindingToStringBindingW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, LPWSTR* StringBinding )
+RPC_STATUS WINAPI RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, unsigned short** StringBinding )
 {
   RPC_STATUS ret;
   unsigned char *str = NULL;

reactos/lib/rpcrt4/rpc_server.c

@@ -1004,7 +1004,7 @@ RPC_STATUS WINAPI RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding )
 /***********************************************************************
  *             I_RpcServerStartListening (RPCRT4.@)
  */
-RPC_STATUS WINAPI I_RpcServerStartListening( void* hWnd )
+RPC_STATUS WINAPI I_RpcServerStartListening( HWND hWnd )
 {
   FIXME( "(%p): stub\n", hWnd );