Commit 518ee99f authored by Alexandre Julliard's avatar Alexandre Julliard

ole32: Make some functions and variables static.

parent 0b8c8035
...@@ -82,7 +82,7 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ ...@@ -82,7 +82,7 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */
static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk);
static void COM_RevokeAllClasses(void); static void COM_RevokeAllClasses(void);
APARTMENT *MTA; /* protected by csApartment */ static APARTMENT *MTA; /* protected by csApartment */
static struct list apts = LIST_INIT( apts ); /* protected by csApartment */ static struct list apts = LIST_INIT( apts ); /* protected by csApartment */
static CRITICAL_SECTION csApartment; static CRITICAL_SECTION csApartment;
......
...@@ -171,7 +171,6 @@ struct oletls ...@@ -171,7 +171,6 @@ struct oletls
/* Global Interface Table Functions */ /* Global Interface Table Functions */
extern void* StdGlobalInterfaceTable_Construct(void); extern void* StdGlobalInterfaceTable_Construct(void);
extern void StdGlobalInterfaceTable_Destroy(void* self);
extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv); extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv);
extern void* StdGlobalInterfaceTableInstance; extern void* StdGlobalInterfaceTableInstance;
......
...@@ -94,7 +94,8 @@ static CRITICAL_SECTION git_section = { &critsect_debug, -1, 0, 0, 0, 0 }; ...@@ -94,7 +94,8 @@ static CRITICAL_SECTION git_section = { &critsect_debug, -1, 0, 0, 0, 0 };
/** This destroys it again. It should revoke all the held interfaces first **/ /** This destroys it again. It should revoke all the held interfaces first **/
void StdGlobalInterfaceTable_Destroy(void* self) { static void StdGlobalInterfaceTable_Destroy(void* self)
{
TRACE("(%p)\n", self); TRACE("(%p)\n", self);
FIXME("Revoke held interfaces here\n"); FIXME("Revoke held interfaces here\n");
......
...@@ -129,13 +129,13 @@ static void OLEUTL_ReadRegistryDWORDValue(HKEY regKey, DWORD* pdwValue); ...@@ -129,13 +129,13 @@ static void OLEUTL_ReadRegistryDWORDValue(HKEY regKey, DWORD* pdwValue);
*/ */
static void OLEMenu_Initialize(void); static void OLEMenu_Initialize(void);
static void OLEMenu_UnInitialize(void); static void OLEMenu_UnInitialize(void);
BOOL OLEMenu_InstallHooks( DWORD tid ); static BOOL OLEMenu_InstallHooks( DWORD tid );
BOOL OLEMenu_UnInstallHooks( DWORD tid ); static BOOL OLEMenu_UnInstallHooks( DWORD tid );
OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid ); static OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid );
static BOOL OLEMenu_FindMainMenuIndex( HMENU hMainMenu, HMENU hPopupMenu, UINT *pnPos ); static BOOL OLEMenu_FindMainMenuIndex( HMENU hMainMenu, HMENU hPopupMenu, UINT *pnPos );
BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDescriptor ); static BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDescriptor );
LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lParam);
LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam);
/****************************************************************************** /******************************************************************************
* These are the prototypes of the OLE Clipboard initialization methods (in clipboard.c) * These are the prototypes of the OLE Clipboard initialization methods (in clipboard.c)
...@@ -1103,7 +1103,7 @@ HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCl ...@@ -1103,7 +1103,7 @@ HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCl
* *
* Initializes the OLEMENU data structures. * Initializes the OLEMENU data structures.
*/ */
static void OLEMenu_Initialize() static void OLEMenu_Initialize(void)
{ {
} }
...@@ -1112,7 +1112,7 @@ static void OLEMenu_Initialize() ...@@ -1112,7 +1112,7 @@ static void OLEMenu_Initialize()
* *
* Releases the OLEMENU data structures. * Releases the OLEMENU data structures.
*/ */
static void OLEMenu_UnInitialize() static void OLEMenu_UnInitialize(void)
{ {
} }
...@@ -1123,7 +1123,7 @@ static void OLEMenu_UnInitialize() ...@@ -1123,7 +1123,7 @@ static void OLEMenu_UnInitialize()
* RETURNS: TRUE if message hooks were successfully installed * RETURNS: TRUE if message hooks were successfully installed
* FALSE on failure * FALSE on failure
*/ */
BOOL OLEMenu_InstallHooks( DWORD tid ) static BOOL OLEMenu_InstallHooks( DWORD tid )
{ {
OleMenuHookItem *pHookItem = NULL; OleMenuHookItem *pHookItem = NULL;
...@@ -1172,7 +1172,7 @@ CLEANUP: ...@@ -1172,7 +1172,7 @@ CLEANUP:
* RETURNS: TRUE if message hooks were successfully installed * RETURNS: TRUE if message hooks were successfully installed
* FALSE on failure * FALSE on failure
*/ */
BOOL OLEMenu_UnInstallHooks( DWORD tid ) static BOOL OLEMenu_UnInstallHooks( DWORD tid )
{ {
OleMenuHookItem *pHookItem = NULL; OleMenuHookItem *pHookItem = NULL;
OleMenuHookItem **ppHook = &hook_list; OleMenuHookItem **ppHook = &hook_list;
...@@ -1214,7 +1214,7 @@ CLEANUP: ...@@ -1214,7 +1214,7 @@ CLEANUP:
* RETURNS: The pointer and index of the hook table entry for the tid * RETURNS: The pointer and index of the hook table entry for the tid
* NULL and -1 for the index if no hooks were installed for this thread * NULL and -1 for the index if no hooks were installed for this thread
*/ */
OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid ) static OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid )
{ {
OleMenuHookItem *pHookItem = NULL; OleMenuHookItem *pHookItem = NULL;
...@@ -1280,7 +1280,7 @@ static BOOL OLEMenu_FindMainMenuIndex( HMENU hMainMenu, HMENU hPopupMenu, UINT * ...@@ -1280,7 +1280,7 @@ static BOOL OLEMenu_FindMainMenuIndex( HMENU hMainMenu, HMENU hPopupMenu, UINT *
* RETURNS: TRUE if the popup menu is part of a server owned group * RETURNS: TRUE if the popup menu is part of a server owned group
* FALSE if the popup menu is part of a container owned group * FALSE if the popup menu is part of a container owned group
*/ */
BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDescriptor ) static BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDescriptor )
{ {
UINT nPos = 0, nWidth, i; UINT nPos = 0, nWidth, i;
...@@ -1319,7 +1319,7 @@ BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDescriptor ...@@ -1319,7 +1319,7 @@ BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDescriptor
* Thread scope WH_CALLWNDPROC hook proc filter function (callback) * Thread scope WH_CALLWNDPROC hook proc filter function (callback)
* This is invoked from a message hook installed in OleSetMenuDescriptor. * This is invoked from a message hook installed in OleSetMenuDescriptor.
*/ */
LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lParam)
{ {
LPCWPSTRUCT pMsg = NULL; LPCWPSTRUCT pMsg = NULL;
HOLEMENU hOleMenu = 0; HOLEMENU hOleMenu = 0;
...@@ -1424,7 +1424,7 @@ NEXTHOOK: ...@@ -1424,7 +1424,7 @@ NEXTHOOK:
* Thread scope WH_GETMESSAGE hook proc filter function (callback) * Thread scope WH_GETMESSAGE hook proc filter function (callback)
* This is invoked from a message hook installed in OleSetMenuDescriptor. * This is invoked from a message hook installed in OleSetMenuDescriptor.
*/ */
LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam)
{ {
LPMSG pMsg = NULL; LPMSG pMsg = NULL;
HOLEMENU hOleMenu = 0; HOLEMENU hOleMenu = 0;
......
...@@ -64,6 +64,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); ...@@ -64,6 +64,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage);
static const char rootPropertyName[] = "Root Entry"; static const char rootPropertyName[] = "Root Entry";
/****************************************************************************
* Storage32InternalImpl definitions.
*
* Definition of the implementation structure for the IStorage32 interface.
* This one implements the IStorage32 interface for storage that are
* inside another storage.
*/
struct StorageInternalImpl
{
struct StorageBaseImpl base;
/*
* There is no specific data for this class.
*/
};
typedef struct StorageInternalImpl StorageInternalImpl;
/* Method definitions for the Storage32InternalImpl class. */
static StorageInternalImpl* StorageInternalImpl_Construct(StorageImpl* ancestorStorage,
DWORD openFlags, ULONG rootTropertyIndex);
static void StorageImpl_Destroy(StorageBaseImpl* iface);
static void* StorageImpl_GetBigBlock(StorageImpl* This, ULONG blockIndex);
static void* StorageImpl_GetROBigBlock(StorageImpl* This, ULONG blockIndex);
static void StorageImpl_ReleaseBigBlock(StorageImpl* This, void* pBigBlock);
static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer);
static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer);
static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock);
static HRESULT StorageImpl_LoadFileHeader(StorageImpl* This);
static void StorageImpl_SaveFileHeader(StorageImpl* This);
static void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm);
static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex);
static ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This);
static ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex);
static ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex);
static void Storage32Impl_SetExtDepotBlock(StorageImpl* This, ULONG depotIndex, ULONG blockIndex);
static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This);
static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This);
static ULONG BlockChainStream_GetCount(BlockChainStream* This);
static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* 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 */
...@@ -166,6 +209,44 @@ static DWORD GetCreationModeFromSTGM(DWORD stgm); ...@@ -166,6 +209,44 @@ static DWORD GetCreationModeFromSTGM(DWORD stgm);
extern const IPropertySetStorageVtbl IPropertySetStorage_Vtbl; extern const IPropertySetStorageVtbl IPropertySetStorage_Vtbl;
/****************************************************************************
* IEnumSTATSTGImpl definitions.
*
* Definition of the implementation structure for the IEnumSTATSTGImpl interface.
* This class allows iterating through the content of a storage and to find
* specific items inside it.
*/
struct IEnumSTATSTGImpl
{
const IEnumSTATSTGVtbl *lpVtbl; /* Needs to be the first item in the struct
* since we want to cast this in an IEnumSTATSTG pointer */
LONG ref; /* Reference count */
StorageImpl* parentStorage; /* Reference to the parent storage */
ULONG firstPropertyNode; /* Index of the root of the storage to enumerate */
/*
* The current implementation of the IEnumSTATSTGImpl class uses a stack
* to walk the property sets to get the content of a storage. This stack
* is implemented by the following 3 data members
*/
ULONG stackSize;
ULONG stackMaxSize;
ULONG* stackToVisit;
#define ENUMSTATSGT_SIZE_INCREMENT 10
};
static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageImpl* This, ULONG firstPropertyNode);
static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This);
static void IEnumSTATSTGImpl_PushSearchNode(IEnumSTATSTGImpl* This, ULONG nodeToPush);
static ULONG IEnumSTATSTGImpl_PopSearchNode(IEnumSTATSTGImpl* This, BOOL remove);
static ULONG IEnumSTATSTGImpl_FindProperty(IEnumSTATSTGImpl* This, const OLECHAR* lpszPropName,
StgProperty* buffer);
static INT IEnumSTATSTGImpl_FindParentProperty(IEnumSTATSTGImpl *This, ULONG childProperty,
StgProperty *currentProperty, ULONG *propertyId);
/************************************************************************ /************************************************************************
** Storage32BaseImpl implementatiion ** Storage32BaseImpl implementatiion
...@@ -1675,7 +1756,7 @@ static HRESULT WINAPI StorageImpl_DestroyElement( ...@@ -1675,7 +1756,7 @@ static HRESULT WINAPI StorageImpl_DestroyElement(
StgProperty parentProperty; StgProperty parentProperty;
ULONG foundPropertyIndexToDelete; ULONG foundPropertyIndexToDelete;
ULONG typeOfRelation; ULONG typeOfRelation;
ULONG parentPropertyId; ULONG parentPropertyId = 0;
TRACE("(%p, %s)\n", TRACE("(%p, %s)\n",
iface, debugstr_w(pwcsName)); iface, debugstr_w(pwcsName));
...@@ -1814,7 +1895,7 @@ static HRESULT WINAPI StorageImpl_Stat( IStorage* iface, ...@@ -1814,7 +1895,7 @@ static HRESULT WINAPI StorageImpl_Stat( IStorage* iface,
* Internal stream list handlers * Internal stream list handlers
*/ */
void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm) static void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm)
{ {
TRACE("Stream added (stg=%p strm=%p)\n", stg, strm); TRACE("Stream added (stg=%p strm=%p)\n", stg, strm);
list_add_tail(&stg->strmHead,&strm->StrmListEntry); list_add_tail(&stg->strmHead,&strm->StrmListEntry);
...@@ -1826,7 +1907,7 @@ void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm) ...@@ -1826,7 +1907,7 @@ void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm)
list_remove(&(strm->StrmListEntry)); list_remove(&(strm->StrmListEntry));
} }
void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg)
{ {
struct list *cur, *cur2; struct list *cur, *cur2;
StgStreamImpl *strm=NULL; StgStreamImpl *strm=NULL;
...@@ -2277,7 +2358,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = ...@@ -2277,7 +2358,7 @@ static const IStorageVtbl Storage32Impl_Vtbl =
StorageImpl_Stat StorageImpl_Stat
}; };
HRESULT StorageImpl_Construct( static HRESULT StorageImpl_Construct(
StorageImpl* This, StorageImpl* This,
HANDLE hFile, HANDLE hFile,
LPCOLESTR pwcsName, LPCOLESTR pwcsName,
...@@ -2490,7 +2571,7 @@ HRESULT StorageImpl_Construct( ...@@ -2490,7 +2571,7 @@ HRESULT StorageImpl_Construct(
return hr; return hr;
} }
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);
...@@ -2514,7 +2595,7 @@ void StorageImpl_Destroy(StorageBaseImpl* iface) ...@@ -2514,7 +2595,7 @@ void StorageImpl_Destroy(StorageBaseImpl* iface)
* If the big block depot is filled, this method will enlarge it. * If the big block depot is filled, this method will enlarge it.
* *
*/ */
ULONG StorageImpl_GetNextFreeBigBlock( static ULONG StorageImpl_GetNextFreeBigBlock(
StorageImpl* This) StorageImpl* This)
{ {
ULONG depotBlockIndexPos; ULONG depotBlockIndexPos;
...@@ -2647,7 +2728,7 @@ ULONG StorageImpl_GetNextFreeBigBlock( ...@@ -2647,7 +2728,7 @@ ULONG StorageImpl_GetNextFreeBigBlock(
* This will create a depot block, essentially it is a block initialized * This will create a depot block, essentially it is a block initialized
* to BLOCK_UNUSEDs. * to BLOCK_UNUSEDs.
*/ */
void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex) static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex)
{ {
BYTE* blockBuffer; BYTE* blockBuffer;
...@@ -2668,7 +2749,7 @@ void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex) ...@@ -2668,7 +2749,7 @@ void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex)
* index. This method is only for depot indexes equal or greater than * index. This method is only for depot indexes equal or greater than
* COUNT_BBDEPOTINHEADER. * COUNT_BBDEPOTINHEADER.
*/ */
ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex) static ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex)
{ {
ULONG depotBlocksPerExtBlock = (This->bigBlockSize / sizeof(ULONG)) - 1; ULONG depotBlocksPerExtBlock = (This->bigBlockSize / sizeof(ULONG)) - 1;
ULONG numExtBlocks = depotIndex - COUNT_BBDEPOTINHEADER; ULONG numExtBlocks = depotIndex - COUNT_BBDEPOTINHEADER;
...@@ -2714,9 +2795,7 @@ ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex) ...@@ -2714,9 +2795,7 @@ ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex)
* This method is only for depot indexes equal or greater than * This method is only for depot indexes equal or greater than
* COUNT_BBDEPOTINHEADER. * COUNT_BBDEPOTINHEADER.
*/ */
void Storage32Impl_SetExtDepotBlock(StorageImpl* This, static void Storage32Impl_SetExtDepotBlock(StorageImpl* This, ULONG depotIndex, ULONG blockIndex)
ULONG depotIndex,
ULONG blockIndex)
{ {
ULONG depotBlocksPerExtBlock = (This->bigBlockSize / sizeof(ULONG)) - 1; ULONG depotBlocksPerExtBlock = (This->bigBlockSize / sizeof(ULONG)) - 1;
ULONG numExtBlocks = depotIndex - COUNT_BBDEPOTINHEADER; ULONG numExtBlocks = depotIndex - COUNT_BBDEPOTINHEADER;
...@@ -2754,7 +2833,7 @@ void Storage32Impl_SetExtDepotBlock(StorageImpl* This, ...@@ -2754,7 +2833,7 @@ void Storage32Impl_SetExtDepotBlock(StorageImpl* This,
* *
* Creates an extended depot block. * Creates an extended depot block.
*/ */
ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This) static ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This)
{ {
ULONG numExtBlocks = This->extBigBlockDepotCount; ULONG numExtBlocks = This->extBigBlockDepotCount;
ULONG nextExtBlock = This->extBigBlockDepotStart; ULONG nextExtBlock = This->extBigBlockDepotStart;
...@@ -2808,7 +2887,7 @@ ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This) ...@@ -2808,7 +2887,7 @@ ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This)
* *
* This method will flag the specified block as free in the big block depot. * This method will flag the specified block as free in the big block depot.
*/ */
void StorageImpl_FreeBigBlock( static void StorageImpl_FreeBigBlock(
StorageImpl* This, StorageImpl* This,
ULONG blockIndex) ULONG blockIndex)
{ {
...@@ -2842,7 +2921,7 @@ void StorageImpl_FreeBigBlock( ...@@ -2842,7 +2921,7 @@ void StorageImpl_FreeBigBlock(
* *
* See Windows documentation for more details on IStorage methods. * See Windows documentation for more details on IStorage methods.
*/ */
HRESULT StorageImpl_GetNextBlockInChain( static HRESULT StorageImpl_GetNextBlockInChain(
StorageImpl* This, StorageImpl* This,
ULONG blockIndex, ULONG blockIndex,
ULONG* nextBlockIndex) ULONG* nextBlockIndex)
...@@ -2915,7 +2994,7 @@ HRESULT StorageImpl_GetNextBlockInChain( ...@@ -2915,7 +2994,7 @@ HRESULT StorageImpl_GetNextBlockInChain(
* - BLOCK_UNUSED: there is no next extended block. * - BLOCK_UNUSED: there is no next extended block.
* - Any other return values denotes failure. * - Any other return values denotes failure.
*/ */
ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex) static ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex)
{ {
ULONG nextBlockIndex = BLOCK_SPECIAL; ULONG nextBlockIndex = BLOCK_SPECIAL;
ULONG depotBlockOffset = This->bigBlockSize - sizeof(ULONG); ULONG depotBlockOffset = This->bigBlockSize - sizeof(ULONG);
...@@ -2947,7 +3026,7 @@ ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex) ...@@ -2947,7 +3026,7 @@ ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex)
* Storage32Impl_SetNextBlockInChain(This, 7, BLOCK_END_OF_CHAIN); * Storage32Impl_SetNextBlockInChain(This, 7, BLOCK_END_OF_CHAIN);
* *
*/ */
void StorageImpl_SetNextBlockInChain( static void StorageImpl_SetNextBlockInChain(
StorageImpl* This, StorageImpl* This,
ULONG blockIndex, ULONG blockIndex,
ULONG nextBlock) ULONG nextBlock)
...@@ -2995,7 +3074,7 @@ void StorageImpl_SetNextBlockInChain( ...@@ -2995,7 +3074,7 @@ void StorageImpl_SetNextBlockInChain(
* *
* This method will read in the file header, i.e. big block index -1. * This method will read in the file header, i.e. big block index -1.
*/ */
HRESULT StorageImpl_LoadFileHeader( static HRESULT StorageImpl_LoadFileHeader(
StorageImpl* This) StorageImpl* This)
{ {
HRESULT hr = STG_E_FILENOTFOUND; HRESULT hr = STG_E_FILENOTFOUND;
...@@ -3113,7 +3192,7 @@ HRESULT StorageImpl_LoadFileHeader( ...@@ -3113,7 +3192,7 @@ HRESULT StorageImpl_LoadFileHeader(
* *
* This method will save to the file the header, i.e. big block -1. * This method will save to the file the header, i.e. big block -1.
*/ */
void StorageImpl_SaveFileHeader( static void StorageImpl_SaveFileHeader(
StorageImpl* This) StorageImpl* This)
{ {
BYTE headerBigBlock[BIG_BLOCK_SIZE]; BYTE headerBigBlock[BIG_BLOCK_SIZE];
...@@ -3396,7 +3475,7 @@ BOOL StorageImpl_WriteProperty( ...@@ -3396,7 +3475,7 @@ BOOL StorageImpl_WriteProperty(
return writeSuccessful; return writeSuccessful;
} }
BOOL StorageImpl_ReadBigBlock( static BOOL StorageImpl_ReadBigBlock(
StorageImpl* This, StorageImpl* This,
ULONG blockIndex, ULONG blockIndex,
void* buffer) void* buffer)
...@@ -3417,7 +3496,7 @@ BOOL StorageImpl_ReadBigBlock( ...@@ -3417,7 +3496,7 @@ BOOL StorageImpl_ReadBigBlock(
return FALSE; return FALSE;
} }
BOOL StorageImpl_WriteBigBlock( static BOOL StorageImpl_WriteBigBlock(
StorageImpl* This, StorageImpl* This,
ULONG blockIndex, ULONG blockIndex,
void* buffer) void* buffer)
...@@ -3438,21 +3517,21 @@ BOOL StorageImpl_WriteBigBlock( ...@@ -3438,21 +3517,21 @@ BOOL StorageImpl_WriteBigBlock(
return FALSE; return FALSE;
} }
void* StorageImpl_GetROBigBlock( static void* StorageImpl_GetROBigBlock(
StorageImpl* This, StorageImpl* This,
ULONG blockIndex) ULONG blockIndex)
{ {
return BIGBLOCKFILE_GetROBigBlock(This->bigBlockFile, blockIndex); return BIGBLOCKFILE_GetROBigBlock(This->bigBlockFile, blockIndex);
} }
void* StorageImpl_GetBigBlock( static void* StorageImpl_GetBigBlock(
StorageImpl* This, StorageImpl* This,
ULONG blockIndex) ULONG blockIndex)
{ {
return BIGBLOCKFILE_GetBigBlock(This->bigBlockFile, blockIndex); return BIGBLOCKFILE_GetBigBlock(This->bigBlockFile, blockIndex);
} }
void StorageImpl_ReleaseBigBlock( static void StorageImpl_ReleaseBigBlock(
StorageImpl* This, StorageImpl* This,
void* pBigBlock) void* pBigBlock)
{ {
...@@ -3568,7 +3647,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( ...@@ -3568,7 +3647,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
return bigBlockChain; return bigBlockChain;
} }
void StorageInternalImpl_Destroy( StorageBaseImpl *iface) static void StorageInternalImpl_Destroy( StorageBaseImpl *iface)
{ {
StorageInternalImpl* This = (StorageInternalImpl*) iface; StorageInternalImpl* This = (StorageInternalImpl*) iface;
...@@ -3603,7 +3682,7 @@ static HRESULT WINAPI StorageInternalImpl_Revert( ...@@ -3603,7 +3682,7 @@ static HRESULT WINAPI StorageInternalImpl_Revert(
return S_OK; return S_OK;
} }
void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This) static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This)
{ {
IStorage_Release((IStorage*)This->parentStorage); IStorage_Release((IStorage*)This->parentStorage);
HeapFree(GetProcessHeap(), 0, This->stackToVisit); HeapFree(GetProcessHeap(), 0, This->stackToVisit);
...@@ -3881,7 +3960,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( ...@@ -3881,7 +3960,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone(
return S_OK; return S_OK;
} }
INT IEnumSTATSTGImpl_FindParentProperty( static INT IEnumSTATSTGImpl_FindParentProperty(
IEnumSTATSTGImpl *This, IEnumSTATSTGImpl *This,
ULONG childProperty, ULONG childProperty,
StgProperty *currentProperty, StgProperty *currentProperty,
...@@ -3946,7 +4025,7 @@ INT IEnumSTATSTGImpl_FindParentProperty( ...@@ -3946,7 +4025,7 @@ INT IEnumSTATSTGImpl_FindParentProperty(
return PROPERTY_NULL; return PROPERTY_NULL;
} }
ULONG IEnumSTATSTGImpl_FindProperty( static ULONG IEnumSTATSTGImpl_FindProperty(
IEnumSTATSTGImpl* This, IEnumSTATSTGImpl* This,
const OLECHAR* lpszPropName, const OLECHAR* lpszPropName,
StgProperty* currentProperty) StgProperty* currentProperty)
...@@ -3991,7 +4070,7 @@ ULONG IEnumSTATSTGImpl_FindProperty( ...@@ -3991,7 +4070,7 @@ ULONG IEnumSTATSTGImpl_FindProperty(
return PROPERTY_NULL; return PROPERTY_NULL;
} }
void IEnumSTATSTGImpl_PushSearchNode( static void IEnumSTATSTGImpl_PushSearchNode(
IEnumSTATSTGImpl* This, IEnumSTATSTGImpl* This,
ULONG nodeToPush) ULONG nodeToPush)
{ {
...@@ -4040,7 +4119,7 @@ void IEnumSTATSTGImpl_PushSearchNode( ...@@ -4040,7 +4119,7 @@ void IEnumSTATSTGImpl_PushSearchNode(
} }
} }
ULONG IEnumSTATSTGImpl_PopSearchNode( static ULONG IEnumSTATSTGImpl_PopSearchNode(
IEnumSTATSTGImpl* This, IEnumSTATSTGImpl* This,
BOOL remove) BOOL remove)
{ {
...@@ -4075,7 +4154,7 @@ static const IEnumSTATSTGVtbl IEnumSTATSTGImpl_Vtbl = ...@@ -4075,7 +4154,7 @@ static const IEnumSTATSTGVtbl IEnumSTATSTGImpl_Vtbl =
** IEnumSTATSTGImpl implementation ** IEnumSTATSTGImpl implementation
*/ */
IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(
StorageImpl* parentStorage, StorageImpl* parentStorage,
ULONG firstPropertyNode) ULONG firstPropertyNode)
{ {
...@@ -4146,7 +4225,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = ...@@ -4146,7 +4225,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl =
** Storage32InternalImpl implementation ** Storage32InternalImpl implementation
*/ */
StorageInternalImpl* StorageInternalImpl_Construct( static StorageInternalImpl* StorageInternalImpl_Construct(
StorageImpl* ancestorStorage, StorageImpl* ancestorStorage,
DWORD openFlags, DWORD openFlags,
ULONG rootPropertyIndex) ULONG rootPropertyIndex)
...@@ -4373,7 +4452,7 @@ void BlockChainStream_Destroy(BlockChainStream* This) ...@@ -4373,7 +4452,7 @@ void BlockChainStream_Destroy(BlockChainStream* This)
* This->headOfStreamPlaceHolder. * This->headOfStreamPlaceHolder.
* *
*/ */
ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This)
{ {
StgProperty chainProperty; StgProperty chainProperty;
BOOL readSuccessful; BOOL readSuccessful;
...@@ -4404,7 +4483,7 @@ ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) ...@@ -4404,7 +4483,7 @@ ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This)
* This is not the size of the stream as the last block may not be full! * This is not the size of the stream as the last block may not be full!
* *
*/ */
ULONG BlockChainStream_GetCount(BlockChainStream* This) static ULONG BlockChainStream_GetCount(BlockChainStream* This)
{ {
ULONG blockIndex; ULONG blockIndex;
ULONG count = 0; ULONG count = 0;
...@@ -4611,7 +4690,7 @@ BOOL BlockChainStream_WriteAt(BlockChainStream* This, ...@@ -4611,7 +4690,7 @@ BOOL BlockChainStream_WriteAt(BlockChainStream* This,
* *
* Shrinks this chain in the big block depot. * Shrinks this chain in the big block depot.
*/ */
BOOL BlockChainStream_Shrink(BlockChainStream* This, static BOOL BlockChainStream_Shrink(BlockChainStream* This,
ULARGE_INTEGER newSize) ULARGE_INTEGER newSize)
{ {
ULONG blockIndex, extraBlock; ULONG blockIndex, extraBlock;
...@@ -4679,7 +4758,7 @@ BOOL BlockChainStream_Shrink(BlockChainStream* This, ...@@ -4679,7 +4758,7 @@ BOOL BlockChainStream_Shrink(BlockChainStream* This,
* *
* Grows this chain in the big block depot. * Grows this chain in the big block depot.
*/ */
BOOL BlockChainStream_Enlarge(BlockChainStream* This, static BOOL BlockChainStream_Enlarge(BlockChainStream* This,
ULARGE_INTEGER newSize) ULARGE_INTEGER newSize)
{ {
ULONG blockIndex, currentBlock; ULONG blockIndex, currentBlock;
...@@ -4822,7 +4901,7 @@ BOOL BlockChainStream_SetSize( ...@@ -4822,7 +4901,7 @@ BOOL BlockChainStream_SetSize(
* Returns the size of this chain. * Returns the size of this chain.
* Will return the block count if this chain doesn't have a property. * Will return the block count if this chain doesn't have a property.
*/ */
ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This)
{ {
StgProperty chainProperty; StgProperty chainProperty;
...@@ -4886,7 +4965,7 @@ void SmallBlockChainStream_Destroy( ...@@ -4886,7 +4965,7 @@ void SmallBlockChainStream_Destroy(
* *
* Returns the head of this chain of small blocks. * Returns the head of this chain of small blocks.
*/ */
ULONG SmallBlockChainStream_GetHeadOfChain( static ULONG SmallBlockChainStream_GetHeadOfChain(
SmallBlockChainStream* This) SmallBlockChainStream* This)
{ {
StgProperty chainProperty; StgProperty chainProperty;
...@@ -4918,7 +4997,7 @@ ULONG SmallBlockChainStream_GetHeadOfChain( ...@@ -4918,7 +4997,7 @@ ULONG SmallBlockChainStream_GetHeadOfChain(
* - BLOCK_END_OF_CHAIN: end of this chain * - BLOCK_END_OF_CHAIN: end of this chain
* - BLOCK_UNUSED: small block 'blockIndex' is free * - BLOCK_UNUSED: small block 'blockIndex' is free
*/ */
HRESULT SmallBlockChainStream_GetNextBlockInChain( static HRESULT SmallBlockChainStream_GetNextBlockInChain(
SmallBlockChainStream* This, SmallBlockChainStream* This,
ULONG blockIndex, ULONG blockIndex,
ULONG* nextBlockInChain) ULONG* nextBlockInChain)
...@@ -4960,7 +5039,7 @@ HRESULT SmallBlockChainStream_GetNextBlockInChain( ...@@ -4960,7 +5039,7 @@ HRESULT SmallBlockChainStream_GetNextBlockInChain(
* To set the end of chain use BLOCK_END_OF_CHAIN as nextBlock. * To set the end of chain use BLOCK_END_OF_CHAIN as nextBlock.
* To flag a block as free use BLOCK_UNUSED as nextBlock. * To flag a block as free use BLOCK_UNUSED as nextBlock.
*/ */
void SmallBlockChainStream_SetNextBlockInChain( static void SmallBlockChainStream_SetNextBlockInChain(
SmallBlockChainStream* This, SmallBlockChainStream* This,
ULONG blockIndex, ULONG blockIndex,
ULONG nextBlock) ULONG nextBlock)
...@@ -4990,7 +5069,7 @@ void SmallBlockChainStream_SetNextBlockInChain( ...@@ -4990,7 +5069,7 @@ void SmallBlockChainStream_SetNextBlockInChain(
* *
* Flag small block 'blockIndex' as free in the small block depot. * Flag small block 'blockIndex' as free in the small block depot.
*/ */
void SmallBlockChainStream_FreeBlock( static void SmallBlockChainStream_FreeBlock(
SmallBlockChainStream* This, SmallBlockChainStream* This,
ULONG blockIndex) ULONG blockIndex)
{ {
...@@ -5004,7 +5083,7 @@ void SmallBlockChainStream_FreeBlock( ...@@ -5004,7 +5083,7 @@ void SmallBlockChainStream_FreeBlock(
* enlarged if necessary. The small block chain will also be enlarged if * enlarged if necessary. The small block chain will also be enlarged if
* necessary. * necessary.
*/ */
ULONG SmallBlockChainStream_GetNextFreeBlock( static ULONG SmallBlockChainStream_GetNextFreeBlock(
SmallBlockChainStream* This) SmallBlockChainStream* This)
{ {
ULARGE_INTEGER offsetOfBlockInDepot; ULARGE_INTEGER offsetOfBlockInDepot;
...@@ -5348,7 +5427,7 @@ BOOL SmallBlockChainStream_WriteAt( ...@@ -5348,7 +5427,7 @@ BOOL SmallBlockChainStream_WriteAt(
* *
* Shrinks this chain in the small block depot. * Shrinks this chain in the small block depot.
*/ */
BOOL SmallBlockChainStream_Shrink( static BOOL SmallBlockChainStream_Shrink(
SmallBlockChainStream* This, SmallBlockChainStream* This,
ULARGE_INTEGER newSize) ULARGE_INTEGER newSize)
{ {
...@@ -5431,7 +5510,7 @@ BOOL SmallBlockChainStream_Shrink( ...@@ -5431,7 +5510,7 @@ BOOL SmallBlockChainStream_Shrink(
* *
* Grows this chain in the small block depot. * Grows this chain in the small block depot.
*/ */
BOOL SmallBlockChainStream_Enlarge( static BOOL SmallBlockChainStream_Enlarge(
SmallBlockChainStream* This, SmallBlockChainStream* This,
ULARGE_INTEGER newSize) ULARGE_INTEGER newSize)
{ {
...@@ -5506,30 +5585,6 @@ BOOL SmallBlockChainStream_Enlarge( ...@@ -5506,30 +5585,6 @@ BOOL SmallBlockChainStream_Enlarge(
} }
/****************************************************************************** /******************************************************************************
* SmallBlockChainStream_GetCount
*
* Returns the number of blocks that comprises this chain.
* This is not the size of this chain as the last block may not be full!
*/
ULONG SmallBlockChainStream_GetCount(SmallBlockChainStream* This)
{
ULONG blockIndex;
ULONG count = 0;
blockIndex = SmallBlockChainStream_GetHeadOfChain(This);
while (blockIndex != BLOCK_END_OF_CHAIN)
{
count++;
if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex)))
return 0;
}
return count;
}
/******************************************************************************
* SmallBlockChainStream_SetSize * SmallBlockChainStream_SetSize
* *
* Sets the size of this stream. * Sets the size of this stream.
...@@ -5565,7 +5620,7 @@ BOOL SmallBlockChainStream_SetSize( ...@@ -5565,7 +5620,7 @@ BOOL SmallBlockChainStream_SetSize(
* *
* Returns the size of this chain. * Returns the size of this chain.
*/ */
ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This)
{ {
StgProperty chainProperty; StgProperty chainProperty;
......
...@@ -123,7 +123,6 @@ static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d} ...@@ -123,7 +123,6 @@ static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}
*/ */
typedef struct StorageBaseImpl StorageBaseImpl; typedef struct StorageBaseImpl StorageBaseImpl;
typedef struct StorageImpl StorageImpl; typedef struct StorageImpl StorageImpl;
typedef struct StorageInternalImpl StorageInternalImpl;
typedef struct BlockChainStream BlockChainStream; typedef struct BlockChainStream BlockChainStream;
typedef struct SmallBlockChainStream SmallBlockChainStream; typedef struct SmallBlockChainStream SmallBlockChainStream;
typedef struct IEnumSTATSTGImpl IEnumSTATSTGImpl; typedef struct IEnumSTATSTGImpl IEnumSTATSTGImpl;
...@@ -257,9 +256,7 @@ struct StorageBaseImpl ...@@ -257,9 +256,7 @@ struct StorageBaseImpl
* StorageBaseImpl stream list handlers * StorageBaseImpl stream list handlers
*/ */
void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm);
void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm); void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm);
void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg);
/**************************************************************************** /****************************************************************************
* Storage32Impl definitions. * Storage32Impl definitions.
...@@ -312,63 +309,6 @@ struct StorageImpl ...@@ -312,63 +309,6 @@ struct StorageImpl
BigBlockFile* bigBlockFile; BigBlockFile* bigBlockFile;
}; };
void StorageImpl_Destroy(
StorageBaseImpl* This);
HRESULT StorageImpl_Construct(
StorageImpl* This,
HANDLE hFile,
LPCOLESTR pwcsName,
ILockBytes* pLkbyt,
DWORD openFlags,
BOOL fileBased,
BOOL fileCreate);
BOOL StorageImpl_ReadBigBlock(
StorageImpl* This,
ULONG blockIndex,
void* buffer);
BOOL StorageImpl_WriteBigBlock(
StorageImpl* This,
ULONG blockIndex,
void* buffer);
void* StorageImpl_GetROBigBlock(
StorageImpl* This,
ULONG blockIndex);
void* StorageImpl_GetBigBlock(
StorageImpl* This,
ULONG blockIndex);
void StorageImpl_ReleaseBigBlock(
StorageImpl* This,
void* pBigBlock);
ULONG StorageImpl_GetNextFreeBigBlock(
StorageImpl* This);
void StorageImpl_FreeBigBlock(
StorageImpl* This,
ULONG blockIndex);
HRESULT StorageImpl_GetNextBlockInChain(
StorageImpl* This,
ULONG blockIndex,
ULONG* nextBlockIndex);
void StorageImpl_SetNextBlockInChain(
StorageImpl* This,
ULONG blockIndex,
ULONG nextBlock);
HRESULT StorageImpl_LoadFileHeader(
StorageImpl* This);
void StorageImpl_SaveFileHeader(
StorageImpl* This);
BOOL StorageImpl_ReadProperty( BOOL StorageImpl_ReadProperty(
StorageImpl* This, StorageImpl* This,
ULONG index, ULONG index,
...@@ -383,103 +323,6 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( ...@@ -383,103 +323,6 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
StorageImpl* This, StorageImpl* This,
SmallBlockChainStream** ppsbChain); SmallBlockChainStream** ppsbChain);
ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This,
ULONG blockIndex);
void Storage32Impl_AddBlockDepot(StorageImpl* This,
ULONG blockIndex);
ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This);
ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This,
ULONG depotIndex);
void Storage32Impl_SetExtDepotBlock(StorageImpl* This,
ULONG depotIndex,
ULONG blockIndex);
/****************************************************************************
* Storage32InternalImpl definitions.
*
* Definition of the implementation structure for the IStorage32 interface.
* This one implements the IStorage32 interface for storage that are
* inside another storage.
*/
struct StorageInternalImpl
{
struct StorageBaseImpl base;
/*
* There is no specific data for this class.
*/
};
/*
* Method definitions for the Storage32InternalImpl class.
*/
StorageInternalImpl* StorageInternalImpl_Construct(
StorageImpl* ancestorStorage,
DWORD openFlags,
ULONG rootTropertyIndex);
void StorageInternalImpl_Destroy(
StorageBaseImpl* This);
/****************************************************************************
* IEnumSTATSTGImpl definitions.
*
* Definition of the implementation structure for the IEnumSTATSTGImpl interface.
* This class allows iterating through the content of a storage and to find
* specific items inside it.
*/
struct IEnumSTATSTGImpl
{
const IEnumSTATSTGVtbl *lpVtbl; /* Needs to be the first item in the struct
* since we want to cast this in an IEnumSTATSTG pointer */
LONG ref; /* Reference count */
StorageImpl* parentStorage; /* Reference to the parent storage */
ULONG firstPropertyNode; /* Index of the root of the storage to enumerate */
/*
* The current implementation of the IEnumSTATSTGImpl class uses a stack
* to walk the property sets to get the content of a storage. This stack
* is implemented by the following 3 data members
*/
ULONG stackSize;
ULONG stackMaxSize;
ULONG* stackToVisit;
#define ENUMSTATSGT_SIZE_INCREMENT 10
};
IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(
StorageImpl* This,
ULONG firstPropertyNode);
void IEnumSTATSTGImpl_Destroy(
IEnumSTATSTGImpl* This);
void IEnumSTATSTGImpl_PushSearchNode(
IEnumSTATSTGImpl* This,
ULONG nodeToPush);
ULONG IEnumSTATSTGImpl_PopSearchNode(
IEnumSTATSTGImpl* This,
BOOL remove);
ULONG IEnumSTATSTGImpl_FindProperty(
IEnumSTATSTGImpl* This,
const OLECHAR* lpszPropName,
StgProperty* buffer);
INT IEnumSTATSTGImpl_FindParentProperty(
IEnumSTATSTGImpl *This,
ULONG childProperty,
StgProperty *currentProperty,
ULONG *propertyId);
/**************************************************************************** /****************************************************************************
* StgStreamImpl definitions. * StgStreamImpl definitions.
* *
...@@ -611,9 +454,6 @@ BlockChainStream* BlockChainStream_Construct( ...@@ -611,9 +454,6 @@ BlockChainStream* BlockChainStream_Construct(
void BlockChainStream_Destroy( void BlockChainStream_Destroy(
BlockChainStream* This); BlockChainStream* This);
ULONG BlockChainStream_GetHeadOfChain(
BlockChainStream* This);
BOOL BlockChainStream_ReadAt( BOOL BlockChainStream_ReadAt(
BlockChainStream* This, BlockChainStream* This,
ULARGE_INTEGER offset, ULARGE_INTEGER offset,
...@@ -632,12 +472,6 @@ BOOL BlockChainStream_SetSize( ...@@ -632,12 +472,6 @@ BOOL BlockChainStream_SetSize(
BlockChainStream* This, BlockChainStream* This,
ULARGE_INTEGER newSize); ULARGE_INTEGER newSize);
ULARGE_INTEGER BlockChainStream_GetSize(
BlockChainStream* This);
ULONG BlockChainStream_GetCount(
BlockChainStream* This);
/**************************************************************************** /****************************************************************************
* SmallBlockChainStream definitions. * SmallBlockChainStream definitions.
* *
...@@ -660,26 +494,6 @@ SmallBlockChainStream* SmallBlockChainStream_Construct( ...@@ -660,26 +494,6 @@ SmallBlockChainStream* SmallBlockChainStream_Construct(
void SmallBlockChainStream_Destroy( void SmallBlockChainStream_Destroy(
SmallBlockChainStream* This); SmallBlockChainStream* This);
ULONG SmallBlockChainStream_GetHeadOfChain(
SmallBlockChainStream* This);
HRESULT SmallBlockChainStream_GetNextBlockInChain(
SmallBlockChainStream* This,
ULONG blockIndex,
ULONG* nextBlockIndex);
void SmallBlockChainStream_SetNextBlockInChain(
SmallBlockChainStream* This,
ULONG blockIndex,
ULONG nextBlock);
void SmallBlockChainStream_FreeBlock(
SmallBlockChainStream* This,
ULONG blockIndex);
ULONG SmallBlockChainStream_GetNextFreeBlock(
SmallBlockChainStream* This);
HRESULT SmallBlockChainStream_ReadAt( HRESULT SmallBlockChainStream_ReadAt(
SmallBlockChainStream* This, SmallBlockChainStream* This,
ULARGE_INTEGER offset, ULARGE_INTEGER offset,
...@@ -698,11 +512,5 @@ BOOL SmallBlockChainStream_SetSize( ...@@ -698,11 +512,5 @@ BOOL SmallBlockChainStream_SetSize(
SmallBlockChainStream* This, SmallBlockChainStream* This,
ULARGE_INTEGER newSize); ULARGE_INTEGER newSize);
ULARGE_INTEGER SmallBlockChainStream_GetSize(
SmallBlockChainStream* This);
ULONG SmallBlockChainStream_GetCount(
SmallBlockChainStream* This);
#endif /* __STORAGE32_H__ */ #endif /* __STORAGE32_H__ */
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