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

ole32: Adjust updatePropertyChain signature and name to match removeFromTree.

This commit is contained in:
Vincent Povirk 2009-11-02 12:41:09 -06:00 committed by Alexandre Julliard
parent bdbee82c42
commit 274a1d11c1
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
dlls/ole32/storage32.c
View File

@ -187,10 +187,10 @@ static HRESULT destroyDirEntry(
StorageImpl *storage, StorageImpl *storage,
ULONG index); ULONG index);
static void updatePropertyChain( static HRESULT insertIntoTree(
StorageBaseImpl *storage, StorageImpl *This,
ULONG newPropertyIndex, ULONG parentStorageIndex,
StgProperty newProperty); ULONG newPropertyIndex);
static LONG propertyNameCmp( static LONG propertyNameCmp(
const OLECHAR *newProperty, const OLECHAR *newProperty,
@ -768,10 +768,10 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
/* /*
* Find a spot in the property chain for our newly created property. * Find a spot in the property chain for our newly created property.
*/ */
updatePropertyChain( insertIntoTree(
This, This->ancestorStorage,
renamedPropertyIndex, This->rootPropertySetIndex,
renamedProperty); renamedPropertyIndex);
/* /*
* At this point the renamed property has been inserted in the tree, * At this point the renamed property has been inserted in the tree,
@ -948,10 +948,10 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
/* /*
* Find a spot in the property chain for our newly created property. * Find a spot in the property chain for our newly created property.
*/ */
updatePropertyChain( insertIntoTree(
This, This->ancestorStorage,
newPropertyIndex, This->rootPropertySetIndex,
newStreamProperty); newPropertyIndex);
/* /*
* Open the stream to return it. * Open the stream to return it.
@ -1131,10 +1131,10 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
/* /*
* Find a spot in the property chain for our newly created property. * Find a spot in the property chain for our newly created property.
*/ */
updatePropertyChain( insertIntoTree(
This, This->ancestorStorage,
newPropertyIndex, This->rootPropertySetIndex,
newProperty); newPropertyIndex);
/* /*
* Open it to get a pointer to return. * Open it to get a pointer to return.
@ -1316,18 +1316,26 @@ static LONG propertyNameCmp(
* *
* Properly link this new element in the property chain. * Properly link this new element in the property chain.
*/ */
static void updatePropertyChain( static HRESULT insertIntoTree(
StorageBaseImpl *storage, StorageImpl *This,
ULONG newPropertyIndex, ULONG parentStorageIndex,
StgProperty newProperty) ULONG newPropertyIndex)
{ {
StgProperty currentProperty; StgProperty currentProperty;
StgProperty newProperty;
/*
* Read the inserted property
*/
StorageImpl_ReadProperty(This,
newPropertyIndex,
&newProperty);
/* /*
* Read the root property * Read the root property
*/ */
StorageImpl_ReadProperty(storage->ancestorStorage, StorageImpl_ReadProperty(This,
storage->rootPropertySetIndex, parentStorageIndex,
&currentProperty); &currentProperty);
if (currentProperty.dirProperty != PROPERTY_NULL) if (currentProperty.dirProperty != PROPERTY_NULL)
@ -1347,7 +1355,7 @@ static void updatePropertyChain(
/* /*
* Read * Read
*/ */
StorageImpl_ReadProperty(storage->ancestorStorage, StorageImpl_ReadProperty(This,
currentProperty.dirProperty, currentProperty.dirProperty,
&currentProperty); &currentProperty);
@ -1363,7 +1371,7 @@ static void updatePropertyChain(
{ {
if (previous != PROPERTY_NULL) if (previous != PROPERTY_NULL)
{ {
StorageImpl_ReadProperty(storage->ancestorStorage, StorageImpl_ReadProperty(This,
previous, previous,
&currentProperty); &currentProperty);
current = previous; current = previous;
@ -1371,7 +1379,7 @@ static void updatePropertyChain(
else else
{ {
currentProperty.leftChild = newPropertyIndex; currentProperty.leftChild = newPropertyIndex;
StorageImpl_WriteProperty(storage->ancestorStorage, StorageImpl_WriteProperty(This,
current, current,
&currentProperty); &currentProperty);
found = 1; found = 1;
@ -1381,7 +1389,7 @@ static void updatePropertyChain(
{ {
if (next != PROPERTY_NULL) if (next != PROPERTY_NULL)
{ {
StorageImpl_ReadProperty(storage->ancestorStorage, StorageImpl_ReadProperty(This,
next, next,
&currentProperty); &currentProperty);
current = next; current = next;
@ -1389,7 +1397,7 @@ static void updatePropertyChain(
else else
{ {
currentProperty.rightChild = newPropertyIndex; currentProperty.rightChild = newPropertyIndex;
StorageImpl_WriteProperty(storage->ancestorStorage, StorageImpl_WriteProperty(This,
current, current,
&currentProperty); &currentProperty);
found = 1; found = 1;
@ -1401,7 +1409,7 @@ static void updatePropertyChain(
* Trying to insert an item with the same name in the * Trying to insert an item with the same name in the
* subtree structure. * subtree structure.
*/ */
assert(FALSE); return STG_E_FILEALREADYEXISTS;
} }
previous = currentProperty.leftChild; previous = currentProperty.leftChild;
@ -1414,10 +1422,12 @@ static void updatePropertyChain(
* 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(storage->ancestorStorage, StorageImpl_WriteProperty(This,
storage->rootPropertySetIndex, parentStorageIndex,
&currentProperty); &currentProperty);
} }
return S_OK;
} }
/**************************************************************************** /****************************************************************************