Rebase against 3139727a97a91b91e74d57ec97a8c19b0093b68e

patches/shell32-ACE_Viewer/0001-aclui-Add-basic-ACE-viewer.patch

@@ -1,7 +1,7 @@
-From 457588a8b59ec77c1078692176e8eea160f8a5d5 Mon Sep 17 00:00:00 2001
+From 51438c7eb7bf3b04dd70c50ea860a3ce8b1628d0 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:01:28 +0200
-Subject: aclui: Add basic ACE viewer.
+Subject: [PATCH] aclui: Add basic ACE viewer.
 
 ---
  dlls/aclui/Makefile.in    |   3 +
@@ -15,14 +15,16 @@ Subject: aclui: Add basic ACE viewer.
  create mode 100644 dlls/aclui/user_icons.bmp
 
 diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in
-index f5b401c..9d6d0cf 100644
+index 83bd379..dc6a5e0 100644
 --- a/dlls/aclui/Makefile.in
 +++ b/dlls/aclui/Makefile.in
-@@ -1,4 +1,7 @@
+@@ -1,6 +1,9 @@
  MODULE    = aclui.dll
  IMPORTLIB = aclui
 +IMPORTS   = comctl32 user32 advapi32 gdi32
  
+ EXTRADLLFLAGS = -mno-cygwin
+ 
  C_SRCS = aclui_main.c
 +
 +RC_SRCS = aclui.rc
@@ -91,10 +93,10 @@ index 0000000..08f8b56
 +/* @makedep: user_icons.bmp */
 +IDB_USER_ICONS BITMAP user_icons.bmp
 diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c
-index 808f1f0..12e4374 100644
+index 033a471..ea35bba 100644
 --- a/dlls/aclui/aclui_main.c
 +++ b/dlls/aclui/aclui_main.c
-@@ -22,17 +22,53 @@
+@@ -20,17 +20,53 @@
  
  #include <stdarg.h>
  
@@ -148,7 +150,7 @@ index 808f1f0..12e4374 100644
  BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  {
      TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-@@ -42,20 +78,489 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+@@ -40,20 +76,489 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
      case DLL_WINE_PREATTACH:
          return FALSE;    /* prefer native version */
      case DLL_PROCESS_ATTACH:
@@ -722,5 +724,5 @@ literal 0
 HcmV?d00001
 
 -- 
-2.7.4
+1.9.1