Rebase against d1764a45cfd12f8c5699fd7428cf90f90a2d31ef.

Actually rebase this time.

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

@@ -1,4 +1,4 @@
-From 7865341c5b4e465ec027e8da439773bf3619a4f7 Mon Sep 17 00:00:00 2001
+From 34e55c92e6deace0326f436c2c935bf2827510e1 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 fe49bf09f98..f6fcf2e18eb 100644
+index e89177c3a73..6be1631a05a 100644
 --- a/dlls/shell32/Makefile.in
 +++ b/dlls/shell32/Makefile.in
 @@ -1,7 +1,7 @@
- EXTRADEFS = -D_SHELL32_
+ EXTRADEFS = -D_SHELL32_ -DWINE_NO_NAMELESS_EXTENSION
  MODULE    = shell32.dll
  IMPORTLIB = shell32
 -IMPORTS   = uuid shlwapi user32 gdi32 advapi32
@@ -24,7 +24,7 @@ index fe49bf09f98..f6fcf2e18eb 100644
  # AUTHORS file is in the top-level directory
  EXTRAINCL = -I$(top_srcdir)
 diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
-index 8739718f715..fb890a5953b 100644
+index 1324a5449a3..3fc9d205c25 100644
 --- a/dlls/shell32/shell32.rc
 +++ b/dlls/shell32/shell32.rc
 @@ -204,6 +204,33 @@ the folder?"
@@ -514,5 +514,5 @@ index 33edb584c1b..e2211024cc3 100644
  #define IDS_RECYCLEBIN_FOLDER_NAME   8964
  
 -- 
-2.17.1
+2.30.2