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

ole32: Take a StorageBaseImpl in insertIntoTree.

This commit is contained in:
Vincent Povirk 2009-11-30 09:40:17 -06:00 committed by Alexandre Julliard
parent 9300a92ccc
commit 0425ed1d38
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/ole32/storage32.c
View File

@ -189,7 +189,7 @@ static HRESULT destroyDirEntry(
DirRef index); DirRef index);
static HRESULT insertIntoTree( static HRESULT insertIntoTree(
StorageImpl *This, StorageBaseImpl *This,
DirRef parentStorageIndex, DirRef parentStorageIndex,
DirRef newEntryIndex); DirRef newEntryIndex);
@ -779,7 +779,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
&currentEntry); &currentEntry);
/* Insert the element in a new position in the tree */ /* Insert the element in a new position in the tree */
insertIntoTree(This->ancestorStorage, This->storageDirEntry, insertIntoTree(This, This->storageDirEntry,
currentEntryRef); currentEntryRef);
} }
else else
@ -920,7 +920,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
* Insert the new entry in the parent storage's tree. * Insert the new entry in the parent storage's tree.
*/ */
insertIntoTree( insertIntoTree(
This->ancestorStorage, This,
This->storageDirEntry, This->storageDirEntry,
newStreamEntryRef); newStreamEntryRef);
@ -1108,7 +1108,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
* Insert the new directory entry into the parent storage's tree * Insert the new directory entry into the parent storage's tree
*/ */
insertIntoTree( insertIntoTree(
This->ancestorStorage, This,
This->storageDirEntry, This->storageDirEntry,
newEntryRef); newEntryRef);
@ -1294,7 +1294,7 @@ static LONG entryNameCmp(
* Add a directory entry to a storage * Add a directory entry to a storage
*/ */
static HRESULT insertIntoTree( static HRESULT insertIntoTree(
StorageImpl *This, StorageBaseImpl *This,
DirRef parentStorageIndex, DirRef parentStorageIndex,
DirRef newEntryIndex) DirRef newEntryIndex)
{ {
@ -1304,14 +1304,14 @@ static HRESULT insertIntoTree(
/* /*
* Read the inserted entry * Read the inserted entry
*/ */
StorageImpl_ReadDirEntry(This, StorageBaseImpl_ReadDirEntry(This,
newEntryIndex, newEntryIndex,
&newEntry); &newEntry);
/* /*
* Read the storage entry * Read the storage entry
*/ */
StorageImpl_ReadDirEntry(This, StorageBaseImpl_ReadDirEntry(This,
parentStorageIndex, parentStorageIndex,
&currentEntry); &currentEntry);
@ -1332,7 +1332,7 @@ static HRESULT insertIntoTree(
/* /*
* Read * Read
*/ */
StorageImpl_ReadDirEntry(This, StorageBaseImpl_ReadDirEntry(This,
currentEntry.dirRootEntry, currentEntry.dirRootEntry,
&currentEntry); &currentEntry);
@ -1348,7 +1348,7 @@ static HRESULT insertIntoTree(
{ {
if (previous != DIRENTRY_NULL) if (previous != DIRENTRY_NULL)
{ {
StorageImpl_ReadDirEntry(This, StorageBaseImpl_ReadDirEntry(This,
previous, previous,
&currentEntry); &currentEntry);
current = previous; current = previous;
@ -1356,7 +1356,7 @@ static HRESULT insertIntoTree(
else else
{ {
currentEntry.leftChild = newEntryIndex; currentEntry.leftChild = newEntryIndex;
StorageImpl_WriteDirEntry(This, StorageBaseImpl_WriteDirEntry(This,
current, current,
&currentEntry); &currentEntry);
found = 1; found = 1;
@ -1366,7 +1366,7 @@ static HRESULT insertIntoTree(
{ {
if (next != DIRENTRY_NULL) if (next != DIRENTRY_NULL)
{ {
StorageImpl_ReadDirEntry(This, StorageBaseImpl_ReadDirEntry(This,
next, next,
&currentEntry); &currentEntry);
current = next; current = next;
@ -1374,7 +1374,7 @@ static HRESULT insertIntoTree(
else else
{ {
currentEntry.rightChild = newEntryIndex; currentEntry.rightChild = newEntryIndex;
StorageImpl_WriteDirEntry(This, StorageBaseImpl_WriteDirEntry(This,
current, current,
&currentEntry); &currentEntry);
found = 1; found = 1;
@ -1399,7 +1399,7 @@ static HRESULT insertIntoTree(
* The storage is empty, make the new entry the root of its element tree * The storage is empty, make the new entry the root of its element tree
*/ */
currentEntry.dirRootEntry = newEntryIndex; currentEntry.dirRootEntry = newEntryIndex;
StorageImpl_WriteDirEntry(This, StorageBaseImpl_WriteDirEntry(This,
parentStorageIndex, parentStorageIndex,
&currentEntry); &currentEntry);
} }