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

ole32: Add Invalidate to the storage vtable.

This commit is contained in:
Vincent Povirk 2009-12-04 15:49:31 -06:00 committed by Alexandre Julliard
parent 75fe621192
commit 42142200d5
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/ole32/storage32.c
View File

@ -91,6 +91,7 @@ typedef struct StorageInternalImpl StorageInternalImpl;
static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* parentStorage, static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* parentStorage,
DWORD openFlags, DirRef storageDirEntry); DWORD openFlags, DirRef storageDirEntry);
static void StorageImpl_Destroy(StorageBaseImpl* iface); static void StorageImpl_Destroy(StorageBaseImpl* iface);
static void StorageImpl_Invalidate(StorageBaseImpl* iface);
static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer);
static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer); static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer);
static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock); static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock);
@ -116,7 +117,6 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( StorageImpl* This,
static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEntry); static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEntry);
static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageEntry); static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageEntry);
static void StorageInternalImpl_Invalidate( StorageInternalImpl *This );
/* OLESTREAM memory structure to use for Get and Put Routines */ /* OLESTREAM memory structure to use for Get and Put Routines */
/* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */ /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */
@ -1884,7 +1884,7 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg)
LIST_FOR_EACH_SAFE(cur, cur2, &stg->storageHead) { LIST_FOR_EACH_SAFE(cur, cur2, &stg->storageHead) {
childstg = LIST_ENTRY(cur,StorageInternalImpl,ParentListEntry); childstg = LIST_ENTRY(cur,StorageInternalImpl,ParentListEntry);
StorageInternalImpl_Invalidate( childstg ); StorageBaseImpl_Invalidate( &childstg->base );
} }
} }
@ -1913,7 +1913,7 @@ static HRESULT deleteStorageContents(
{ {
if (stg->base.storageDirEntry == indexToDelete) if (stg->base.storageDirEntry == indexToDelete)
{ {
StorageInternalImpl_Invalidate(stg); StorageBaseImpl_Invalidate(&stg->base);
} }
} }
@ -2413,6 +2413,7 @@ static const IStorageVtbl Storage32Impl_Vtbl =
static const StorageBaseImplVtbl StorageImpl_BaseVtbl = static const StorageBaseImplVtbl StorageImpl_BaseVtbl =
{ {
StorageImpl_Destroy, StorageImpl_Destroy,
StorageImpl_Invalidate,
StorageImpl_CreateDirEntry, StorageImpl_CreateDirEntry,
StorageImpl_BaseWriteDirEntry, StorageImpl_BaseWriteDirEntry,
StorageImpl_BaseReadDirEntry, StorageImpl_BaseReadDirEntry,
@ -2652,12 +2653,21 @@ end:
return hr; return hr;
} }
static void StorageImpl_Invalidate(StorageBaseImpl* iface)
{
StorageImpl *This = (StorageImpl*) iface;
StorageBaseImpl_DeleteAll(&This->base);
This->base.reverted = 1;
}
static void StorageImpl_Destroy(StorageBaseImpl* iface) static void StorageImpl_Destroy(StorageBaseImpl* iface)
{ {
StorageImpl *This = (StorageImpl*) iface; StorageImpl *This = (StorageImpl*) iface;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
StorageBaseImpl_DeleteAll(&This->base); StorageImpl_Invalidate(iface);
HeapFree(GetProcessHeap(), 0, This->pwcsName); HeapFree(GetProcessHeap(), 0, This->pwcsName);
@ -3812,8 +3822,10 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks(
return SmallBlockChainStream_Construct(This, NULL, streamEntryRef); return SmallBlockChainStream_Construct(This, NULL, streamEntryRef);
} }
static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ) static void StorageInternalImpl_Invalidate( StorageBaseImpl *base )
{ {
StorageInternalImpl* This = (StorageInternalImpl*) base;
if (!This->base.reverted) if (!This->base.reverted)
{ {
TRACE("Storage invalidated (stg=%p)\n", This); TRACE("Storage invalidated (stg=%p)\n", This);
@ -3832,7 +3844,7 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface)
{ {
StorageInternalImpl* This = (StorageInternalImpl*) iface; StorageInternalImpl* This = (StorageInternalImpl*) iface;
StorageInternalImpl_Invalidate(This); StorageInternalImpl_Invalidate(&This->base);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
@ -4343,6 +4355,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl =
static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl =
{ {
StorageInternalImpl_Destroy, StorageInternalImpl_Destroy,
StorageInternalImpl_Invalidate,
StorageInternalImpl_CreateDirEntry, StorageInternalImpl_CreateDirEntry,
StorageInternalImpl_WriteDirEntry, StorageInternalImpl_WriteDirEntry,
StorageInternalImpl_ReadDirEntry, StorageInternalImpl_ReadDirEntry,

6
dlls/ole32/storage32.h
View File

@ -248,6 +248,7 @@ struct StorageBaseImpl
/* virtual methods for StorageBaseImpl objects */ /* virtual methods for StorageBaseImpl objects */
struct StorageBaseImplVtbl { struct StorageBaseImplVtbl {
void (*Destroy)(StorageBaseImpl*); void (*Destroy)(StorageBaseImpl*);
void (*Invalidate)(StorageBaseImpl*);
HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*);
HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*);
HRESULT (*ReadDirEntry)(StorageBaseImpl*,DirRef,DirEntry*); HRESULT (*ReadDirEntry)(StorageBaseImpl*,DirRef,DirEntry*);
@ -262,6 +263,11 @@ static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This)
This->baseVtbl->Destroy(This); This->baseVtbl->Destroy(This);
} }
static inline void StorageBaseImpl_Invalidate(StorageBaseImpl *This)
{
This->baseVtbl->Invalidate(This);
}
static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This, static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This,
const DirEntry *newData, DirRef *index) const DirEntry *newData, DirRef *index)
{ {