Rebase against bf42dca35f05bce9996e91f59cc47b5a9e6996b2.

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

@@ -1,4 +1,4 @@
-From c414d9b1fa846d017e9749080645b3c0b201d242 Mon Sep 17 00:00:00 2001
+From 12fc8bc5d9f0464b91d9412cd8a29ef5bda89caf 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.
@@ -11,11 +11,11 @@ Subject: [PATCH] shell32: Add security property tab.
  4 files changed, 438 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
-index e31c165ccff..bb03300f9c9 100644
+index eeb6cd63d60..7cc704e56b6 100644
 --- a/dlls/shell32/Makefile.in
 +++ b/dlls/shell32/Makefile.in
 @@ -1,7 +1,7 @@
- EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHELL32_
+ EXTRADEFS = -D_SHELL32_
  MODULE    = shell32.dll
  IMPORTLIB = shell32
 -IMPORTS   = uuid shlwapi user32 gdi32 advapi32
@@ -62,10 +62,10 @@ 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 6c05904bb91..43cbea2ec87 100644
+index 176ce6061e6..57d0904af23 100644
 --- a/dlls/shell32/shlview_cmenu.c
 +++ b/dlls/shell32/shlview_cmenu.c
-@@ -39,14 +39,133 @@
+@@ -38,14 +38,133 @@
  
  #include "shresdef.h"
  #include "shlwapi.h"
@@ -199,7 +199,7 @@ index 6c05904bb91..43cbea2ec87 100644
  typedef struct
  {
      IContextMenu3 IContextMenu3_iface;
-@@ -638,6 +757,269 @@ error:
+@@ -637,6 +756,269 @@ error:
      heap_free(props);
  }
  
@@ -469,7 +469,7 @@ index 6c05904bb91..43cbea2ec87 100644
  #define MAX_PROP_PAGES 99
  
  static void DoOpenProperties(ContextMenu *This, HWND hwnd)
-@@ -717,6 +1099,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
+@@ -716,6 +1098,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
  	if (SUCCEEDED(ret))
  	{
              init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);