ole32: Remove the ancestorStorage attribute.
This commit is contained in:
parent
5d39c31bff
commit
8b3ff9d179
|
@ -2459,12 +2459,6 @@ static HRESULT StorageImpl_Construct(
|
||||||
This->base.ref = 1;
|
This->base.ref = 1;
|
||||||
This->base.create = create;
|
This->base.create = create;
|
||||||
|
|
||||||
/*
|
|
||||||
* This is the top-level storage so initialize the ancestor pointer
|
|
||||||
* to this.
|
|
||||||
*/
|
|
||||||
This->base.ancestorStorage = This;
|
|
||||||
|
|
||||||
This->base.reverted = 0;
|
This->base.reverted = 0;
|
||||||
|
|
||||||
This->hFile = hFile;
|
This->hFile = hFile;
|
||||||
|
@ -3822,12 +3816,10 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks(
|
||||||
|
|
||||||
static void StorageInternalImpl_Invalidate( StorageInternalImpl *This )
|
static void StorageInternalImpl_Invalidate( StorageInternalImpl *This )
|
||||||
{
|
{
|
||||||
if (This->base.ancestorStorage)
|
if (!This->base.reverted)
|
||||||
{
|
{
|
||||||
TRACE("Storage invalidated (stg=%p)\n", This);
|
TRACE("Storage invalidated (stg=%p)\n", This);
|
||||||
|
|
||||||
This->base.ancestorStorage = NULL;
|
|
||||||
|
|
||||||
This->base.reverted = 1;
|
This->base.reverted = 1;
|
||||||
|
|
||||||
This->parentStorage = NULL;
|
This->parentStorage = NULL;
|
||||||
|
@ -4388,11 +4380,6 @@ static StorageInternalImpl* StorageInternalImpl_Construct(
|
||||||
newStorage->base.baseVtbl = &StorageInternalImpl_BaseVtbl;
|
newStorage->base.baseVtbl = &StorageInternalImpl_BaseVtbl;
|
||||||
newStorage->base.openFlags = (openFlags & ~STGM_CREATE);
|
newStorage->base.openFlags = (openFlags & ~STGM_CREATE);
|
||||||
|
|
||||||
/*
|
|
||||||
* Keep the ancestor storage pointer but do not nail a reference to it.
|
|
||||||
*/
|
|
||||||
newStorage->base.ancestorStorage = parentStorage->ancestorStorage;
|
|
||||||
|
|
||||||
newStorage->base.reverted = 0;
|
newStorage->base.reverted = 0;
|
||||||
|
|
||||||
newStorage->parentStorage = parentStorage;
|
newStorage->parentStorage = parentStorage;
|
||||||
|
|
|
@ -213,11 +213,6 @@ struct StorageBaseImpl
|
||||||
*/
|
*/
|
||||||
LONG ref;
|
LONG ref;
|
||||||
|
|
||||||
/*
|
|
||||||
* Ancestor storage (top level)
|
|
||||||
*/
|
|
||||||
StorageImpl* ancestorStorage;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TRUE if this object has been invalidated
|
* TRUE if this object has been invalidated
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue