wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated mailing-list-patches patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-07-16 11:32:54 +10:00
parent 9092f3922a
commit 0bdc57245a
3 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,17 @@
From 10282216ac965075a8bf43734bfdaabd24fedf25 Mon Sep 17 00:00:00 2001
From 7865341c5b4e465ec027e8da439773bf3619a4f7 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: shell32: Add security property tab.
Subject: [PATCH] shell32: Add security property tab.
---
dlls/shell32/Makefile.in | 2 +-
dlls/shell32/shell32.rc | 27 +++
dlls/shell32/shlview_cmenu.c | 383 +++++++++++++++++++++++++++++++++++++++++++
dlls/shell32/shlview_cmenu.c | 383 +++++++++++++++++++++++++++++++++++
dlls/shell32/shresdef.h | 27 +++
4 files changed, 438 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 970ecba..d6d6eca 100644
index fe49bf09f98..f6fcf2e18eb 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
@@ -21,10 +21,10 @@ index 970ecba..d6d6eca 100644
-IMPORTS = uuid shlwapi user32 gdi32 advapi32
+IMPORTS = uuid shlwapi user32 gdi32 advapi32 aclui
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus
EXTRALIBS = $(CORESERVICES_LIBS)
# 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 826e291..d7129b6 100644
index 8739718f715..fb890a5953b 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -204,6 +204,33 @@ the folder?"
@@ -62,7 +62,7 @@ index 826e291..d7129b6 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 fc761e1..0bdb85e 100644
index 04ac0b6fd3c..3ea61dd730d 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -39,12 +39,131 @@
@@ -476,7 +476,7 @@ index fc761e1..0bdb85e 100644
hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo);
if (hpsxa != NULL)
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index ed76ac8..26fc4cd 100644
index 33edb584c1b..e2211024cc3 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -157,6 +157,33 @@
@@ -514,5 +514,5 @@ index ed76ac8..26fc4cd 100644
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
--
2.7.4
2.17.1