ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Rename property variables in BlockChainStream methods.

This commit is contained in:
Vincent Povirk 2009-11-12 15:05:51 -06:00 committed by Alexandre Julliard
parent 3aa8cdec7b
commit 8f2d0f8887
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/ole32/storage32.c
View File

@ -4146,13 +4146,13 @@ void BlockChainStream_Destroy(BlockChainStream* This)
* BlockChainStream_GetHeadOfChain * BlockChainStream_GetHeadOfChain
* *
* Returns the head of this stream chain. * Returns the head of this stream chain.
* Some special chains don't have properties, their heads are kept in * Some special chains don't have directory entries, their heads are kept in
* This->headOfStreamPlaceHolder. * This->headOfStreamPlaceHolder.
* *
*/ */
static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This)
{ {
DirEntry chainProperty; DirEntry chainEntry;
BOOL readSuccessful; BOOL readSuccessful;
if (This->headOfStreamPlaceHolder != 0) if (This->headOfStreamPlaceHolder != 0)
@ -4163,11 +4163,11 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This)
readSuccessful = StorageImpl_ReadDirEntry( readSuccessful = StorageImpl_ReadDirEntry(
This->parentStorage, This->parentStorage,
This->ownerDirEntry, This->ownerDirEntry,
&chainProperty); &chainEntry);
if (readSuccessful) if (readSuccessful)
{ {
return chainProperty.startingBlock; return chainEntry.startingBlock;
} }
} }
@ -4494,20 +4494,20 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This,
} }
else else
{ {
DirEntry chainProp; DirEntry chainEntry;
assert(This->ownerDirEntry != DIRENTRY_NULL); assert(This->ownerDirEntry != DIRENTRY_NULL);
StorageImpl_ReadDirEntry( StorageImpl_ReadDirEntry(
This->parentStorage, This->parentStorage,
This->ownerDirEntry, This->ownerDirEntry,
&chainProp); &chainEntry);
chainProp.startingBlock = blockIndex; chainEntry.startingBlock = blockIndex;
StorageImpl_WriteDirEntry( StorageImpl_WriteDirEntry(
This->parentStorage, This->parentStorage,
This->ownerDirEntry, This->ownerDirEntry,
&chainProp); &chainEntry);
} }
This->tailIndex = blockIndex; This->tailIndex = blockIndex;
@ -4610,29 +4610,28 @@ BOOL BlockChainStream_SetSize(
* BlockChainStream_GetSize * BlockChainStream_GetSize
* *
* Returns the size of this chain. * Returns the size of this chain.
* Will return the block count if this chain doesn't have a property. * Will return the block count if this chain doesn't have a directory entry.
*/ */
static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This)
{ {
DirEntry chainProperty; DirEntry chainEntry;
if(This->headOfStreamPlaceHolder == NULL) if(This->headOfStreamPlaceHolder == NULL)
{ {
/* /*
* This chain is a data stream read the property and return * This chain has a directory entry so use the size value from there.
* the appropriate size
*/ */
StorageImpl_ReadDirEntry( StorageImpl_ReadDirEntry(
This->parentStorage, This->parentStorage,
This->ownerDirEntry, This->ownerDirEntry,
&chainProperty); &chainEntry);
return chainProperty.size; return chainEntry.size;
} }
else else
{ {
/* /*
* this chain is a chain that does not have a property, figure out the * this chain is a chain that does not have a directory entry, figure out the
* size by making the product number of used blocks times the * size by making the product number of used blocks times the
* size of them * size of them
*/ */