Changeset 7925 for trunk/include/win/wine/obj_marshal.h

Timestamp:

Feb 15, 2002, 6:16:36 PM (24 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/wine/obj_marshal.h (modified) (7 diffs)

trunk/include/win/wine/obj_marshal.h

@@ -1 @@
-/* $Id: obj_marshal.h,v 1.5 1999-08-22 22:52:08 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs that allow an interface to 
@@ -7 +6 @@
 #ifndef __WINE_WINE_OBJ_MARSHAL_H
 #define __WINE_WINE_OBJ_MARSHAL_H
-
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 
 #ifdef __cplusplus
@@ -23 +19 @@
 DEFINE_OLEGUID(IID_IStdMarshalInfo,     0x00000018L, 0, 0);
 typedef struct IStdMarshalInfo IStdMarshalInfo,*LPSTDMARSHALINFO;
+
+DEFINE_OLEGUID(CLSID_DfMarshal,         0x0000030BL, 0, 0);
 
 
@@ -42 +40 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IMarshal_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -54 +51 @@
 #define IMarshal_ReleaseMarshalData(p,a)          ICOM_CALL1(ReleaseMarshalData,p,a)
 #define IMarshal_DisconnectObject(p,a)            ICOM_CALL1(DisconnectObject,p,a)
-#endif
 
 
@@ -69 +65 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IStdMarshalInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -76 +71 @@
 /*** IStdMarshalInfo methods ***/
 #define IStdMarshalInfo_GetClassForHandler(p,a,b,c) ICOM_CALL3(GetClassForHandler,p,a,b,c)
-#endif