Rebase against 2deb8c2825afcb88a9f106b73aa1f4da9253fb87.

This commit is contained in:
Zebediah Figura
2021-04-30 17:50:37 -05:00
parent 4d8896cc35
commit 7d496bf02c
10 changed files with 134 additions and 132 deletions

View File

@@ -1,4 +1,4 @@
From 464489a607fc03a7a157e779c0c152e833cfab33 Mon Sep 17 00:00:00 2001
From 407cf938ab003880cc74273e172fbce2b1eec539 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.
@@ -62,10 +62,10 @@ 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 04ac0b6fd3c..3ea61dd730d 100644
index e7c1cf16e10..b3bcd37fa56 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -39,12 +39,131 @@
@@ -39,14 +39,133 @@
#include "shresdef.h"
#include "shlwapi.h"
@@ -80,6 +80,8 @@ index 04ac0b6fd3c..3ea61dd730d 100644
+
WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define FCIDM_BASE 0x7000
+/* According to https://blogs.msdn.microsoft.com/oldnewthing/20070726-00/?p=25833 */
+static const SI_ACCESS access_rights_files[] =
+{
@@ -197,7 +199,7 @@ index 04ac0b6fd3c..3ea61dd730d 100644
typedef struct
{
IContextMenu3 IContextMenu3_iface;
@@ -615,6 +734,269 @@ error:
@@ -649,6 +768,269 @@ error:
heap_free(props);
}
@@ -467,7 +469,7 @@ index 04ac0b6fd3c..3ea61dd730d 100644
#define MAX_PROP_PAGES 99
static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -697,6 +1079,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -731,6 +1113,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
if (SUCCEEDED(ret))
{
init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);