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

ole32: Rename stream.ownerProperty to dirEntry.

This commit is contained in:
Vincent Povirk 2009-11-12 13:25:10 -06:00 committed by Alexandre Julliard
parent 4ba13cb9a7
commit df960e27c4
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/ole32/stg_stream.c
View File

@ -209,7 +209,7 @@ static void StgStreamImpl_OpenBlockChain(
* Read the information from the property. * Read the information from the property.
*/ */
readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage,
This->ownerProperty, This->dirEntry,
&curProperty); &curProperty);
if (readSuccessful) if (readSuccessful)
@ -233,14 +233,14 @@ static void StgStreamImpl_OpenBlockChain(
This->smallBlockChain = SmallBlockChainStream_Construct( This->smallBlockChain = SmallBlockChainStream_Construct(
This->parentStorage->ancestorStorage, This->parentStorage->ancestorStorage,
NULL, NULL,
This->ownerProperty); This->dirEntry);
} }
else else
{ {
This->bigBlockChain = BlockChainStream_Construct( This->bigBlockChain = BlockChainStream_Construct(
This->parentStorage->ancestorStorage, This->parentStorage->ancestorStorage,
NULL, NULL,
This->ownerProperty); This->dirEntry);
} }
} }
} }
@ -591,14 +591,14 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
This->smallBlockChain = SmallBlockChainStream_Construct( This->smallBlockChain = SmallBlockChainStream_Construct(
This->parentStorage->ancestorStorage, This->parentStorage->ancestorStorage,
NULL, NULL,
This->ownerProperty); This->dirEntry);
} }
else else
{ {
This->bigBlockChain = BlockChainStream_Construct( This->bigBlockChain = BlockChainStream_Construct(
This->parentStorage->ancestorStorage, This->parentStorage->ancestorStorage,
NULL, NULL,
This->ownerProperty); This->dirEntry);
} }
} }
@ -606,7 +606,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
* Read this stream's property to see if it's small blocks or big blocks * Read this stream's property to see if it's small blocks or big blocks
*/ */
Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage,
This->ownerProperty, This->dirEntry,
&curProperty); &curProperty);
/* /*
* Determine if we have to switch from small to big blocks or vice versa * Determine if we have to switch from small to big blocks or vice versa
@ -651,7 +651,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
* Write the new information about this stream to the property * Write the new information about this stream to the property
*/ */
Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage,
This->ownerProperty, This->dirEntry,
&curProperty); &curProperty);
curProperty.size.u.HighPart = libNewSize.u.HighPart; curProperty.size.u.HighPart = libNewSize.u.HighPart;
@ -660,7 +660,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
if (Success) if (Success)
{ {
StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage,
This->ownerProperty, This->dirEntry,
&curProperty); &curProperty);
} }
@ -853,7 +853,7 @@ static HRESULT WINAPI StgStreamImpl_Stat(
* Read the information from the property. * Read the information from the property.
*/ */
readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage,
This->ownerProperty, This->dirEntry,
&curProperty); &curProperty);
if (readSuccessful) if (readSuccessful)
@ -910,7 +910,7 @@ static HRESULT WINAPI StgStreamImpl_Clone(
if ( ppstm == 0 ) if ( ppstm == 0 )
return STG_E_INVALIDPOINTER; return STG_E_INVALIDPOINTER;
new_stream = StgStreamImpl_Construct (This->parentStorage, This->grfMode, This->ownerProperty); new_stream = StgStreamImpl_Construct (This->parentStorage, This->grfMode, This->dirEntry);
if (!new_stream) if (!new_stream)
return STG_E_INSUFFICIENTMEMORY; /* Currently the only reason for new_stream=0 */ return STG_E_INSUFFICIENTMEMORY; /* Currently the only reason for new_stream=0 */
@ -962,7 +962,7 @@ static const IStreamVtbl StgStreamImpl_Vtbl =
StgStreamImpl* StgStreamImpl_Construct( StgStreamImpl* StgStreamImpl_Construct(
StorageBaseImpl* parentStorage, StorageBaseImpl* parentStorage,
DWORD grfMode, DWORD grfMode,
ULONG ownerProperty) ULONG dirEntry)
{ {
StgStreamImpl* newStream; StgStreamImpl* newStream;
@ -991,7 +991,7 @@ StgStreamImpl* StgStreamImpl_Construct(
*/ */
newStream->grfMode = grfMode; newStream->grfMode = grfMode;
newStream->ownerProperty = ownerProperty; newStream->dirEntry = dirEntry;
/* /*
* Start the stream at the beginning. * Start the stream at the beginning.

2
dlls/ole32/storage32.c
View File

@ -827,7 +827,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry) LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry)
{ {
if (strm->ownerProperty == foundPropertyIndex) if (strm->dirEntry == foundPropertyIndex)
{ {
TRACE("Stream deleted %p\n", strm); TRACE("Stream deleted %p\n", strm);
strm->parentStorage = NULL; strm->parentStorage = NULL;

6
dlls/ole32/storage32.h
View File

@ -352,9 +352,9 @@ struct StgStreamImpl
DWORD grfMode; DWORD grfMode;
/* /*
* Index of the property that owns (points to) this stream. * Index of the directory entry that owns (points to) this stream.
*/ */
ULONG ownerProperty; ULONG dirEntry;
/* /*
* Helper variable that contains the size of the stream * Helper variable that contains the size of the stream
@ -381,7 +381,7 @@ struct StgStreamImpl
StgStreamImpl* StgStreamImpl_Construct( StgStreamImpl* StgStreamImpl_Construct(
StorageBaseImpl* parentStorage, StorageBaseImpl* parentStorage,
DWORD grfMode, DWORD grfMode,
ULONG ownerProperty); ULONG dirEntry);
/****************************************************************************** /******************************************************************************