Changeset 4833 for trunk/include/win/wine/obj_connection.h

Timestamp:

Dec 24, 2000, 12:23:57 PM (25 years ago)

Author:

sandervl

Message:

update

File:

• trunk/include/win/wine/obj_connection.h (modified) (10 diffs)

trunk/include/win/wine/obj_connection.h

@@ -1 @@
-/* $Id: obj_connection.h,v 1.5 1999-08-22 22:52:06 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs related to structured data storage.
@@ -8 +7 @@
 #ifndef __WINE_WINE_OBJ_CONNECTION_H
 #define __WINE_WINE_OBJ_CONNECTION_H
-
-
-#include "winbase.h"
 
 #ifdef __cplusplus
@@ -57 +53 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknwon methods ***/
 #define IConnectionPoint_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
@@ -68 +63 @@
 #define IConnectionPoint_Unadvise(p,a)                    ICOM_CALL1(Unadvise,p,a)
 #define IConnectionPoint_EnumConnections(p,a)             ICOM_CALL1(EnumConnections,p,a)
-#endif
 
 
@@ -84 +78 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknwon methods ***/
 #define IConnectionPointContainer_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
@@ -90 +83 @@
 #define IConnectionPointContainer_Release(p)                 ICOM_CALL (Release,p)
 /*** IConnectionPointContainer methods ***/
-#define IConnectionPointContainer_EnumConnectionPoints(p,a)  ICOM_CALL1(CreateInstance,p,a)
-#define IConnectionPointContainer_FindConnectionPoint(p,a,b) ICOM_CALL2(LockServer,p,a,b)
-#endif
+#define IConnectionPointContainer_EnumConnectionPoints(p,a)  ICOM_CALL1(EnumConnectionPoints,p,a)
+#define IConnectionPointContainer_FindConnectionPoint(p,a,b) ICOM_CALL2(FindConnectionPoint,p,a,b)
 
 
@@ -110 +102 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknwon methods ***/
 #define IEnumConnections_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
@@ -120 +111 @@
 #define IEnumConnections_Reset(p)                   ICOM_CALL (Reset,p)
 #define IEnumConnections_Clone(p,a)                 ICOM_CALL1(Clone,p,a)
-#endif
 
 /*****************************************************************************
@@ -137 +127 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknwon methods ***/
 #define IEnumConnectionPoints_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
@@ -147 +136 @@
 #define IEnumConnectionPoints_Reset(p)                   ICOM_CALL (Reset,p)
 #define IEnumConnectionPoints_Clone(p,a)                 ICOM_CALL1(Clone,p,a)
-#endif
                                 
 #ifdef __cplusplus