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

ole32: Rename StorageImpl_WriteProperty to StorageImpl_WriteDirEntry.

This commit is contained in:
Vincent Povirk 2009-11-10 14:40:05 -06:00 committed by Alexandre Julliard
parent b3c30b1f4a
commit 42a4b11e2d
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ole32/stg_stream.c
View File

@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
if (Success) if (Success)
{ {
StorageImpl_WriteProperty(This->parentStorage->ancestorStorage, StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage,
This->ownerProperty, This->ownerProperty,
&curProperty); &curProperty);
} }

34
dlls/ole32/storage32.c
View File

@ -729,7 +729,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
/* Change the name of the element */ /* Change the name of the element */
strcpyW(currentProperty.name, pwcsNewName); strcpyW(currentProperty.name, pwcsNewName);
StorageImpl_WriteProperty(This->ancestorStorage, foundPropertyIndex, StorageImpl_WriteDirEntry(This->ancestorStorage, foundPropertyIndex,
&currentProperty); &currentProperty);
/* Insert the element in a new position in the tree */ /* Insert the element in a new position in the tree */
@ -932,7 +932,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass(
{ {
curProperty.propertyUniqueID = *clsid; curProperty.propertyUniqueID = *clsid;
success = StorageImpl_WriteProperty(This->ancestorStorage, success = StorageImpl_WriteDirEntry(This->ancestorStorage,
This->rootPropertySetIndex, This->rootPropertySetIndex,
&curProperty); &curProperty);
if (success) if (success)
@ -1313,7 +1313,7 @@ static HRESULT insertIntoTree(
else else
{ {
currentProperty.leftChild = newPropertyIndex; currentProperty.leftChild = newPropertyIndex;
StorageImpl_WriteProperty(This, StorageImpl_WriteDirEntry(This,
current, current,
&currentProperty); &currentProperty);
found = 1; found = 1;
@ -1331,7 +1331,7 @@ static HRESULT insertIntoTree(
else else
{ {
currentProperty.rightChild = newPropertyIndex; currentProperty.rightChild = newPropertyIndex;
StorageImpl_WriteProperty(This, StorageImpl_WriteDirEntry(This,
current, current,
&currentProperty); &currentProperty);
found = 1; found = 1;
@ -1356,7 +1356,7 @@ static HRESULT insertIntoTree(
* The root storage is empty, link the new property to its dir property * The root storage is empty, link the new property to its dir property
*/ */
currentProperty.dirProperty = newPropertyIndex; currentProperty.dirProperty = newPropertyIndex;
StorageImpl_WriteProperty(This, StorageImpl_WriteDirEntry(This,
parentStorageIndex, parentStorageIndex,
&currentProperty); &currentProperty);
} }
@ -2002,7 +2002,7 @@ static HRESULT removeFromTree(
*/ */
setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild);
res = StorageImpl_WriteProperty( res = StorageImpl_WriteDirEntry(
This, This,
parentPropertyId, parentPropertyId,
&parentProperty); &parentProperty);
@ -2038,7 +2038,7 @@ static HRESULT removeFromTree(
newRightChildParentProperty.rightChild = propertyToDelete.rightChild; newRightChildParentProperty.rightChild = propertyToDelete.rightChild;
res = StorageImpl_WriteProperty( res = StorageImpl_WriteDirEntry(
This, This,
newRightChildParent, newRightChildParent,
&newRightChildParentProperty); &newRightChildParentProperty);
@ -2055,7 +2055,7 @@ static HRESULT removeFromTree(
*/ */
setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild);
res = StorageImpl_WriteProperty( res = StorageImpl_WriteDirEntry(
This, This,
parentPropertyId, parentPropertyId,
&parentProperty); &parentProperty);
@ -2277,7 +2277,7 @@ static HRESULT StorageImpl_Construct(
rootProp.size.u.HighPart = 0; rootProp.size.u.HighPart = 0;
rootProp.size.u.LowPart = 0; rootProp.size.u.LowPart = 0;
StorageImpl_WriteProperty(This, 0, &rootProp); StorageImpl_WriteDirEntry(This, 0, &rootProp);
} }
/* /*
@ -3206,7 +3206,7 @@ BOOL StorageImpl_ReadDirEntry(
/********************************************************************* /*********************************************************************
* Write the specified property into the property chain * Write the specified property into the property chain
*/ */
BOOL StorageImpl_WriteProperty( BOOL StorageImpl_WriteDirEntry(
StorageImpl* This, StorageImpl* This,
ULONG index, ULONG index,
const DirEntry* buffer) const DirEntry* buffer)
@ -3388,7 +3388,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
chainProperty.startingBlock = bbHeadOfChain; chainProperty.startingBlock = bbHeadOfChain;
StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty);
/* /*
* Destroy the temporary propertyless big block chain. * Destroy the temporary propertyless big block chain.
@ -3477,7 +3477,7 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks(
StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty); StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty);
chainProperty.startingBlock = sbHeadOfChain; chainProperty.startingBlock = sbHeadOfChain;
StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty);
SmallBlockChainStream_Destroy(sbTempChain); SmallBlockChainStream_Destroy(sbTempChain);
return SmallBlockChainStream_Construct(This, NULL, propertyIndex); return SmallBlockChainStream_Construct(This, NULL, propertyIndex);
@ -4507,7 +4507,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This,
chainProp.startingBlock = blockIndex; chainProp.startingBlock = blockIndex;
StorageImpl_WriteProperty( StorageImpl_WriteDirEntry(
This->parentStorage, This->parentStorage,
This->ownerPropertyIndex, This->ownerPropertyIndex,
&chainProp); &chainProp);
@ -4907,7 +4907,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock(
rootProp.size.u.HighPart = 0; rootProp.size.u.HighPart = 0;
rootProp.size.u.LowPart = This->parentStorage->bigBlockSize; rootProp.size.u.LowPart = This->parentStorage->bigBlockSize;
StorageImpl_WriteProperty( StorageImpl_WriteDirEntry(
This->parentStorage, This->parentStorage,
This->parentStorage->base.rootPropertySetIndex, This->parentStorage->base.rootPropertySetIndex,
&rootProp); &rootProp);
@ -4942,7 +4942,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock(
This->parentStorage->smallBlockRootChain, This->parentStorage->smallBlockRootChain,
rootProp.size); rootProp.size);
StorageImpl_WriteProperty( StorageImpl_WriteDirEntry(
This->parentStorage, This->parentStorage,
This->parentStorage->base.rootPropertySetIndex, This->parentStorage->base.rootPropertySetIndex,
&rootProp); &rootProp);
@ -5183,7 +5183,7 @@ static BOOL SmallBlockChainStream_Shrink(
chainProp.startingBlock = BLOCK_END_OF_CHAIN; chainProp.startingBlock = BLOCK_END_OF_CHAIN;
StorageImpl_WriteProperty(This->parentStorage, StorageImpl_WriteDirEntry(This->parentStorage,
This->ownerPropertyIndex, This->ownerPropertyIndex,
&chainProp); &chainProp);
@ -5260,7 +5260,7 @@ static BOOL SmallBlockChainStream_Enlarge(
chainProp.startingBlock = blockIndex; chainProp.startingBlock = blockIndex;
StorageImpl_WriteProperty(This->parentStorage, This->ownerPropertyIndex, StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex,
&chainProp); &chainProp);
} }
} }

2
dlls/ole32/storage32.h
View File

@ -307,7 +307,7 @@ BOOL StorageImpl_ReadDirEntry(
ULONG index, ULONG index,
DirEntry* buffer); DirEntry* buffer);
BOOL StorageImpl_WriteProperty( BOOL StorageImpl_WriteDirEntry(
StorageImpl* This, StorageImpl* This,
ULONG index, ULONG index,
const DirEntry* buffer); const DirEntry* buffer);