Changeset 3167 for trunk/src/ole32/oleobj.cpp

Timestamp:

Mar 19, 2000, 4:35:32 PM (25 years ago)

Author:

davidr

Message:

Ported changes from wine/corel sources

File:

• trunk/src/ole32/oleobj.cpp (modified) (6 diffs)

trunk/src/ole32/oleobj.cpp

@@ -1 @@
-/* $Id: oleobj.cpp,v 1.1 1999-09-24 21:49:44 davidr Exp $ */
+/* $Id: oleobj.cpp,v 1.2 2000-03-19 15:33:06 davidr Exp $ */
 /* 
  * OLE2 COM objects
@@ -24 +24 @@
 typedef struct OleAdviseHolderImpl
 {
-  ICOM_VTABLE(IOleAdviseHolder)* lpvtbl;
+  ICOM_VFIELD(IOleAdviseHolder);
 
   DWORD ref;
@@ -75 +75 @@
                                          sizeof(OleAdviseHolderImpl));
   
-  lpoah->lpvtbl = &oahvt;
+  ICOM_VTBL(lpoah) = &oahvt;
   lpoah->ref = 1;
   lpoah->maxSinks = 10;
-  lpoah->arrayOfSinks = (IAdviseSink **)HeapAlloc(GetProcessHeap(),
+  lpoah->arrayOfSinks = (IAdviseSink**)HeapAlloc(GetProcessHeap(),
                                   0,
                                   lpoah->maxSinks * sizeof(IAdviseSink*));
@@ -226 +226 @@
     This->maxSinks+=10;
 
-    This->arrayOfSinks = (IAdviseSink **)HeapReAlloc(GetProcessHeap(), 
+    This->arrayOfSinks = (IAdviseSink**)HeapReAlloc(GetProcessHeap(), 
                                      0,
                                      This->arrayOfSinks,
@@ -348 +348 @@
 typedef struct DataAdviseHolder
 {
-  ICOM_VTABLE(IDataAdviseHolder)* lpvtbl;
+  ICOM_VFIELD(IDataAdviseHolder);
 
   DWORD ref;
@@ -411 +411 @@
                                            sizeof(DataAdviseHolder));
   
-  newHolder->lpvtbl = &DataAdviseHolderImpl_VTable;
+  ICOM_VTBL(newHolder) = &DataAdviseHolderImpl_VTable;
   newHolder->ref = 1;