Vincent Povirk : ole32: Make findElement take a StorageBaseImpl.
Alexandre Julliard
julliard at winehq.org
Thu Dec 10 10:00:56 CST 2009
Module: wine
Branch: master
Commit: 43184aaf52f29a02ab3babe35cc47dfdde92b0b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=43184aaf52f29a02ab3babe35cc47dfdde92b0b3
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Mon Nov 30 17:13:33 2009 -0600
ole32: Make findElement take a StorageBaseImpl.
---
dlls/ole32/storage32.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index d0b0461..2465863 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -196,7 +196,7 @@ static LONG entryNameCmp(
const OLECHAR *name2);
static DirRef findElement(
- StorageImpl *storage,
+ StorageBaseImpl *storage,
DirRef storageEntry,
const OLECHAR *name,
DirEntry *data);
@@ -447,7 +447,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream(
* Search for the element with the given name
*/
streamEntryRef = findElement(
- This->ancestorStorage,
+ This,
This->storageDirEntry,
pwcsName,
¤tEntry);
@@ -571,7 +571,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage(
*ppstg = NULL;
storageEntryRef = findElement(
- This->ancestorStorage,
+ This,
This->storageDirEntry,
pwcsName,
¤tEntry);
@@ -736,7 +736,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
if (This->reverted)
return STG_E_REVERTED;
- currentEntryRef = findElement(This->ancestorStorage,
+ currentEntryRef = findElement(This,
This->storageDirEntry,
pwcsNewName,
¤tEntry);
@@ -752,7 +752,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
/*
* Search for the old element name
*/
- currentEntryRef = findElement(This->ancestorStorage,
+ currentEntryRef = findElement(This,
This->storageDirEntry,
pwcsOldName,
¤tEntry);
@@ -858,7 +858,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
*ppstm = 0;
- currentEntryRef = findElement(This->ancestorStorage,
+ currentEntryRef = findElement(This,
This->storageDirEntry,
pwcsName,
¤tEntry);
@@ -1040,7 +1040,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
return STG_E_ACCESSDENIED;
}
- currentEntryRef = findElement(This->ancestorStorage,
+ currentEntryRef = findElement(This,
This->storageDirEntry,
pwcsName,
¤tEntry);
@@ -1412,13 +1412,13 @@ static HRESULT insertIntoTree(
*
* Find and read the element of a storage with the given name.
*/
-static DirRef findElement(StorageImpl *storage, DirRef storageEntry,
+static DirRef findElement(StorageBaseImpl *storage, DirRef storageEntry,
const OLECHAR *name, DirEntry *data)
{
DirRef currentEntry;
/* Read the storage entry to find the root of the tree. */
- StorageImpl_ReadDirEntry(storage, storageEntry, data);
+ StorageBaseImpl_ReadDirEntry(storage, storageEntry, data);
currentEntry = data->dirRootEntry;
@@ -1426,7 +1426,7 @@ static DirRef findElement(StorageImpl *storage, DirRef storageEntry,
{
LONG cmp;
- StorageImpl_ReadDirEntry(storage, currentEntry, data);
+ StorageBaseImpl_ReadDirEntry(storage, currentEntry, data);
cmp = entryNameCmp(name, data->name);
@@ -1779,7 +1779,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
return STG_E_ACCESSDENIED;
entryToDeleteRef = findElement(
- This->ancestorStorage,
+ This,
This->storageDirEntry,
pwcsName,
&entryToDelete);
More information about the wine-cvs
mailing list