ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Rename StorageImpl_DestroyElement to StorageBaseImpl_DestroyElement.

This commit is contained in:
Vincent Povirk 2009-10-28 14:53:30 -05:00 committed by Alexandre Julliard
parent c4aed16590
commit fd2f35a872
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/ole32/storage32.c
View File

@ -160,12 +160,12 @@ typedef struct
* Forward declaration of internal functions used by the method DestroyElement * Forward declaration of internal functions used by the method DestroyElement
*/ */
static HRESULT deleteStorageProperty( static HRESULT deleteStorageProperty(
StorageImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG foundPropertyIndexToDelete, ULONG foundPropertyIndexToDelete,
StgProperty propertyToDelete); StgProperty propertyToDelete);
static HRESULT deleteStreamProperty( static HRESULT deleteStreamProperty(
StorageImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG foundPropertyIndexToDelete, ULONG foundPropertyIndexToDelete,
StgProperty propertyToDelete); StgProperty propertyToDelete);
@ -1745,11 +1745,11 @@ static HRESULT WINAPI StorageImpl_Revert(
* enumeration strategy that would give all the leaves of a storage * enumeration strategy that would give all the leaves of a storage
* first. (postfix order) * first. (postfix order)
*/ */
static HRESULT WINAPI StorageImpl_DestroyElement( static HRESULT WINAPI StorageBaseImpl_DestroyElement(
IStorage* iface, IStorage* iface,
const OLECHAR *pwcsName)/* [string][in] */ const OLECHAR *pwcsName)/* [string][in] */
{ {
StorageImpl* const This=(StorageImpl*)iface; StorageBaseImpl* const This=(StorageBaseImpl*)iface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
StgProperty propertyToDelete; StgProperty propertyToDelete;
@ -1761,12 +1761,12 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
if (pwcsName==NULL) if (pwcsName==NULL)
return STG_E_INVALIDPOINTER; 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; return STG_E_ACCESSDENIED;
foundPropertyIndexToDelete = findElement( foundPropertyIndexToDelete = findElement(
This->base.ancestorStorage, This->ancestorStorage,
This->base.rootPropertySetIndex, This->rootPropertySetIndex,
pwcsName, pwcsName,
&propertyToDelete); &propertyToDelete);
@ -1797,8 +1797,8 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
* Adjust the property chain * Adjust the property chain
*/ */
hr = removeFromTree( hr = removeFromTree(
This->base.ancestorStorage, This->ancestorStorage,
This->base.rootPropertySetIndex, This->rootPropertySetIndex,
foundPropertyIndexToDelete); foundPropertyIndexToDelete);
/* /*
@ -1806,7 +1806,7 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
*/ */
propertyToDelete.sizeOfNameString = 0; propertyToDelete.sizeOfNameString = 0;
StorageImpl_WriteProperty(This->base.ancestorStorage, StorageImpl_WriteProperty(This->ancestorStorage,
foundPropertyIndexToDelete, foundPropertyIndexToDelete,
&propertyToDelete); &propertyToDelete);
@ -1876,7 +1876,7 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg)
* *
*/ */
static HRESULT deleteStorageProperty( static HRESULT deleteStorageProperty(
StorageImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG indexOfPropertyToDelete, ULONG indexOfPropertyToDelete,
StgProperty propertyToDelete) StgProperty propertyToDelete)
{ {
@ -1916,7 +1916,7 @@ static HRESULT deleteStorageProperty(
hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL); hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL);
if (hr==S_OK) if (hr==S_OK)
{ {
destroyHr = StorageImpl_DestroyElement(childStorage, currentElement.pwcsName); destroyHr = IStorage_DestroyElement(childStorage, currentElement.pwcsName);
CoTaskMemFree(currentElement.pwcsName); CoTaskMemFree(currentElement.pwcsName);
} }
@ -1943,7 +1943,7 @@ static HRESULT deleteStorageProperty(
* *
*/ */
static HRESULT deleteStreamProperty( static HRESULT deleteStreamProperty(
StorageImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG indexOfPropertyToDelete, ULONG indexOfPropertyToDelete,
StgProperty propertyToDelete) StgProperty propertyToDelete)
{ {
@ -2146,7 +2146,7 @@ static const IStorageVtbl Storage32Impl_Vtbl =
StorageImpl_Commit, StorageImpl_Commit,
StorageImpl_Revert, StorageImpl_Revert,
StorageBaseImpl_EnumElements, StorageBaseImpl_EnumElements,
StorageImpl_DestroyElement, StorageBaseImpl_DestroyElement,
StorageBaseImpl_RenameElement, StorageBaseImpl_RenameElement,
StorageImpl_SetElementTimes, StorageImpl_SetElementTimes,
StorageBaseImpl_SetClass, StorageBaseImpl_SetClass,
@ -3954,7 +3954,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl =
StorageInternalImpl_Commit, StorageInternalImpl_Commit,
StorageInternalImpl_Revert, StorageInternalImpl_Revert,
StorageBaseImpl_EnumElements, StorageBaseImpl_EnumElements,
StorageImpl_DestroyElement, StorageBaseImpl_DestroyElement,
StorageBaseImpl_RenameElement, StorageBaseImpl_RenameElement,
StorageImpl_SetElementTimes, StorageImpl_SetElementTimes,
StorageBaseImpl_SetClass, StorageBaseImpl_SetClass,