Commit 5838bcf8 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

ole32: Rename PROPERTY_RELATION constants to DIRENTRY_RELATION.

parent 5969bde0
...@@ -1422,7 +1422,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, ...@@ -1422,7 +1422,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry,
StorageImpl_ReadDirEntry(storage, storageEntry, parentData); StorageImpl_ReadDirEntry(storage, storageEntry, parentData);
*parentEntry = storageEntry; *parentEntry = storageEntry;
*relation = PROPERTY_RELATION_DIR; *relation = DIRENTRY_RELATION_DIR;
childEntry = parentData->dirRootEntry; childEntry = parentData->dirRootEntry;
...@@ -1442,7 +1442,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, ...@@ -1442,7 +1442,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry,
{ {
*parentData = childData; *parentData = childData;
*parentEntry = childEntry; *parentEntry = childEntry;
*relation = PROPERTY_RELATION_PREVIOUS; *relation = DIRENTRY_RELATION_PREVIOUS;
childEntry = parentData->leftChild; childEntry = parentData->leftChild;
} }
...@@ -1451,7 +1451,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, ...@@ -1451,7 +1451,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry,
{ {
*parentData = childData; *parentData = childData;
*parentEntry = childEntry; *parentEntry = childEntry;
*relation = PROPERTY_RELATION_NEXT; *relation = DIRENTRY_RELATION_NEXT;
childEntry = parentData->rightChild; childEntry = parentData->rightChild;
} }
...@@ -1951,13 +1951,13 @@ static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target ...@@ -1951,13 +1951,13 @@ static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target
{ {
switch (relation) switch (relation)
{ {
case PROPERTY_RELATION_PREVIOUS: case DIRENTRY_RELATION_PREVIOUS:
property->leftChild = new_target; property->leftChild = new_target;
break; break;
case PROPERTY_RELATION_NEXT: case DIRENTRY_RELATION_NEXT:
property->rightChild = new_target; property->rightChild = new_target;
break; break;
case PROPERTY_RELATION_DIR: case DIRENTRY_RELATION_DIR:
property->dirRootEntry = new_target; property->dirRootEntry = new_target;
break; break;
default: default:
......
...@@ -80,11 +80,11 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; ...@@ -80,11 +80,11 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF;
#define RAW_DIRENTRY_SIZE 0x00000080 #define RAW_DIRENTRY_SIZE 0x00000080
/* /*
* Property type of relation * Type of child entry link
*/ */
#define PROPERTY_RELATION_PREVIOUS 0 #define DIRENTRY_RELATION_PREVIOUS 0
#define PROPERTY_RELATION_NEXT 1 #define DIRENTRY_RELATION_NEXT 1
#define PROPERTY_RELATION_DIR 2 #define DIRENTRY_RELATION_DIR 2
/* /*
* type constant used in files for the root storage * type constant used in files for the root storage
......
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