ole32: Rename the StgProperty structure to DirEntry.

The term "property" is misleading (ole32 has an unrelated feature called a "property set storage"), and I haven't seen it used anywhere outside the Wine code. The term "directory entry" matches the MS documentation and more accurately describes their use in the file.

ole32: Rename the StgProperty structure to DirEntry.
39e894f4 · Vincent Povirk · Alexandre Julliard · b1baa05e · 39e894f4 · 39e894f4
Commit 39e894f4 authored Nov 10, 2009 by Vincent Povirk Committed by Alexandre Julliard Nov 12, 2009
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 11 deletions

stg_stream.c dlls/ole32/stg_stream.c +3 -3

storage32.c dlls/ole32/storage32.c +0 -0

storage32.h dlls/ole32/storage32.h +8 -8

No files found.
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -187,7 +187,7 @@ static ULONG WINAPI StgStreamImpl_Release(
 static void StgStreamImpl_OpenBlockChain(
        StgStreamImpl* This)
 {
-  StgProperty    curProperty;
+  DirEntry     curProperty;
  BOOL         readSuccessful;

  /*
@@ -545,7 +545,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
 {
  StgStreamImpl* const This=(StgStreamImpl*)iface;

-  StgProperty    curProperty;
+  DirEntry     curProperty;
  BOOL         Success;

  TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart);
@@ -834,7 +834,7 @@ static HRESULT WINAPI StgStreamImpl_Stat(
 {
  StgStreamImpl* const This=(StgStreamImpl*)iface;

-  StgProperty    curProperty;
+  DirEntry     curProperty;
  BOOL         readSuccessful;

  TRACE("%p %p %d\n", This, pstatstg, grfStatFlag);

--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -118,14 +118,14 @@ typedef struct StorageImpl         StorageImpl;
 typedef struct BlockChainStream      BlockChainStream;
 typedef struct SmallBlockChainStream SmallBlockChainStream;
 typedef struct IEnumSTATSTGImpl      IEnumSTATSTGImpl;
-typedef struct StgProperty           StgProperty;
+typedef struct DirEntry              DirEntry;
 typedef struct StgStreamImpl         StgStreamImpl;

 /*
- * This utility structure is used to read/write the information in a storage
- * property.
+ * This utility structure is used to read/write the information in a directory
+ * entry.
 */
-struct StgProperty
+struct DirEntry
 {
  WCHAR	         name[PROPERTY_NAME_MAX_LEN];
  WORD	         sizeOfNameString;
@@ -295,7 +295,7 @@ HRESULT StorageImpl_ReadRawDirEntry(

 void UpdateRawDirEntry(
    BYTE *buffer,
-    const StgProperty *newData);
+    const DirEntry *newData);

 HRESULT StorageImpl_WriteRawDirEntry(
            StorageImpl *This,
@@ -305,12 +305,12 @@ HRESULT StorageImpl_WriteRawDirEntry(
 BOOL StorageImpl_ReadProperty(
            StorageImpl*    This,
            ULONG           index,
-            StgProperty*    buffer);
+            DirEntry*       buffer);

 BOOL StorageImpl_WriteProperty(
            StorageImpl*        This,
            ULONG               index,
-            const StgProperty*  buffer);
+            const DirEntry*     buffer);

 BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
                      StorageImpl* This,
@@ -419,7 +419,7 @@ void StorageUtl_WriteULargeInteger(BYTE* buffer, ULONG offset,
 const ULARGE_INTEGER *value);
 void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value);
 void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value);
-void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination, const StgProperty* source,
+void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination, const DirEntry* source,
 int statFlags);

 /****************************************************************************