From 9b4326da13f8891ef31800f953a683a92bd48763 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@codeweavers.com>
Date: Tue, 10 Nov 2009 14:49:47 -0600
Subject: [PATCH 5/6] ole32: Rename StorageUtl_CopyPropertyToSTATSTG.

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

diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index 781649c..4cc114a 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -860,7 +860,7 @@ static HRESULT WINAPI StgStreamImpl_Stat(
   {
     StorageImpl *root = This->parentStorage->ancestorStorage;
 
-    StorageUtl_CopyPropertyToSTATSTG(pstatstg,
+    StorageUtl_CopyDirEntryToSTATSTG(pstatstg,
 				     &curProperty,
 				     grfStatFlag);
 
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 0639599..fa2980c 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -657,7 +657,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat(
 
   if (readSuccessful)
   {
-    StorageUtl_CopyPropertyToSTATSTG(
+    StorageUtl_CopyDirEntryToSTATSTG(
       pstatstg,
       &curProperty,
       grfStatFlag);
@@ -3621,7 +3621,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next(
     /*
      * Copy the information to the return buffer.
      */
-    StorageUtl_CopyPropertyToSTATSTG(currentReturnStruct,
+    StorageUtl_CopyDirEntryToSTATSTG(currentReturnStruct,
       &currentProperty,
       STATFLAG_DEFAULT);
 
@@ -4050,7 +4050,7 @@ void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value)
   memcpy(buffer+offset+8, value->Data4, sizeof(value->Data4));
 }
 
-void StorageUtl_CopyPropertyToSTATSTG(
+void StorageUtl_CopyDirEntryToSTATSTG(
   STATSTG*              destination,
   const DirEntry*       source,
   int                   statFlags)
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 405301c..090f8b5 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -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 DirEntry* source,
+void StorageUtl_CopyDirEntryToSTATSTG(STATSTG* destination, const DirEntry* source,
  int statFlags);
 
 /****************************************************************************
-- 
1.6.3.3