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

ole32: Make IEnumSTATSTGImpl reference the parent storage.

This commit is contained in:
Vincent Povirk 2009-11-30 17:17:13 -06:00 committed by Alexandre Julliard
parent 43184aaf52
commit 5d39c31bff
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ole32/storage32.c
View File

@ -234,7 +234,7 @@ struct IEnumSTATSTGImpl
* since we want to cast this in an IEnumSTATSTG pointer */ * since we want to cast this in an IEnumSTATSTG pointer */
LONG ref; /* Reference count */ LONG ref; /* Reference count */
StorageImpl* parentStorage; /* Reference to the parent storage */ StorageBaseImpl* parentStorage; /* Reference to the parent storage */
DirRef storageDirEntry; /* Directory entry of the storage to enumerate */ DirRef storageDirEntry; /* Directory entry of the storage to enumerate */
/* /*
@ -250,7 +250,7 @@ struct IEnumSTATSTGImpl
}; };
static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageImpl* This, DirRef storageDirEntry); static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageBaseImpl* This, DirRef storageDirEntry);
static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This); static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This);
static void IEnumSTATSTGImpl_PushSearchNode(IEnumSTATSTGImpl* This, DirRef nodeToPush); static void IEnumSTATSTGImpl_PushSearchNode(IEnumSTATSTGImpl* This, DirRef nodeToPush);
static DirRef IEnumSTATSTGImpl_PopSearchNode(IEnumSTATSTGImpl* This, BOOL remove); static DirRef IEnumSTATSTGImpl_PopSearchNode(IEnumSTATSTGImpl* This, BOOL remove);
@ -642,7 +642,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements(
return STG_E_REVERTED; return STG_E_REVERTED;
newEnum = IEnumSTATSTGImpl_Construct( newEnum = IEnumSTATSTGImpl_Construct(
This->ancestorStorage, This,
This->storageDirEntry); This->storageDirEntry);
if (newEnum!=0) if (newEnum!=0)
@ -4034,14 +4034,14 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next(
/* /*
* Read the entry from the storage. * Read the entry from the storage.
*/ */
StorageImpl_ReadDirEntry(This->parentStorage, StorageBaseImpl_ReadDirEntry(This->parentStorage,
currentSearchNode, currentSearchNode,
&currentEntry); &currentEntry);
/* /*
* Copy the information to the return buffer. * Copy the information to the return buffer.
*/ */
StorageUtl_CopyDirEntryToSTATSTG(&This->parentStorage->base, StorageUtl_CopyDirEntryToSTATSTG(This->parentStorage,
currentReturnStruct, currentReturnStruct,
&currentEntry, &currentEntry,
STATFLAG_DEFAULT); STATFLAG_DEFAULT);
@ -4096,7 +4096,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip(
/* /*
* Read the entry from the storage. * Read the entry from the storage.
*/ */
StorageImpl_ReadDirEntry(This->parentStorage, StorageBaseImpl_ReadDirEntry(This->parentStorage,
currentSearchNode, currentSearchNode,
&currentEntry); &currentEntry);
@ -4138,7 +4138,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset(
/* /*
* Read the storage entry from the top-level storage. * Read the storage entry from the top-level storage.
*/ */
hr = StorageImpl_ReadDirEntry( hr = StorageBaseImpl_ReadDirEntry(
This->parentStorage, This->parentStorage,
This->storageDirEntry, This->storageDirEntry,
&storageEntry); &storageEntry);
@ -4232,7 +4232,7 @@ static void IEnumSTATSTGImpl_PushSearchNode(
/* /*
* Read the storage entry from the top-level storage. * Read the storage entry from the top-level storage.
*/ */
hr = StorageImpl_ReadDirEntry( hr = StorageBaseImpl_ReadDirEntry(
This->parentStorage, This->parentStorage,
nodeToPush, nodeToPush,
&storageEntry); &storageEntry);
@ -4284,7 +4284,7 @@ static const IEnumSTATSTGVtbl IEnumSTATSTGImpl_Vtbl =
*/ */
static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(
StorageImpl* parentStorage, StorageBaseImpl* parentStorage,
DirRef storageDirEntry) DirRef storageDirEntry)
{ {
IEnumSTATSTGImpl* newEnumeration; IEnumSTATSTGImpl* newEnumeration;