Rebase against 070cfc358c8ed67ba08a49ae78c20205ab4e2d00

patches/ole32-STGPROP/0003-ole32-Implement-returning-a-name-in-IEnumSTATPROPSTG.patch

@@ -1,13 +1,13 @@
-From 78ca8c020c1fefe80de805b096b02a4418f062a8 Mon Sep 17 00:00:00 2001
+From d56a94164cbe82bd3760a921e6eff029b62af63e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 20 Jan 2017 01:42:07 +0100
-Subject: ole32: Implement returning a name in IEnumSTATPROPSTG.
+Subject: [PATCH] ole32: Implement returning a name in IEnumSTATPROPSTG.
 
 ---
  dlls/ole32/enumx.c    | 16 ++++++++++++++--
  dlls/ole32/enumx.h    |  5 ++++-
- dlls/ole32/stg_prop.c | 29 +++++++++++++++++++++++++++--
- 3 files changed, 45 insertions(+), 5 deletions(-)
+ dlls/ole32/stg_prop.c | 25 ++++++++++++++++++++++++-
+ 3 files changed, 42 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c
 index 4279ca81fa9..2b53810dad9 100644
@@ -88,21 +88,10 @@ index da76e13769b..8a2a2b354d8 100644
  
  #endif
 diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
-index e90e1ed4eda..bfc052966ab 100644
+index 989e68b830d..eb98a7d2516 100644
 --- a/dlls/ole32/stg_prop.c
 +++ b/dlls/ole32/stg_prop.c
-@@ -2393,7 +2393,9 @@ static HRESULT create_EnumSTATPROPSETSTG(
- 
-     enumx = enumx_allocate(&IID_IEnumSTATPROPSETSTG,
-                            &IEnumSTATPROPSETSTG_Vtbl,
--                           sizeof (STATPROPSETSTG));
-+                           sizeof (STATPROPSETSTG),
-+                           (IUnknown*)&This->base.IStorage_iface,
-+                           NULL);
- 
-     /* add all the property set elements into a list */
-     r = IStorage_EnumElements(stg, 0, NULL, 0, &penum);
-@@ -2486,6 +2488,27 @@ static HRESULT WINAPI IEnumSTATPROPSTG_fnClone(
+@@ -2571,6 +2571,27 @@ static HRESULT WINAPI IEnumSTATPROPSTG_fnClone(
      return enumx_Clone((enumx_impl*)iface, (enumx_impl**)ppenum);
  }
  
@@ -130,7 +119,7 @@ index e90e1ed4eda..bfc052966ab 100644
  static BOOL prop_enum_stat(const void *k, const void *v, void *extra, void *arg)
  {
      enumx_impl *enumx = arg;
-@@ -2512,7 +2535,9 @@ static HRESULT create_EnumSTATPROPSTG(
+@@ -2597,7 +2618,9 @@ static HRESULT create_EnumSTATPROPSTG(
  
      enumx = enumx_allocate(&IID_IEnumSTATPROPSTG,
                             &IEnumSTATPROPSTG_Vtbl,
@@ -142,5 +131,5 @@ index e90e1ed4eda..bfc052966ab 100644
      dictionary_enumerate(This->propid_to_prop, prop_enum_stat, enumx);
  
 -- 
-2.11.0
+2.24.0.rc1