Commit fd993b7d authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

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

The directory entry should still be valid as long as it's in the tree.
parent 07b73568
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment