Rebase against 797a8bb192d49a44b8cec468e3421444feb03f8a.

patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch

@@ -1,4 +1,4 @@
-From de4cd156d5a676091d4a7e38265161819a69137e Mon Sep 17 00:00:00 2001
+From 4c2973947ad85bbed99b3149462eb73e823c977a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 8 May 2017 23:33:45 +0200
 Subject: [PATCH] shell32: Add security property tab.
@@ -62,17 +62,16 @@ index 264947d337d..90898b7ed98 100644
  	/* FIXME: Some will be unused until desktop.ini support is implemented */
  	IDS_PROGRAMS                "Programs"
 diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
-index 14cd9aeeebe..ed3a07c423d 100644
+index 181ff36787e..cc43b710c29 100644
 --- a/dlls/shell32/shlview_cmenu.c
 +++ b/dlls/shell32/shlview_cmenu.c
-@@ -38,14 +38,133 @@
+@@ -36,13 +36,132 @@
  
  #include "shresdef.h"
  #include "shlwapi.h"
 +#include "aclui.h"
 +#include "aclapi.h"
  
- #include "wine/heap.h"
  #include "wine/debug.h"
  
 +/* Small hack: We need to remove DECLSPEC_HIDDEN from the aclui export. */
@@ -199,8 +198,8 @@ index 14cd9aeeebe..ed3a07c423d 100644
  typedef struct
  {
      IContextMenu3 IContextMenu3_iface;
-@@ -637,6 +756,269 @@ error:
-     heap_free(props);
+@@ -634,6 +753,269 @@ error:
+     free(props);
  }
  
 +static HRESULT WINAPI filesecurity_QueryInterface(ISecurityInformation *iface, REFIID riid, void **ppv)
@@ -469,7 +468,7 @@ index 14cd9aeeebe..ed3a07c423d 100644
  #define MAX_PROP_PAGES 99
  
  static void DoOpenProperties(ContextMenu *This, HWND hwnd)
-@@ -716,6 +1098,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
+@@ -713,6 +1095,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
  	if (SUCCEEDED(ret))
  	{
              init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);
@@ -516,5 +515,5 @@ index 210046e729d..0f3a64f16d2 100644
  #define IDS_RECYCLEBIN_FOLDER_NAME   8964
  
 -- 
-2.35.1
+2.40.1