reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-16 19:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ole32: Rename propertyType to stgType.

Browse Source
This commit is contained in:
Vincent Povirk 2009-11-12 12:34:05 -06:00 committed by Alexandre Julliard
parent 8a17a028b7
commit 2203264bfa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/ole32/storage32.c
View File

@ -451,7 +451,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream(
* If it was found, construct the stream object and return a pointer to it. * If it was found, construct the stream object and return a pointer to it.
*/ */
if ( (foundPropertyIndex!=DIRENTRY_NULL) && if ( (foundPropertyIndex!=DIRENTRY_NULL) &&
(currentProperty.propertyType==STGTY_STREAM) ) (currentProperty.stgType==STGTY_STREAM) )
{ {
newStream = StgStreamImpl_Construct(This, grfMode, foundPropertyIndex); newStream = StgStreamImpl_Construct(This, grfMode, foundPropertyIndex);
@ -556,7 +556,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage(
&currentProperty); &currentProperty);
if ( (foundPropertyIndex!=DIRENTRY_NULL) && if ( (foundPropertyIndex!=DIRENTRY_NULL) &&
(currentProperty.propertyType==STGTY_STORAGE) ) (currentProperty.stgType==STGTY_STORAGE) )
{ {
newStorage = StorageInternalImpl_Construct( newStorage = StorageInternalImpl_Construct(
This->ancestorStorage, This->ancestorStorage,
@ -858,7 +858,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
strcpyW(newStreamProperty.name, pwcsName); strcpyW(newStreamProperty.name, pwcsName);
newStreamProperty.propertyType = STGTY_STREAM; newStreamProperty.stgType = STGTY_STREAM;
newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN; newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN;
newStreamProperty.size.u.LowPart = 0; newStreamProperty.size.u.LowPart = 0;
newStreamProperty.size.u.HighPart = 0; newStreamProperty.size.u.HighPart = 0;
@ -1041,7 +1041,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
strcpyW(newProperty.name, pwcsName); strcpyW(newProperty.name, pwcsName);
newProperty.propertyType = STGTY_STORAGE; newProperty.stgType = STGTY_STORAGE;
newProperty.startingBlock = BLOCK_END_OF_CHAIN; newProperty.startingBlock = BLOCK_END_OF_CHAIN;
newProperty.size.u.LowPart = 0; newProperty.size.u.LowPart = 0;
newProperty.size.u.HighPart = 0; newProperty.size.u.HighPart = 0;
@ -1744,14 +1744,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
return STG_E_FILENOTFOUND; return STG_E_FILENOTFOUND;
} }
if ( propertyToDelete.propertyType == STGTY_STORAGE ) if ( propertyToDelete.stgType == STGTY_STORAGE )
{ {
hr = deleteStorageProperty( hr = deleteStorageProperty(
This, This,
foundPropertyIndexToDelete, foundPropertyIndexToDelete,
propertyToDelete); propertyToDelete);
} }
else if ( propertyToDelete.propertyType == STGTY_STREAM ) else if ( propertyToDelete.stgType == STGTY_STREAM )
{ {
hr = deleteStreamProperty( hr = deleteStreamProperty(
This, This,
@ -2269,7 +2269,7 @@ static HRESULT StorageImpl_Construct(
MultiByteToWideChar( CP_ACP, 0, rootPropertyName, -1, rootProp.name, MultiByteToWideChar( CP_ACP, 0, rootPropertyName, -1, rootProp.name,
sizeof(rootProp.name)/sizeof(WCHAR) ); sizeof(rootProp.name)/sizeof(WCHAR) );
rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR);
rootProp.propertyType = STGTY_ROOT; rootProp.stgType = STGTY_ROOT;
rootProp.leftChild = DIRENTRY_NULL; rootProp.leftChild = DIRENTRY_NULL;
rootProp.rightChild = DIRENTRY_NULL; rootProp.rightChild = DIRENTRY_NULL;
rootProp.dirRootEntry = DIRENTRY_NULL; rootProp.dirRootEntry = DIRENTRY_NULL;
@ -2295,7 +2295,7 @@ static HRESULT StorageImpl_Construct(
if (readSuccessful) if (readSuccessful)
{ {
if ( (currentProperty.sizeOfNameString != 0 ) && if ( (currentProperty.sizeOfNameString != 0 ) &&
(currentProperty.propertyType == STGTY_ROOT) ) (currentProperty.stgType == STGTY_ROOT) )
{ {
This->base.rootPropertySetIndex = currentPropertyIndex; This->base.rootPropertySetIndex = currentPropertyIndex;
} }
@ -3054,7 +3054,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData)
newData->name, newData->name,
DIRENTRY_NAME_BUFFER_LEN ); DIRENTRY_NAME_BUFFER_LEN );
memcpy(buffer + OFFSET_PS_STGTYPE, &newData->propertyType, 1); memcpy(buffer + OFFSET_PS_STGTYPE, &newData->stgType, 1);
StorageUtl_WriteWord( StorageUtl_WriteWord(
buffer, buffer,
@ -3140,7 +3140,7 @@ BOOL StorageImpl_ReadDirEntry(
DIRENTRY_NAME_BUFFER_LEN ); DIRENTRY_NAME_BUFFER_LEN );
TRACE("storage name: %s\n", debugstr_w(buffer->name)); TRACE("storage name: %s\n", debugstr_w(buffer->name));
memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_STGTYPE, 1); memcpy(&buffer->stgType, currentProperty + OFFSET_PS_STGTYPE, 1);
StorageUtl_ReadWord( StorageUtl_ReadWord(
currentProperty, currentProperty,
@ -4072,7 +4072,7 @@ void StorageUtl_CopyDirEntryToSTATSTG(
strcpyW(destination->pwcsName, source->name); strcpyW(destination->pwcsName, source->name);
} }
switch (source->propertyType) switch (source->stgType)
{ {
case STGTY_STORAGE: case STGTY_STORAGE:
case STGTY_ROOT: case STGTY_ROOT:

2
dlls/ole32/storage32.h
View File

@ -129,7 +129,7 @@ struct DirEntry
{ {
WCHAR name[DIRENTRY_NAME_MAX_LEN]; WCHAR name[DIRENTRY_NAME_MAX_LEN];
WORD sizeOfNameString; WORD sizeOfNameString;
BYTE propertyType; BYTE stgType;
ULONG leftChild; ULONG leftChild;
ULONG rightChild; ULONG rightChild;
ULONG dirRootEntry; ULONG dirRootEntry;