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

ole32: Reduce duplicated code in adjustPropertyChain. 

Most of the work is the same regardless of relation type, so bring
those parts out of the relation type test.
This commit is contained in:
Vincent Povirk 2009-10-27 16:48:39 -05:00 committed by Alexandre Julliard
parent d1f9561747
commit a7e69339dc
1 changed files with 27 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
dlls/ole32/storage32.c
View File

@ -2135,107 +2135,43 @@ static HRESULT adjustPropertyChain(
HRESULT hr = S_OK;
BOOL res = TRUE;
if (propertyToDelete.leftChild != PROPERTY_NULL)
{
/*
* Replace the deleted entry with its left child
*/
newLinkProperty = propertyToDelete.leftChild;
if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* We also need to find a place for the other link, setup variables
* to do this at the end...
*/
needToFindAPlaceholder = TRUE;
storeNode = propertyToDelete.leftChild;
toStoreNode = propertyToDelete.rightChild;
relationType = PROPERTY_RELATION_NEXT;
}
}
else if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* Replace the deleted entry with its right child
*/
newLinkProperty = propertyToDelete.rightChild;
}
if (typeOfRelation == PROPERTY_RELATION_PREVIOUS)
{
if (propertyToDelete.leftChild != PROPERTY_NULL)
{
/*
* Set the parent previous to the property to delete previous
*/
newLinkProperty = propertyToDelete.leftChild;
if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* We also need to find a storage for the other link, setup variables
* to do this at the end...
*/
needToFindAPlaceholder = TRUE;
storeNode = propertyToDelete.leftChild;
toStoreNode = propertyToDelete.rightChild;
relationType = PROPERTY_RELATION_NEXT;
}
}
else if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* Set the parent previous to the property to delete next
*/
newLinkProperty = propertyToDelete.rightChild;
}
/*
* Link it for real...
*/
parentProperty.leftChild = newLinkProperty;
}
else if (typeOfRelation == PROPERTY_RELATION_NEXT)
{
if (propertyToDelete.leftChild != PROPERTY_NULL)
{
/*
* Set the parent next to the property to delete next previous
*/
newLinkProperty = propertyToDelete.leftChild;
if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* We also need to find a storage for the other link, setup variables
* to do this at the end...
*/
needToFindAPlaceholder = TRUE;
storeNode = propertyToDelete.leftChild;
toStoreNode = propertyToDelete.rightChild;
relationType = PROPERTY_RELATION_NEXT;
}
}
else if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* Set the parent next to the property to delete next
*/
newLinkProperty = propertyToDelete.rightChild;
}
/*
* Link it for real...
*/
parentProperty.rightChild = newLinkProperty;
}
else /* (typeOfRelation == PROPERTY_RELATION_DIR) */
{
if (propertyToDelete.leftChild != PROPERTY_NULL)
{
/*
* Set the parent dir to the property to delete previous
*/
newLinkProperty = propertyToDelete.leftChild;
if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* We also need to find a storage for the other link, setup variables
* to do this at the end...
*/
needToFindAPlaceholder = TRUE;
storeNode = propertyToDelete.leftChild;
toStoreNode = propertyToDelete.rightChild;
relationType = PROPERTY_RELATION_NEXT;
}
}
else if (propertyToDelete.rightChild != PROPERTY_NULL)
{
/*
* Set the parent dir to the property to delete next
*/
newLinkProperty = propertyToDelete.rightChild;
}
/*
* Link it for real...
*/
parentProperty.dirProperty = newLinkProperty;
}