system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-02 09:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

ole32: Remove directory entries from the tree before we free them.

Browse source 
The directory entry should still be valid as long as it's in the tree.
This commit is contained in:
Vincent Povirk 2009-10-28 14:06:23 -05:00 committed by Alexandre Julliard
parent 07b735682b
commit fd993b7d9d
1 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dlls/ole32/storage32.c
View file

@ -1817,6 +1817,15 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
parentPropertyId,
typeOfRelation);
/*
* Invalidate the property by zeroing its name member.
*/
propertyToDelete.sizeOfNameString = 0;
StorageImpl_WriteProperty(This->base.ancestorStorage,
foundPropertyIndexToDelete,
&propertyToDelete);
return hr;
}
@ -1936,15 +1945,6 @@ static HRESULT deleteStorageProperty(
} while ((hr == S_OK) && (destroyHr == S_OK));
/*
* Invalidate the property by zeroing its name member.
*/
propertyToDelete.sizeOfNameString = 0;
StorageImpl_WriteProperty(parentStorage->base.ancestorStorage,
indexOfPropertyToDelete,
&propertyToDelete);
IStorage_Release(childStorage);
IEnumSTATSTG_Release(elements);
@ -1993,20 +1993,6 @@ static HRESULT deleteStreamProperty(
*/
IStream_Release(pis);
/*
* Invalidate the property by zeroing its name member.
*/
propertyToDelete.sizeOfNameString = 0;
/*
* Here we should re-read the property so we get the updated pointer
* but since we are here to zap it, I don't do it...
*/
StorageImpl_WriteProperty(
parentStorage->base.ancestorStorage,
indexOfPropertyToDelete,
&propertyToDelete);
return S_OK;
}