Commit 176cdfc7 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

ole32: Add WriteDirEntry to the storage vtable.

parent 8a332db2
...@@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( ...@@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, StorageBaseImpl_WriteDirEntry(This->parentStorage,
This->dirEntry, This->dirEntry,
&currentEntry); &currentEntry);
} }
......
...@@ -775,7 +775,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( ...@@ -775,7 +775,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
/* Change the name of the element */ /* Change the name of the element */
strcpyW(currentEntry.name, pwcsNewName); strcpyW(currentEntry.name, pwcsNewName);
StorageImpl_WriteDirEntry(This->ancestorStorage, currentEntryRef, StorageBaseImpl_WriteDirEntry(This, currentEntryRef,
&currentEntry); &currentEntry);
/* Insert the element in a new position in the tree */ /* Insert the element in a new position in the tree */
...@@ -971,9 +971,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( ...@@ -971,9 +971,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass(
{ {
currentEntry.clsid = *clsid; currentEntry.clsid = *clsid;
hRes = StorageImpl_WriteDirEntry(This->ancestorStorage, hRes = StorageBaseImpl_WriteDirEntry(This,
This->storageDirEntry, This->storageDirEntry,
&currentEntry); &currentEntry);
} }
return hRes; return hRes;
...@@ -2182,6 +2182,13 @@ static HRESULT WINAPI StorageBaseImpl_SetStateBits( ...@@ -2182,6 +2182,13 @@ static HRESULT WINAPI StorageBaseImpl_SetStateBits(
return S_OK; 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. * Virtual function table for the IStorage32Impl class.
*/ */
...@@ -2210,7 +2217,8 @@ static const IStorageVtbl Storage32Impl_Vtbl = ...@@ -2210,7 +2217,8 @@ static const IStorageVtbl Storage32Impl_Vtbl =
static const StorageBaseImplVtbl StorageImpl_BaseVtbl = static const StorageBaseImplVtbl StorageImpl_BaseVtbl =
{ {
StorageImpl_Destroy, StorageImpl_Destroy,
StorageImpl_CreateDirEntry StorageImpl_CreateDirEntry,
StorageImpl_BaseWriteDirEntry
}; };
static HRESULT StorageImpl_Construct( static HRESULT StorageImpl_Construct(
...@@ -3634,6 +3642,13 @@ static HRESULT StorageInternalImpl_CreateDirEntry(StorageBaseImpl *base, ...@@ -3634,6 +3642,13 @@ static HRESULT StorageInternalImpl_CreateDirEntry(StorageBaseImpl *base,
newData, index); newData, index);
} }
static HRESULT StorageInternalImpl_WriteDirEntry(StorageBaseImpl *base,
DirRef index, const DirEntry *data)
{
return StorageBaseImpl_WriteDirEntry(&base->ancestorStorage->base,
index, data);
}
/****************************************************************************** /******************************************************************************
** **
** Storage32InternalImpl_Commit ** Storage32InternalImpl_Commit
...@@ -4077,7 +4092,8 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = ...@@ -4077,7 +4092,8 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl =
static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl =
{ {
StorageInternalImpl_Destroy, StorageInternalImpl_Destroy,
StorageInternalImpl_CreateDirEntry StorageInternalImpl_CreateDirEntry,
StorageInternalImpl_WriteDirEntry
}; };
/****************************************************************************** /******************************************************************************
......
...@@ -249,6 +249,7 @@ struct StorageBaseImpl ...@@ -249,6 +249,7 @@ struct StorageBaseImpl
struct StorageBaseImplVtbl { struct StorageBaseImplVtbl {
void (*Destroy)(StorageBaseImpl*); void (*Destroy)(StorageBaseImpl*);
HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*);
HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*);
}; };
static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This)
...@@ -262,6 +263,12 @@ static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This, ...@@ -262,6 +263,12 @@ static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This,
return This->baseVtbl->CreateDirEntry(This, newData, index); 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 * StorageBaseImpl stream list handlers
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment