ole32: Take a StorageBaseImpl in updatePropertyChain.
The function is not always called with a top-level storage object, and the signature should reflect that.
This commit is contained in:
parent
13b9666443
commit
f82924ffb9
|
@ -184,7 +184,7 @@ static HRESULT createDirEntry(
|
||||||
ULONG *index);
|
ULONG *index);
|
||||||
|
|
||||||
static void updatePropertyChain(
|
static void updatePropertyChain(
|
||||||
StorageImpl *storage,
|
StorageBaseImpl *storage,
|
||||||
ULONG newPropertyIndex,
|
ULONG newPropertyIndex,
|
||||||
StgProperty newProperty);
|
StgProperty newProperty);
|
||||||
|
|
||||||
|
@ -765,7 +765,7 @@ 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(
|
updatePropertyChain(
|
||||||
(StorageImpl*)This,
|
This,
|
||||||
renamedPropertyIndex,
|
renamedPropertyIndex,
|
||||||
renamedProperty);
|
renamedProperty);
|
||||||
|
|
||||||
|
@ -945,7 +945,7 @@ 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(
|
updatePropertyChain(
|
||||||
(StorageImpl*)This,
|
This,
|
||||||
newPropertyIndex,
|
newPropertyIndex,
|
||||||
newStreamProperty);
|
newStreamProperty);
|
||||||
|
|
||||||
|
@ -1128,7 +1128,7 @@ static HRESULT WINAPI StorageImpl_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(
|
updatePropertyChain(
|
||||||
This,
|
&This->base,
|
||||||
newPropertyIndex,
|
newPropertyIndex,
|
||||||
newProperty);
|
newProperty);
|
||||||
|
|
||||||
|
@ -1292,7 +1292,7 @@ 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 void updatePropertyChain(
|
||||||
StorageImpl *storage,
|
StorageBaseImpl *storage,
|
||||||
ULONG newPropertyIndex,
|
ULONG newPropertyIndex,
|
||||||
StgProperty newProperty)
|
StgProperty newProperty)
|
||||||
{
|
{
|
||||||
|
@ -1301,8 +1301,8 @@ static void updatePropertyChain(
|
||||||
/*
|
/*
|
||||||
* Read the root property
|
* Read the root property
|
||||||
*/
|
*/
|
||||||
StorageImpl_ReadProperty(storage->base.ancestorStorage,
|
StorageImpl_ReadProperty(storage->ancestorStorage,
|
||||||
storage->base.rootPropertySetIndex,
|
storage->rootPropertySetIndex,
|
||||||
¤tProperty);
|
¤tProperty);
|
||||||
|
|
||||||
if (currentProperty.dirProperty != PROPERTY_NULL)
|
if (currentProperty.dirProperty != PROPERTY_NULL)
|
||||||
|
@ -1322,7 +1322,7 @@ static void updatePropertyChain(
|
||||||
/*
|
/*
|
||||||
* Read
|
* Read
|
||||||
*/
|
*/
|
||||||
StorageImpl_ReadProperty(storage->base.ancestorStorage,
|
StorageImpl_ReadProperty(storage->ancestorStorage,
|
||||||
currentProperty.dirProperty,
|
currentProperty.dirProperty,
|
||||||
¤tProperty);
|
¤tProperty);
|
||||||
|
|
||||||
|
@ -1338,7 +1338,7 @@ static void updatePropertyChain(
|
||||||
{
|
{
|
||||||
if (previous != PROPERTY_NULL)
|
if (previous != PROPERTY_NULL)
|
||||||
{
|
{
|
||||||
StorageImpl_ReadProperty(storage->base.ancestorStorage,
|
StorageImpl_ReadProperty(storage->ancestorStorage,
|
||||||
previous,
|
previous,
|
||||||
¤tProperty);
|
¤tProperty);
|
||||||
current = previous;
|
current = previous;
|
||||||
|
@ -1346,7 +1346,7 @@ static void updatePropertyChain(
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
currentProperty.leftChild = newPropertyIndex;
|
currentProperty.leftChild = newPropertyIndex;
|
||||||
StorageImpl_WriteProperty(storage->base.ancestorStorage,
|
StorageImpl_WriteProperty(storage->ancestorStorage,
|
||||||
current,
|
current,
|
||||||
¤tProperty);
|
¤tProperty);
|
||||||
found = 1;
|
found = 1;
|
||||||
|
@ -1356,7 +1356,7 @@ static void updatePropertyChain(
|
||||||
{
|
{
|
||||||
if (next != PROPERTY_NULL)
|
if (next != PROPERTY_NULL)
|
||||||
{
|
{
|
||||||
StorageImpl_ReadProperty(storage->base.ancestorStorage,
|
StorageImpl_ReadProperty(storage->ancestorStorage,
|
||||||
next,
|
next,
|
||||||
¤tProperty);
|
¤tProperty);
|
||||||
current = next;
|
current = next;
|
||||||
|
@ -1364,7 +1364,7 @@ static void updatePropertyChain(
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
currentProperty.rightChild = newPropertyIndex;
|
currentProperty.rightChild = newPropertyIndex;
|
||||||
StorageImpl_WriteProperty(storage->base.ancestorStorage,
|
StorageImpl_WriteProperty(storage->ancestorStorage,
|
||||||
current,
|
current,
|
||||||
¤tProperty);
|
¤tProperty);
|
||||||
found = 1;
|
found = 1;
|
||||||
|
@ -1389,8 +1389,8 @@ 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->base.ancestorStorage,
|
StorageImpl_WriteProperty(storage->ancestorStorage,
|
||||||
storage->base.rootPropertySetIndex,
|
storage->rootPropertySetIndex,
|
||||||
¤tProperty);
|
¤tProperty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue