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 16e73be10d940c9c04101a47687a6f8a385c2b0f.

Browse Source
This commit is contained in:
Zebediah Figura
2021-09-17 17:45:25 -05:00
parent 3a06c15dd2
commit fdcc8bec48
9 changed files with 105 additions and 105 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,4 +1,4 @@
From 407cf938ab003880cc74273e172fbce2b1eec539 Mon Sep 17 00:00:00 2001
From 1c2286d2ad8a3298ed1f056715b9d236243b879e 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 fe49bf09f98..f6fcf2e18eb 100644
index 04dd196cfe8..70dbe2b06bb 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
@ -24,10 +24,10 @@ 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 1324a5449a3..3fc9d205c25 100644
index eb03982f6a9..c6280edac6b 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -204,6 +204,33 @@ the folder?"
@@ -202,6 +202,33 @@ the folder?"
IDS_RUNDLG_BROWSE_FILTER_EXE "Executable files (*.exe)"
IDS_RUNDLG_BROWSE_FILTER_ALL "All files (*.*)"
@ -62,7 +62,7 @@ index 1324a5449a3..3fc9d205c25 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 e7c1cf16e10..b3bcd37fa56 100644
index 6290cd0f9c8..0c62b6271c3 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -39,14 +39,133 @@
@ -401,7 +401,7 @@ index e7c1cf16e10..b3bcd37fa56 100644
+ security->ref = 1;
+ security->directory = directory;
+
+ len = (strlenW(path) + 1) * sizeof(WCHAR);
+ len = (wcslen(path) + 1) * sizeof(WCHAR);
+ security->path = HeapAlloc(GetProcessHeap(), 0, len);
+ if (!security->path) goto error;
+
@ -478,10 +478,10 @@ index e7c1cf16e10..b3bcd37fa56 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 33edb584c1b..e2211024cc3 100644
index 210046e729d..0f3a64f16d2 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -157,6 +157,33 @@
@@ -155,6 +155,33 @@
#define IDS_FILEOP_FROM 337
#define IDS_FILEOP_PREFLIGHT 338
@ -516,5 +516,5 @@ index 33edb584c1b..e2211024cc3 100644
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
--
2.30.2
2.33.0