Vincent Povirk : ole32: Rename SmallBlockChainStream. ownerPropertyIndex to ownerDirEntry.
Alexandre Julliard
julliard at winehq.org
Mon Nov 16 11:43:52 CST 2009
Module: wine
Branch: master
Commit: 93db14e79ae3db0f44824736552ea7a23b40b89f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db14e79ae3db0f44824736552ea7a23b40b89f
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Thu Nov 12 13:36:07 2009 -0600
ole32: Rename SmallBlockChainStream.ownerPropertyIndex to ownerDirEntry.
---
dlls/ole32/storage32.c | 20 ++++++++++----------
dlls/ole32/storage32.h | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 0701c5a..2ac8127 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -3375,7 +3375,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
/*
* Destroy the small block chain.
*/
- propertyIndex = (*ppsbChain)->ownerPropertyIndex;
+ propertyIndex = (*ppsbChain)->ownerDirEntry;
SmallBlockChainStream_SetSize(*ppsbChain, size);
SmallBlockChainStream_Destroy(*ppsbChain);
*ppsbChain = 0;
@@ -4657,7 +4657,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This)
SmallBlockChainStream* SmallBlockChainStream_Construct(
StorageImpl* parentStorage,
ULONG* headOfStreamPlaceHolder,
- ULONG propertyIndex)
+ ULONG dirEntry)
{
SmallBlockChainStream* newStream;
@@ -4665,7 +4665,7 @@ SmallBlockChainStream* SmallBlockChainStream_Construct(
newStream->parentStorage = parentStorage;
newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder;
- newStream->ownerPropertyIndex = propertyIndex;
+ newStream->ownerDirEntry = dirEntry;
return newStream;
}
@@ -4690,11 +4690,11 @@ static ULONG SmallBlockChainStream_GetHeadOfChain(
if (This->headOfStreamPlaceHolder != NULL)
return *(This->headOfStreamPlaceHolder);
- if (This->ownerPropertyIndex)
+ if (This->ownerDirEntry)
{
readSuccessful = StorageImpl_ReadDirEntry(
This->parentStorage,
- This->ownerPropertyIndex,
+ This->ownerDirEntry,
&chainProperty);
if (readSuccessful)
@@ -5178,13 +5178,13 @@ static BOOL SmallBlockChainStream_Shrink(
DirEntry chainProp;
StorageImpl_ReadDirEntry(This->parentStorage,
- This->ownerPropertyIndex,
+ This->ownerDirEntry,
&chainProp);
chainProp.startingBlock = BLOCK_END_OF_CHAIN;
StorageImpl_WriteDirEntry(This->parentStorage,
- This->ownerPropertyIndex,
+ This->ownerDirEntry,
&chainProp);
/*
@@ -5255,12 +5255,12 @@ static BOOL SmallBlockChainStream_Enlarge(
{
DirEntry chainProp;
- StorageImpl_ReadDirEntry(This->parentStorage, This->ownerPropertyIndex,
+ StorageImpl_ReadDirEntry(This->parentStorage, This->ownerDirEntry,
&chainProp);
chainProp.startingBlock = blockIndex;
- StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex,
+ StorageImpl_WriteDirEntry(This->parentStorage, This->ownerDirEntry,
&chainProp);
}
}
@@ -5385,7 +5385,7 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* 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 41dd9bd..07d4048 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -476,7 +476,7 @@ BOOL BlockChainStream_SetSize(
struct SmallBlockChainStream
{
StorageImpl* parentStorage;
- ULONG ownerPropertyIndex;
+ ULONG ownerDirEntry;
ULONG* headOfStreamPlaceHolder;
};
@@ -486,7 +486,7 @@ struct SmallBlockChainStream
SmallBlockChainStream* SmallBlockChainStream_Construct(
StorageImpl* parentStorage,
ULONG* headOfStreamPlaceHolder,
- ULONG propertyIndex);
+ ULONG dirEntry);
void SmallBlockChainStream_Destroy(
SmallBlockChainStream* This);
More information about the wine-cvs
mailing list