ole32: COM cleanup for IStorage interface of base storage implementation.

dlls/ole32/stg_prop.c

@@ -2321,7 +2321,7 @@ static HRESULT create_EnumSTATPROPSETSTG(
     StorageImpl *This,
     IEnumSTATPROPSETSTG** ppenum)
 {
-    IStorage *stg = (IStorage*) &This->base.lpVtbl;
+    IStorage *stg = &This->base.IStorage_iface;
     IEnumSTATSTG *penum = NULL;
     STATSTG stat;
     ULONG count;

dlls/ole32/storage32.h

@@ -165,20 +165,19 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName
 
 
 /****************************************************************************
- * Storage32BaseImpl definitions.
+ * StorageBaseImpl definitions.
  *
  * This structure defines the base information contained in all implementations
- * of IStorage32 contained in this file storage implementation.
+ * of IStorage contained in this file storage implementation.
  *
- * In OOP terms, this is the base class for all the IStorage32 implementations
+ * In OOP terms, this is the base class for all the IStorage implementations
  * contained in this file.
  */
 struct StorageBaseImpl
 {
-  const IStorageVtbl *lpVtbl;    /* Needs to be the first item in the struct
-			    * since we want to cast this in a Storage32 pointer */
-
+  IStorage IStorage_iface;
   const IPropertySetStorageVtbl *pssVtbl; /* interface for adding a properties stream */
+  LONG ref;
 
   /*
    * Stream tracking list
@@ -192,11 +191,6 @@ struct StorageBaseImpl
   struct list storageHead;
 
   /*
-   * Reference count of this object
-   */
-  LONG ref;
-
-  /*
    * TRUE if this object has been invalidated
    */
   int reverted;