reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 14:40:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ole32: Add WriteDirEntry to the storage vtable.

Browse Source
This commit is contained in:
Vincent Povirk 2009-11-25 16:53:05 -06:00 committed by Alexandre Julliard
parent 8a332db2c5
commit 176cdfc75e
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ole32/stg_stream.c
View File

@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
if (SUCCEEDED(hr))
{
StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage,
StorageBaseImpl_WriteDirEntry(This->parentStorage,
This->dirEntry,
&currentEntry);
}

28
dlls/ole32/storage32.c
View File

@ -775,7 +775,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
/* Change the name of the element */
strcpyW(currentEntry.name, pwcsNewName);
StorageImpl_WriteDirEntry(This->ancestorStorage, currentEntryRef,
StorageBaseImpl_WriteDirEntry(This, currentEntryRef,
&currentEntry);
/* Insert the element in a new position in the tree */
@ -971,9 +971,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass(
{
currentEntry.clsid = *clsid;
hRes = StorageImpl_WriteDirEntry(This->ancestorStorage,
This->storageDirEntry,
&currentEntry);
hRes = StorageBaseImpl_WriteDirEntry(This,
This->storageDirEntry,
&currentEntry);
}
return hRes;
@ -2182,6 +2182,13 @@ static HRESULT WINAPI StorageBaseImpl_SetStateBits(
return S_OK;
}
static HRESULT StorageImpl_BaseWriteDirEntry(StorageBaseImpl *base,
DirRef index, const DirEntry *data)
{
StorageImpl *This = (StorageImpl*)base;
return StorageImpl_WriteDirEntry(This, index, data);
}
/*
* Virtual function table for the IStorage32Impl class.
*/
@ -2210,7 +2217,8 @@ static const IStorageVtbl Storage32Impl_Vtbl =
static const StorageBaseImplVtbl StorageImpl_BaseVtbl =
{
StorageImpl_Destroy,
StorageImpl_CreateDirEntry
StorageImpl_CreateDirEntry,
StorageImpl_BaseWriteDirEntry
};
static HRESULT StorageImpl_Construct(
@ -3634,6 +3642,13 @@ static HRESULT StorageInternalImpl_CreateDirEntry(StorageBaseImpl *base,
newData, index);
}
static HRESULT StorageInternalImpl_WriteDirEntry(StorageBaseImpl *base,
DirRef index, const DirEntry *data)
{
return StorageBaseImpl_WriteDirEntry(&base->ancestorStorage->base,
index, data);
}
/******************************************************************************
**
** Storage32InternalImpl_Commit
@ -4077,7 +4092,8 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl =
static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl =
{
StorageInternalImpl_Destroy,
StorageInternalImpl_CreateDirEntry
StorageInternalImpl_CreateDirEntry,
StorageInternalImpl_WriteDirEntry
};
/******************************************************************************

7
dlls/ole32/storage32.h
View File

@ -249,6 +249,7 @@ struct StorageBaseImpl
struct StorageBaseImplVtbl {
void (*Destroy)(StorageBaseImpl*);
HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*);
HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*);
};
static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This)
@ -262,6 +263,12 @@ static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This,
return This->baseVtbl->CreateDirEntry(This, newData, index);
}
static inline HRESULT StorageBaseImpl_WriteDirEntry(StorageBaseImpl *This,
DirRef index, const DirEntry *data)
{
return This->baseVtbl->WriteDirEntry(This, index, data);
}
/****************************************************************************
* StorageBaseImpl stream list handlers
*/