Vincent Povirk : ole32: Rename StorageImpl_DestroyElement to StorageBaseImpl_DestroyElement.
Alexandre Julliard
julliard at winehq.org
Tue Nov 3 15:37:20 CST 2009
Module: wine
Branch: master
Commit: fd2f35a8727476853511ca9a0e8fd70ae4307b43
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2f35a8727476853511ca9a0e8fd70ae4307b43
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Wed Oct 28 14:53:30 2009 -0500
ole32: Rename StorageImpl_DestroyElement to StorageBaseImpl_DestroyElement.
---
dlls/ole32/storage32.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index d022ae4..313bad7 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -160,12 +160,12 @@ typedef struct
* Forward declaration of internal functions used by the method DestroyElement
*/
static HRESULT deleteStorageProperty(
- StorageImpl *parentStorage,
+ StorageBaseImpl *parentStorage,
ULONG foundPropertyIndexToDelete,
StgProperty propertyToDelete);
static HRESULT deleteStreamProperty(
- StorageImpl *parentStorage,
+ StorageBaseImpl *parentStorage,
ULONG foundPropertyIndexToDelete,
StgProperty propertyToDelete);
@@ -1745,11 +1745,11 @@ static HRESULT WINAPI StorageImpl_Revert(
* enumeration strategy that would give all the leaves of a storage
* first. (postfix order)
*/
-static HRESULT WINAPI StorageImpl_DestroyElement(
+static HRESULT WINAPI StorageBaseImpl_DestroyElement(
IStorage* iface,
const OLECHAR *pwcsName)/* [string][in] */
{
- StorageImpl* const This=(StorageImpl*)iface;
+ StorageBaseImpl* const This=(StorageBaseImpl*)iface;
HRESULT hr = S_OK;
StgProperty propertyToDelete;
@@ -1761,12 +1761,12 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
if (pwcsName==NULL)
return STG_E_INVALIDPOINTER;
- if ( STGM_ACCESS_MODE( This->base.openFlags ) == STGM_READ )
+ if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ )
return STG_E_ACCESSDENIED;
foundPropertyIndexToDelete = findElement(
- This->base.ancestorStorage,
- This->base.rootPropertySetIndex,
+ This->ancestorStorage,
+ This->rootPropertySetIndex,
pwcsName,
&propertyToDelete);
@@ -1797,8 +1797,8 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
* Adjust the property chain
*/
hr = removeFromTree(
- This->base.ancestorStorage,
- This->base.rootPropertySetIndex,
+ This->ancestorStorage,
+ This->rootPropertySetIndex,
foundPropertyIndexToDelete);
/*
@@ -1806,7 +1806,7 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
*/
propertyToDelete.sizeOfNameString = 0;
- StorageImpl_WriteProperty(This->base.ancestorStorage,
+ StorageImpl_WriteProperty(This->ancestorStorage,
foundPropertyIndexToDelete,
&propertyToDelete);
@@ -1876,7 +1876,7 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg)
*
*/
static HRESULT deleteStorageProperty(
- StorageImpl *parentStorage,
+ StorageBaseImpl *parentStorage,
ULONG indexOfPropertyToDelete,
StgProperty propertyToDelete)
{
@@ -1916,7 +1916,7 @@ static HRESULT deleteStorageProperty(
hr = IEnumSTATSTG_Next(elements, 1, ¤tElement, NULL);
if (hr==S_OK)
{
- destroyHr = StorageImpl_DestroyElement(childStorage, currentElement.pwcsName);
+ destroyHr = IStorage_DestroyElement(childStorage, currentElement.pwcsName);
CoTaskMemFree(currentElement.pwcsName);
}
@@ -1943,7 +1943,7 @@ static HRESULT deleteStorageProperty(
*
*/
static HRESULT deleteStreamProperty(
- StorageImpl *parentStorage,
+ StorageBaseImpl *parentStorage,
ULONG indexOfPropertyToDelete,
StgProperty propertyToDelete)
{
@@ -2146,7 +2146,7 @@ static const IStorageVtbl Storage32Impl_Vtbl =
StorageImpl_Commit,
StorageImpl_Revert,
StorageBaseImpl_EnumElements,
- StorageImpl_DestroyElement,
+ StorageBaseImpl_DestroyElement,
StorageBaseImpl_RenameElement,
StorageImpl_SetElementTimes,
StorageBaseImpl_SetClass,
@@ -3954,7 +3954,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl =
StorageInternalImpl_Commit,
StorageInternalImpl_Revert,
StorageBaseImpl_EnumElements,
- StorageImpl_DestroyElement,
+ StorageBaseImpl_DestroyElement,
StorageBaseImpl_RenameElement,
StorageImpl_SetElementTimes,
StorageBaseImpl_SetClass,
More information about the wine-cvs
mailing list