Vincent Povirk : ole32: Rename propertyUniqueID to clsid.

[Alexandre Julliard]

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

Author: Vincent Povirk 
Date:   Thu Nov 12 13:10:17 2009 -0600

ole32: Rename propertyUniqueID to clsid.

---

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

diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index f6f2163..a834a46 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -930,7 +930,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass(
                                        &curProperty);
   if (success)
   {
-    curProperty.propertyUniqueID = *clsid;
+    curProperty.clsid = *clsid;

success =  StorageImpl_WriteDirEntry(This->ancestorStorage,
                                            This->rootPropertySetIndex,
@@ -3079,7 +3079,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData)
   StorageUtl_WriteGUID(
     buffer,
       OFFSET_PS_GUID,
-      &newData->propertyUniqueID);
+      &newData->clsid);

StorageUtl_WriteDWord(
     buffer,
@@ -3165,7 +3165,7 @@ BOOL StorageImpl_ReadDirEntry(
     StorageUtl_ReadGUID(
       currentProperty,
       OFFSET_PS_GUID,
-      &buffer->propertyUniqueID);
+      &buffer->clsid);

StorageUtl_ReadDWord(
       currentProperty,
@@ -4094,7 +4094,7 @@ void StorageUtl_CopyDirEntryToSTATSTG(
 */
   destination->grfMode           = 0;
   destination->grfLocksSupported = 0;
-  destination->clsid             = source->propertyUniqueID;
+  destination->clsid             = source->clsid;
   destination->grfStateBits      = 0;
   destination->reserved          = 0;
 }
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index d23714e..2a9dd1f 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -133,7 +133,7 @@ struct DirEntry
   ULONG          leftChild;
   ULONG          rightChild;
   ULONG          dirRootEntry;
-  GUID           propertyUniqueID;
+  GUID           clsid;
   FILETIME       ctime;
   FILETIME       mtime;
   ULONG          startingBlock;