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

Timestamp:

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

Author:

sandervl

Message:

Updated Wine headers

File:

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

trunk/include/win/wine/obj_inplace.h

@@ -1 @@
-/* $Id: obj_inplace.h,v 1.3 1999-06-10 16:21:54 achimha Exp $ */
 /*
  * Defines the COM interfaces and APIs related to structured data storage.
@@ -13 +12 @@
 #include "winuser.h"
 #include "wine/obj_moniker.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* defined(__cplusplus) */
 
 /*****************************************************************************
@@ -95 +98 @@
 } BINDSPEED;
 
+typedef enum tagOLECONTF
+{
+        OLECONTF_EMBEDDINGS = 1,
+        OLECONTF_LINKS = 2,
+        OLECONTF_OTHERS = 4,
+        OLECONTF_OLNYUSER = 8,
+        OLECONTF_ONLYIFRUNNING = 16
+} OLECONTF;
+ 
 typedef HGLOBAL HOLEMENU;
 typedef LPRECT LPBORDERWIDTHS;
@@ -421 +433 @@
 #define ICOM_INTERFACE IOleItemContainer
 #define IOleItemContainer_METHODS \
-        ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void*,ppvObject) \
-        ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR,pszItem, IBindCtx*,pbc, REFIID,riid, void*,ppvStorage) \
+        ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void**,ppvObject) \
+        ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR,pszItem, IBindCtx*,pbc, REFIID,riid, void**,ppvStorage) \
         ICOM_METHOD1(HRESULT,IsRunning, LPOLESTR,pszItem)
 #define IOleItemContainer_IMETHODS \
@@ -483 +495 @@
 #endif
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
 
 #endif /* __WINE_WINE_OBJ_INPLACE_H */