Module: wine Branch: master Commit: 848caa51685f771a1897898e7880349d5a19ce0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=848caa51685f771a1897898e78...
Author: Vincent Povirk vincent@codeweavers.com Date: Thu Nov 12 13:31:25 2009 -0600
ole32: Rename BlockChainStream.ownerPropertyIndex to ownerDirEntry.
---
dlls/ole32/storage32.c | 18 +++++++++--------- dlls/ole32/storage32.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0bff0f4..0701c5a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3470,7 +3470,7 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( }
/* destroy the original big block chain */ - propertyIndex = (*ppbbChain)->ownerPropertyIndex; + propertyIndex = (*ppbbChain)->ownerDirEntry; BlockChainStream_SetSize(*ppbbChain, size); BlockChainStream_Destroy(*ppbbChain); *ppbbChain = NULL; @@ -4106,7 +4106,7 @@ void StorageUtl_CopyDirEntryToSTATSTG( BlockChainStream* BlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex) + ULONG dirEntry) { BlockChainStream* newStream; ULONG blockIndex; @@ -4115,7 +4115,7 @@ BlockChainStream* BlockChainStream_Construct(
newStream->parentStorage = parentStorage; newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder; - newStream->ownerPropertyIndex = propertyIndex; + newStream->ownerDirEntry = dirEntry; newStream->lastBlockNoInSequence = 0xFFFFFFFF; newStream->tailIndex = BLOCK_END_OF_CHAIN; newStream->numBlocks = 0; @@ -4161,11 +4161,11 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) if (This->headOfStreamPlaceHolder != 0) return *(This->headOfStreamPlaceHolder);
- if (This->ownerPropertyIndex != DIRENTRY_NULL) + if (This->ownerDirEntry != DIRENTRY_NULL) { readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty);
if (readSuccessful) @@ -4498,18 +4498,18 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, else { DirEntry chainProp; - assert(This->ownerPropertyIndex != DIRENTRY_NULL); + assert(This->ownerDirEntry != DIRENTRY_NULL);
StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp);
chainProp.startingBlock = blockIndex;
StorageImpl_WriteDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp); }
@@ -4627,7 +4627,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) */ StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty);
return chainProperty.size; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 566e541..41dd9bd 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -431,7 +431,7 @@ struct BlockChainStream { StorageImpl* parentStorage; ULONG* headOfStreamPlaceHolder; - ULONG ownerPropertyIndex; + ULONG ownerDirEntry; ULONG lastBlockNoInSequence; ULONG lastBlockNoInSequenceIndex; ULONG tailIndex; @@ -444,7 +444,7 @@ struct BlockChainStream BlockChainStream* BlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex); + ULONG dirEntry);
void BlockChainStream_Destroy( BlockChainStream* This);