Changeset 7912 for trunk/include/win

Timestamp:

Feb 15, 2002, 3:17:06 PM (24 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win/wine

Files:

• obj_base.h (modified) (1 diff)
• obj_channel.h (modified) (14 diffs)

trunk/include/win/wine/obj_base.h

@@ -741 +741 @@
 #define ICOM_CTHIS(impl,iface)         const impl* const This=(const impl*)iface
 
+#define ICOM_THIS_MULTI(impl,field,iface)  impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
+#define ICOM_CTHIS_MULTI(impl,field,iface) const impl* const This=(const impl*)((char*)(iface) - offsetof(impl,field))
+
 #endif
 

trunk/include/win/wine/obj_channel.h

@@ -1 @@
-/* $Id: obj_channel.h,v 1.5 1999-08-22 22:52:06 sandervl Exp $ */
 /*
  * Defines undocumented Microsoft COM interfaces and APIs seemingly related to some 'channel' notion.
@@ -6 +5 @@
 #ifndef __WINE_WINE_OBJ_CHANNEL_H
 #define __WINE_WINE_OBJ_CHANNEL_H
-
-#include "wine/obj_base.h"
 
 #ifdef __cplusplus
@@ -32 +29 @@
 
 
+DEFINE_GUID   (CLSID_PSFactoryBuffer,   0x00000320L, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
+
+
 /*****************************************************************************
  * IChannelHook interface
@@ -49 +49 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IChannelHook_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -61 +60 @@
 #define IChannelHook_ServerGetSize(p,a,b,c,d)      ICOM_CALL(ServerGetSize,p,a,b,c,d)
 #define IChannelHook_ServerFillBuffer(p,a,b,c,d,e) ICOM_CALL(ServerFillBuffer,p,a,b,c,d,e)
-#endif
 
 
@@ -77 +75 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IPSFactoryBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -85 +82 @@
 #define IPSFactoryBuffer_CreateProxy(p,a,b,c,d) ICOM_CALL4(CreateProxy,p,a,b,c,d)
 #define IPSFactoryBuffer_CreateStub(p,a,b,c)    ICOM_CALL3(CreateStub,p,a,b,c)
-#endif
 
 
@@ -117 +113 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IRpcChannelBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -128 +123 @@
 #define IRpcChannelBuffer_GetDestCtx(p,a,b)  ICOM_CALL2(GetDestCtx,p,a,b)
 #define IRpcChannelBuffer_IsConnected(p)     ICOM_CALL (IsConnected,p)
-#endif
 
 
@@ -144 +138 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IRpcProxyBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -150 +143 @@
 #define IRpcProxyBuffer_Release(p)            ICOM_CALL (Release,p)
 /*** IRpcProxyBuffer methods ***/
-#define IRpcProxyBuffer_Connect(p,a)  ICOM_CALL2(Connect,p,a)
+#define IRpcProxyBuffer_Connect(p,a)  ICOM_CALL1(Connect,p,a)
 #define IRpcProxyBuffer_Disconnect(p) ICOM_CALL (Disconnect,p)
-#endif
 
 
@@ -163 +155 @@
     ICOM_VMETHOD (                Disconnect) \
     ICOM_METHOD2 (HRESULT,        Invoke,                    RPCOLEMESSAGE*,_prpcmsg, IRpcChannelBuffer*,_pRpcChannelBuffer) \
-    ICOM_METHOD1 (IRpcStubBuffer*,IsIIDSupported,            REFIID,riid) \
+    ICOM_METHOD1 (LPRPCSTUBBUFFER,IsIIDSupported,            REFIID,riid) \
     ICOM_METHOD  (ULONG,          CountRefs) \
     ICOM_METHOD1 (HRESULT,        DebugServerQueryInterface, void**,ppv) \
@@ -173 +165 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IRpcStubBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -186 +177 @@
 #define IRpcStubBuffer_DebugServerQueryInterface(p,a) ICOM_CALL1(DebugServerQueryInterface,p,a)
 #define IRpcStubBuffer_DebugServerRelease(p,a)        ICOM_CALL1(DebugServerRelease,p,a)
-#endif
 
 #ifdef __cplusplus