Commit 93db14e7 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

ole32: Rename SmallBlockChainStream.ownerPropertyIndex to ownerDirEntry.

parent 848caa51
...@@ -3375,7 +3375,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( ...@@ -3375,7 +3375,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
/* /*
* Destroy the small block chain. * Destroy the small block chain.
*/ */
propertyIndex = (*ppsbChain)->ownerPropertyIndex; propertyIndex = (*ppsbChain)->ownerDirEntry;
SmallBlockChainStream_SetSize(*ppsbChain, size); SmallBlockChainStream_SetSize(*ppsbChain, size);
SmallBlockChainStream_Destroy(*ppsbChain); SmallBlockChainStream_Destroy(*ppsbChain);
*ppsbChain = 0; *ppsbChain = 0;
...@@ -4657,7 +4657,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) ...@@ -4657,7 +4657,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This)
SmallBlockChainStream* SmallBlockChainStream_Construct( SmallBlockChainStream* SmallBlockChainStream_Construct(
StorageImpl* parentStorage, StorageImpl* parentStorage,
ULONG* headOfStreamPlaceHolder, ULONG* headOfStreamPlaceHolder,
ULONG propertyIndex) ULONG dirEntry)
{ {
SmallBlockChainStream* newStream; SmallBlockChainStream* newStream;
...@@ -4665,7 +4665,7 @@ SmallBlockChainStream* SmallBlockChainStream_Construct( ...@@ -4665,7 +4665,7 @@ SmallBlockChainStream* SmallBlockChainStream_Construct(
newStream->parentStorage = parentStorage; newStream->parentStorage = parentStorage;
newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder; newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder;
newStream->ownerPropertyIndex = propertyIndex; newStream->ownerDirEntry = dirEntry;
return newStream; return newStream;
} }
...@@ -4690,11 +4690,11 @@ static ULONG SmallBlockChainStream_GetHeadOfChain( ...@@ -4690,11 +4690,11 @@ static ULONG SmallBlockChainStream_GetHeadOfChain(
if (This->headOfStreamPlaceHolder != NULL) if (This->headOfStreamPlaceHolder != NULL)
return *(This->headOfStreamPlaceHolder); return *(This->headOfStreamPlaceHolder);
if (This->ownerPropertyIndex) if (This->ownerDirEntry)
{ {
readSuccessful = StorageImpl_ReadDirEntry( readSuccessful = StorageImpl_ReadDirEntry(
This->parentStorage, This->parentStorage,
This->ownerPropertyIndex, This->ownerDirEntry,
&chainProperty); &chainProperty);
if (readSuccessful) if (readSuccessful)
...@@ -5178,13 +5178,13 @@ static BOOL SmallBlockChainStream_Shrink( ...@@ -5178,13 +5178,13 @@ static BOOL SmallBlockChainStream_Shrink(
DirEntry chainProp; DirEntry chainProp;
StorageImpl_ReadDirEntry(This->parentStorage, StorageImpl_ReadDirEntry(This->parentStorage,
This->ownerPropertyIndex, This->ownerDirEntry,
&chainProp); &chainProp);
chainProp.startingBlock = BLOCK_END_OF_CHAIN; chainProp.startingBlock = BLOCK_END_OF_CHAIN;
StorageImpl_WriteDirEntry(This->parentStorage, StorageImpl_WriteDirEntry(This->parentStorage,
This->ownerPropertyIndex, This->ownerDirEntry,
&chainProp); &chainProp);
/* /*
...@@ -5255,12 +5255,12 @@ static BOOL SmallBlockChainStream_Enlarge( ...@@ -5255,12 +5255,12 @@ static BOOL SmallBlockChainStream_Enlarge(
{ {
DirEntry chainProp; DirEntry chainProp;
StorageImpl_ReadDirEntry(This->parentStorage, This->ownerPropertyIndex, StorageImpl_ReadDirEntry(This->parentStorage, This->ownerDirEntry,
&chainProp); &chainProp);
chainProp.startingBlock = blockIndex; chainProp.startingBlock = blockIndex;
StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex, StorageImpl_WriteDirEntry(This->parentStorage, This->ownerDirEntry,
&chainProp); &chainProp);
} }
} }
...@@ -5385,7 +5385,7 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) ...@@ -5385,7 +5385,7 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This)
StorageImpl_ReadDirEntry( StorageImpl_ReadDirEntry(
This->parentStorage, This->parentStorage,
This->ownerPropertyIndex, This->ownerDirEntry,
&chainProperty); &chainProperty);
return chainProperty.size; return chainProperty.size;
......
...@@ -476,7 +476,7 @@ BOOL BlockChainStream_SetSize( ...@@ -476,7 +476,7 @@ BOOL BlockChainStream_SetSize(
struct SmallBlockChainStream struct SmallBlockChainStream
{ {
StorageImpl* parentStorage; StorageImpl* parentStorage;
ULONG ownerPropertyIndex; ULONG ownerDirEntry;
ULONG* headOfStreamPlaceHolder; ULONG* headOfStreamPlaceHolder;
}; };
...@@ -486,7 +486,7 @@ struct SmallBlockChainStream ...@@ -486,7 +486,7 @@ struct SmallBlockChainStream
SmallBlockChainStream* SmallBlockChainStream_Construct( SmallBlockChainStream* SmallBlockChainStream_Construct(
StorageImpl* parentStorage, StorageImpl* parentStorage,
ULONG* headOfStreamPlaceHolder, ULONG* headOfStreamPlaceHolder,
ULONG propertyIndex); ULONG dirEntry);
void SmallBlockChainStream_Destroy( void SmallBlockChainStream_Destroy(
SmallBlockChainStream* This); SmallBlockChainStream* This);
......
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