wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6b724c3dd8d1ae83e90d4e7e9ec191016fabc7d0.

Browse Source
This commit is contained in:
Zebediah Figura
2021-09-23 16:27:13 -05:00
parent 8a2658a2ce
commit 5f6802dae2
6 changed files with 10 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 1c2286d2ad8a3298ed1f056715b9d236243b879e Mon Sep 17 00:00:00 2001
From ebc7c34335a94561564edb8af4dc2d606278d61f 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,7 +11,7 @@ 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 04dd196cfe8..70dbe2b06bb 100644
index eeb6cd63d60..7cc704e56b6 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
@@ -21,10 +21,10 @@ index 04dd196cfe8..70dbe2b06bb 100644
-IMPORTS = uuid shlwapi user32 gdi32 advapi32
+IMPORTS = uuid shlwapi user32 gdi32 advapi32 aclui
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus
# AUTHORS file is in the top-level directory
EXTRAINCL = -I$(top_srcdir)
C_SRCS = \
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index eb03982f6a9..c6280edac6b 100644
index 264947d337d..90898b7ed98 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -202,6 +202,33 @@ the folder?"
@@ -62,7 +62,7 @@ index eb03982f6a9..c6280edac6b 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 6290cd0f9c8..0c62b6271c3 100644
index 6c05904bb91..43cbea2ec87 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -39,14 +39,133 @@
@@ -199,7 +199,7 @@ index 6290cd0f9c8..0c62b6271c3 100644
typedef struct
{
IContextMenu3 IContextMenu3_iface;
@@ -649,6 +768,269 @@ error:
@@ -638,6 +757,269 @@ error:
heap_free(props);
}
@@ -469,7 +469,7 @@ index 6290cd0f9c8..0c62b6271c3 100644
#define MAX_PROP_PAGES 99
static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -731,6 +1113,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -717,6 +1099,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
if (SUCCEEDED(ret))
{
init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);