[1/5] ole32: Use interface macros to call methods

[Nikolay Sivov]

Use interface macros to call methods
-------------- next part --------------
>From ca6c88c2c7cf4966f25feda9324a7d2aeb3ddba4 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue, 17 Jul 2012 10:15:25 +0400
Subject: [PATCH 2/6] Use interface macros to call methods

---
 dlls/ole32/stg_stream.c |    2 +-
 dlls/ole32/storage32.c  |    8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index 6a39b94..1471162 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -657,7 +657,7 @@ static HRESULT WINAPI StgStreamImpl_Clone(
 
   seek_pos.QuadPart = This->currentPosition.QuadPart;
 
-  hres=StgStreamImpl_Seek (*ppstm, seek_pos, STREAM_SEEK_SET, NULL);
+  hres = IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL);
 
   assert (SUCCEEDED(hres));
 
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index a1c925f..30d380b 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2152,7 +2152,7 @@ static HRESULT deleteStreamContents(
   size.u.HighPart = 0;
   size.u.LowPart = 0;
 
-  hr = StorageBaseImpl_OpenStream(&parentStorage->IStorage_iface,
+  hr = IStorage_OpenStream(&parentStorage->IStorage_iface,
         entryDataToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis);
 
   if (hr!=S_OK)
@@ -4798,14 +4798,10 @@ static void TransactedSnapshotImpl_Destroy( StorageBaseImpl *iface)
 {
   TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface;
 
-  TransactedSnapshotImpl_Revert(&This->base.IStorage_iface);
-
+  IStorage_Revert(&This->base.IStorage_iface);
   IStorage_Release(&This->transactedParent->IStorage_iface);
-
   IStorage_Release(&This->scratch->IStorage_iface);
-
   HeapFree(GetProcessHeap(), 0, This->entries);
-
   HeapFree(GetProcessHeap(), 0, This);
 }
 
-- 
1.5.6.5