Changeset 640 for trunk/include/win/wine/obj_dataobject.h

Timestamp:

Aug 23, 1999, 12:52:05 AM (26 years ago)

Author:

sandervl

Message:

Updated Wine headers

File:

• trunk/include/win/wine/obj_dataobject.h (modified) (5 diffs)

trunk/include/win/wine/obj_dataobject.h

@@ -1 @@
-/* $Id: obj_dataobject.h,v 1.3 1999-06-10 16:21:54 achimha Exp $ */
 /*
  * Defines the COM interfaces and APIs related to IDataObject.
@@ -9 +8 @@
 #define __WINE_WINE_OBJ_DATAOBJECT_H
 
+#if defined(__cplusplus) && !defined(NONAMELESSUNION)
+#define DUMMYUNIONNAME
+#else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
+#define DUMMYUNIONNAME u
+#endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
+
 #ifdef __cplusplus
-#define DUMMY_UNION_NAME
-#else
-#define DUMMY_UNION_NAME u
-#endif
+extern "C" {
+#endif /* defined(__cplusplus) */
 
 /*****************************************************************************
@@ -98 +101 @@
 } TYMED;
   
+typedef struct tagRemSTGMEDIUM
+{
+        DWORD tymed;
+        DWORD dwHandleType;
+        unsigned long pData;
+        unsigned long pUnkForRelease;
+        unsigned long cbData;
+        byte data[1];
+} RemSTGMEDIUM;
+
 /* dataobject as answer to a request */
 struct STGMEDIUM
@@ -110 +123 @@
         IStream *pstm;
         IStorage *pstg;
-    } DUMMY_UNION_NAME;
+    } DUMMYUNIONNAME;
     IUnknown *pUnkForRelease;
 };   
@@ -323 +336 @@
 HRESULT WINAPI CreateDataCache(LPUNKNOWN pUnkOuter, REFCLSID rclsid, REFIID iid, LPVOID* ppv);
 
+#ifdef __cplusplus
+} /* extern "C"  */
+#endif /* defined(__cplusplus) */
 
 #endif /* __WINE_WINE_OBJ_DATAOBJECT_H */