wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e.

Browse Source
This commit is contained in:
Zebediah Figura
2021-03-02 20:22:19 -06:00
parent 5d8901ac21
commit 0b1ffe4b94
5 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From f28a857b189d801435e899ed039611cc6fb116f2 Mon Sep 17 00:00:00 2001
From ae9ac5d6ccbfe580cfa53d6fa774d8ac4025a603 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: [PATCH] aclui: Add basic ACE viewer.
@@ -6,10 +6,10 @@ Subject: [PATCH] aclui: Add basic ACE viewer.
---
dlls/aclui/Makefile.in | 3 +
dlls/aclui/aclui.rc | 58 +++++
dlls/aclui/aclui_main.c | 531 +++++++++++++++++++++++++++++++++++++-
dlls/aclui/aclui_main.c | 526 +++++++++++++++++++++++++++++++++++++-
dlls/aclui/resource.h | 38 +++
dlls/aclui/user_icons.bmp | Bin 0 -> 2730 bytes
5 files changed, 626 insertions(+), 4 deletions(-)
5 files changed, 621 insertions(+), 4 deletions(-)
create mode 100644 dlls/aclui/aclui.rc
create mode 100644 dlls/aclui/resource.h
create mode 100644 dlls/aclui/user_icons.bmp
@@ -93,10 +93,10 @@ index 00000000000..08f8b567314
+/* @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 1a03f30df24..a3a789e2daa 100644
index 1a03f30df24..6fd6a561ff9 100644
--- a/dlls/aclui/aclui_main.c
+++ b/dlls/aclui/aclui_main.c
@@ -20,25 +20,548 @@
@@ -20,25 +20,543 @@
#include <stdarg.h>
@@ -117,9 +117,6 @@ index 1a03f30df24..a3a789e2daa 100644
WINE_DEFAULT_DEBUG_CHANNEL(aclui);
-HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi)
+
+HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi);
+
+/* the aclui.h files does not contain the necessary COBJMACROS */
+#define ISecurityInformation_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define ISecurityInformation_Release(This) (This)->lpVtbl->Release(This)
@@ -128,7 +125,8 @@ index 1a03f30df24..a3a789e2daa 100644
+#define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def)
+
+struct user
+{
{
- FIXME("(%p): stub\n", psi);
+ struct list entry;
+ WCHAR *name;
+
@@ -157,8 +155,6 @@ index 1a03f30df24..a3a789e2daa 100644
+
+ switch (fdwReason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ aclui_instance = hinstDLL;
+ DisableThreadLibraryCalls(hinstDLL);
@@ -200,8 +196,7 @@ index 1a03f30df24..a3a789e2daa 100644
+}
+
+static void users_clear(struct security_page *page)
{
- FIXME("(%p): stub\n", psi);
+{
+ struct user *user, *user2;
+
+ LIST_FOR_EACH_ENTRY_SAFE(user, user2, &page->users, struct user, entry)
@@ -729,5 +724,5 @@ literal 0
HcmV?d00001
--
2.30.0
2.20.1