Vincent Povirk : ole32: Rename PROPERTY_RELATION constants to DIRENTRY_RELATION.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5838bcf8017d5c231efafece41010c1a4000622f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5838bcf8017d5c231efafece41...

Author: Vincent Povirk 
Date:   Wed Nov 11 10:42:19 2009 -0600

ole32: Rename PROPERTY_RELATION constants to DIRENTRY_RELATION.

---

dlls/ole32/storage32.c |   12 ++++++------
 dlls/ole32/storage32.h |    8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 97a76cc..898695c 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -1422,7 +1422,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry,
   StorageImpl_ReadDirEntry(storage, storageEntry, parentData);

*parentEntry = storageEntry;
-  *relation = PROPERTY_RELATION_DIR;
+  *relation = DIRENTRY_RELATION_DIR;

childEntry = parentData->dirRootEntry;

@@ -1442,7 +1442,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry,
     {
       *parentData = childData;
       *parentEntry = childEntry;
-      *relation = PROPERTY_RELATION_PREVIOUS;
+      *relation = DIRENTRY_RELATION_PREVIOUS;

childEntry = parentData->leftChild;
     }
@@ -1451,7 +1451,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry,
     {
       *parentData = childData;
       *parentEntry = childEntry;
-      *relation = PROPERTY_RELATION_NEXT;
+      *relation = DIRENTRY_RELATION_NEXT;

childEntry = parentData->rightChild;
     }
@@ -1951,13 +1951,13 @@ static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target
 {
   switch (relation)
   {
-    case PROPERTY_RELATION_PREVIOUS:
+    case DIRENTRY_RELATION_PREVIOUS:
       property->leftChild = new_target;
       break;
-    case PROPERTY_RELATION_NEXT:
+    case DIRENTRY_RELATION_NEXT:
       property->rightChild = new_target;
       break;
-    case PROPERTY_RELATION_DIR:
+    case DIRENTRY_RELATION_DIR:
       property->dirRootEntry = new_target;
       break;
     default:
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 87de749..c740747 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -80,11 +80,11 @@ static const ULONG DIRENTRY_NULL             = 0xFFFFFFFF;
 #define RAW_DIRENTRY_SIZE 0x00000080

/*
- * Property type of relation
+ * Type of child entry link
  */
-#define PROPERTY_RELATION_PREVIOUS 0
-#define PROPERTY_RELATION_NEXT     1
-#define PROPERTY_RELATION_DIR      2
+#define DIRENTRY_RELATION_PREVIOUS 0
+#define DIRENTRY_RELATION_NEXT     1
+#define DIRENTRY_RELATION_DIR      2

/*
  * type constant used in files for the root storage