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

ole32: Rename deleteSt*Property to deleteSt*Contents. 

We now only delete the node contents in these functions.
This commit is contained in:
Vincent Povirk 2009-11-12 13:46:04 -06:00 committed by Alexandre Julliard
parent 390e2711f6
commit 14647d7ca9
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/ole32/storage32.c
View File

@ -159,15 +159,15 @@ 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 deleteStorageContents(
StorageBaseImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG foundPropertyIndexToDelete, ULONG indexToDelete,
DirEntry propertyToDelete); DirEntry entryDataToDelete);
static HRESULT deleteStreamProperty( static HRESULT deleteStreamContents(
StorageBaseImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG foundPropertyIndexToDelete, ULONG indexToDelete,
DirEntry propertyToDelete); DirEntry entryDataToDelete);
static HRESULT removeFromTree( static HRESULT removeFromTree(
StorageImpl *This, StorageImpl *This,
@ -1746,14 +1746,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
if ( propertyToDelete.stgType == STGTY_STORAGE ) if ( propertyToDelete.stgType == STGTY_STORAGE )
{ {
hr = deleteStorageProperty( hr = deleteStorageContents(
This, This,
foundPropertyIndexToDelete, foundPropertyIndexToDelete,
propertyToDelete); propertyToDelete);
} }
else if ( propertyToDelete.stgType == STGTY_STREAM ) else if ( propertyToDelete.stgType == STGTY_STREAM )
{ {
hr = deleteStreamProperty( hr = deleteStreamContents(
This, This,
foundPropertyIndexToDelete, foundPropertyIndexToDelete,
propertyToDelete); propertyToDelete);
@ -1839,13 +1839,13 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg)
* *
* Internal Method * Internal Method
* *
* Perform the deletion of a complete storage node * Delete the contents of a storage entry.
* *
*/ */
static HRESULT deleteStorageProperty( static HRESULT deleteStorageContents(
StorageBaseImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG indexOfPropertyToDelete, ULONG indexToDelete,
DirEntry propertyToDelete) DirEntry entryDataToDelete)
{ {
IEnumSTATSTG *elements = 0; IEnumSTATSTG *elements = 0;
IStorage *childStorage = 0; IStorage *childStorage = 0;
@ -1858,7 +1858,7 @@ static HRESULT deleteStorageProperty(
*/ */
hr = StorageBaseImpl_OpenStorage( hr = StorageBaseImpl_OpenStorage(
(IStorage*)parentStorage, (IStorage*)parentStorage,
propertyToDelete.name, entryDataToDelete.name,
0, 0,
STGM_WRITE | STGM_SHARE_EXCLUSIVE, STGM_WRITE | STGM_SHARE_EXCLUSIVE,
0, 0,
@ -1906,13 +1906,13 @@ static HRESULT deleteStorageProperty(
* *
* Internal Method * Internal Method
* *
* Perform the deletion of a stream node * Perform the deletion of a stream's data
* *
*/ */
static HRESULT deleteStreamProperty( static HRESULT deleteStreamContents(
StorageBaseImpl *parentStorage, StorageBaseImpl *parentStorage,
ULONG indexOfPropertyToDelete, ULONG indexToDelete,
DirEntry propertyToDelete) DirEntry entryDataToDelete)
{ {
IStream *pis; IStream *pis;
HRESULT hr; HRESULT hr;
@ -1922,7 +1922,7 @@ static HRESULT deleteStreamProperty(
size.u.LowPart = 0; size.u.LowPart = 0;
hr = StorageBaseImpl_OpenStream((IStorage*)parentStorage, hr = StorageBaseImpl_OpenStream((IStorage*)parentStorage,
propertyToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis); entryDataToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis);
if (hr!=S_OK) if (hr!=S_OK)
{ {