wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 31af1aeb7895bddf59a73886b89759f76881bc9e.

Browse Source
This commit is contained in:
Zebediah Figura 2021-03-04 17:50:31 -06:00
parent 64efb6f0d3
commit 3a33c70a9a
4 changed files with 21 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
patches/ntdll-NtAlertThreadByThreadId/0004-ntdll-Implement-NtAlertThreadByThreadId-and-NtWaitFo.patch
View File

@ -1,4 +1,4 @@
From d8919e4d3790e738ec0cb09907609f4fde8f29e7 Mon Sep 17 00:00:00 2001
From 94c6132d79ee02079fc952e33cccf0d1f456a1ec Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Mon, 31 Aug 2020 23:00:16 -0500
Subject: [PATCH] ntdll: Implement NtAlertThreadByThreadId() and
@ -12,11 +12,10 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
dlls/ntdll/unix/unix_private.h | 3 +++
dlls/ntdll/unix/virtual.c | 5 ++--
include/winternl.h | 2 ++
server/thread.c | 2 +-
7 files changed, 58 insertions(+), 3 deletions(-)
6 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 0a2c2493334..c4a21991562 100644
index ac7365a84b6..91959e19149 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -137,6 +137,7 @@
@ -36,10 +35,10 @@ index 0a2c2493334..c4a21991562 100644
@ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr)
@ stub NtWaitForProcessMutant
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 32ee7a52b99..587f0858600 100644
index 16635ee42fa..7e19fab1e97 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -82,6 +82,12 @@ static const LARGE_INTEGER zero_timeout;
@@ -81,6 +81,12 @@ static const LARGE_INTEGER zero_timeout;
static pthread_mutex_t addr_mutex = PTHREAD_MUTEX_INITIALIZER;
@ -52,7 +51,7 @@ index 32ee7a52b99..587f0858600 100644
/* return a monotonic time counter, in Win32 ticks */
static inline ULONGLONG monotonic_counter(void)
{
@@ -2336,6 +2342,45 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl
@@ -2277,6 +2283,45 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl
}
@ -99,7 +98,7 @@ index 32ee7a52b99..587f0858600 100644
NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout )
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 9808fc610e3..bb55b3d29ed 100644
index 00d29ae706b..87f5a97131e 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -252,6 +252,8 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT
@ -112,10 +111,10 @@ index 9808fc610e3..bb55b3d29ed 100644
pthread_attr_setstack( &pthread_attr, teb->DeallocationStack,
(char *)teb->Tib.StackBase + extra_stack - (char *)teb->DeallocationStack );
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 68a24d97cfd..1880ce51b6e 100644
index b8b6619c0a9..ae178fadd8b 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -59,6 +59,7 @@ struct ntdll_thread_data
@@ -58,6 +58,7 @@ struct ntdll_thread_data
struct list entry; /* entry in TEB list */
PRTL_THREAD_START_ROUTINE start; /* thread entry point */
void *param; /* thread entry point parameter */
@ -123,9 +122,9 @@ index 68a24d97cfd..1880ce51b6e 100644
};
C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) );
@@ -115,6 +116,8 @@ extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT
extern void CDECL set_show_dot_files( BOOL enable ) DECLSPEC_HIDDEN;
@@ -105,6 +106,8 @@ extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch,
CONTEXT *context ) DECLSPEC_HIDDEN;
+extern struct list teb_list DECLSPEC_HIDDEN;
+extern pthread_rwlock_t teb_list_lock DECLSPEC_HIDDEN;
@ -133,10 +132,10 @@ index 68a24d97cfd..1880ce51b6e 100644
extern const char *data_dir DECLSPEC_HIDDEN;
extern const char *build_dir DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 34eadfd3d37..a136390c994 100644
index d1d00b91345..3e3c9b5f00e 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -164,8 +164,9 @@ struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000;
@@ -162,8 +162,9 @@ struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000;
static void *teb_block;
static void **next_free_teb;
static int teb_block_pos;
@ -149,10 +148,10 @@ index 34eadfd3d37..a136390c994 100644
#define ROUND_ADDR(addr,mask) ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask)))
#define ROUND_SIZE(addr,size) (((SIZE_T)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask)
diff --git a/include/winternl.h b/include/winternl.h
index 4d8b5841d17..a388e9e7741 100644
index f0ab223ef2e..9a5a1b541b7 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -3213,6 +3213,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG
@@ -3229,6 +3229,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG
NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG);
NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle);
@ -160,7 +159,7 @@ index 4d8b5841d17..a388e9e7741 100644
NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid);
NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR);
NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG);
@@ -3451,6 +3452,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);
@@ -3467,6 +3468,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);
NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID);
NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID);
NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*);
@ -169,5 +168,5 @@ index 4d8b5841d17..a388e9e7741 100644
NTSYSAPI NTSTATUS WINAPI NtWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*);
NTSYSAPI NTSTATUS WINAPI NtWaitForMultipleObjects(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*);
--
2.29.2
2.20.1

6
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "6d5659103f49db9e045087dd0093acc3b9a4b919"
echo "31af1aeb7895bddf59a73886b89759f76881bc9e"
}
# Show version information
@ -3616,11 +3616,9 @@ fi
# | * ntdll-FileDispositionInformation, kernel32-CopyFileEx, shell32-SHFileOperation_Move, shell32-Progress_Dialog
# |
# | Modified files:
# | * dlls/aclui/Makefile.in, dlls/aclui/aclui.rc, dlls/aclui/aclui_main.c, dlls/aclui/resource.h, dlls/aclui/user_icons.bmp,
# | dlls/shell32/Makefile.in, dlls/shell32/shell32.rc, dlls/shell32/shlview_cmenu.c, dlls/shell32/shresdef.h
# | * dlls/shell32/Makefile.in, dlls/shell32/shell32.rc, dlls/shell32/shlview_cmenu.c, dlls/shell32/shresdef.h
# |
if test "$enable_shell32_ACE_Viewer" -eq 1; then
patch_apply shell32-ACE_Viewer/0001-aclui-Add-basic-ACE-viewer.patch
patch_apply shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch
fi

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

@ -1,728 +0,0 @@
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.
---
dlls/aclui/Makefile.in | 3 +
dlls/aclui/aclui.rc | 58 +++++
dlls/aclui/aclui_main.c | 526 +++++++++++++++++++++++++++++++++++++-
dlls/aclui/resource.h | 38 +++
dlls/aclui/user_icons.bmp | Bin 0 -> 2730 bytes
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
diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in
index e79b3fe9e33..1eac32f0700 100644
--- a/dlls/aclui/Makefile.in
+++ b/dlls/aclui/Makefile.in
@@ -1,6 +1,9 @@
MODULE = aclui.dll
IMPORTLIB = aclui
+IMPORTS = comctl32 user32 advapi32 gdi32
EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = aclui_main.c
+
+RC_SRCS = aclui.rc
diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc
new file mode 100644
index 00000000000..08f8b567314
--- /dev/null
+++ b/dlls/aclui/aclui.rc
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2017 Michael Müller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "resource.h"
+
+#define WINE_FILEDESCRIPTION_STR "Wine Security Descriptor Editor"
+#define WINE_FILENAME_STR "aclui.dll"
+#define WINE_FILEVERSION 5,1,2600,5512
+#define WINE_FILEVERSION_STR "5.1.2600.5512"
+#define WINE_PRODUCTVERSION 5,1,2600,5512
+#define WINE_PRODUCTVERSION_STR "5.1"
+
+#include "wine/wine_common_ver.rc"
+
+#pragma makedep po
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+IDD_SECURITY_PROPERTIES DIALOGEX 0, 0, 240, 215
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "Security"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Group or user names:", -1, 5, 5, 230, 10
+ CONTROL "", IDC_USERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SORTASCENDING | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 17, 230, 63, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE
+ PUSHBUTTON "A&dd", IDC_USER_ADD, 110, 85, 60, 15
+ PUSHBUTTON "&Remove", IDC_USER_REMOVE, 175, 85, 60, 15
+
+ LTEXT "", IDC_ACE_USER, 5, 105, 110, 10
+ LTEXT "Allow", -1, 120, 105, 55, 10, SS_CENTER
+ LTEXT "Deny", -1, 180, 105, 55, 10, SS_CENTER
+ CONTROL "", IDC_ACE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 115, 230, 95, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE
+END
+
+STRINGTABLE
+BEGIN
+ IDS_PERMISSION_FOR "Permissions for %1"
+END
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+/* @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..6fd6a561ff9 100644
--- a/dlls/aclui/aclui_main.c
+++ b/dlls/aclui/aclui_main.c
@@ -20,25 +20,543 @@
#include <stdarg.h>
+#define COBJMACROS
+#define NONAMELESSUNION
+
#include "initguid.h"
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winnt.h"
#include "aclui.h"
+#include "resource.h"
+#include "wine/list.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(aclui);
-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)
+#define ISecurityInformation_GetObjectInformation(This, obj) (This)->lpVtbl->GetObjectInformation(This, obj)
+#define ISecurityInformation_GetSecurity(This, info, sd, def) (This)->lpVtbl->GetSecurity(This, info, sd, def)
+#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;
+
+ /* must be the last entry */
+ SID sid;
+};
+
+struct security_page
+{
+ ISecurityInformation *security;
+ SI_OBJECT_INFO info;
+ PSECURITY_DESCRIPTOR sd;
+ SI_ACCESS *access;
+ ULONG access_count;
+ struct list users;
+
+ HWND dialog;
+ HIMAGELIST image_list_user;
+};
+
+static HINSTANCE aclui_instance;
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+ TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+
+ switch (fdwReason)
+ {
+ case DLL_PROCESS_ATTACH:
+ aclui_instance = hinstDLL;
+ DisableThreadLibraryCalls(hinstDLL);
+ break;
+ }
+ return TRUE;
+}
+
+static WCHAR* WINAPIV load_formatstr(UINT resource, ...)
+{
+ __ms_va_list valist;
+ WCHAR *str, fmtstr[256];
+ DWORD ret;
+
+ if (!LoadStringW(aclui_instance, resource, fmtstr, 256))
+ return NULL;
+
+ __ms_va_start( valist, resource );
+ ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
+ fmtstr, 0, 0, (WCHAR*)&str, 0, &valist);
+ __ms_va_end( valist );
+ return ret ? str : NULL;
+}
+
+static void security_page_free(struct security_page *page)
+{
+ struct user *user, *user2;
+
+ LIST_FOR_EACH_ENTRY_SAFE(user, user2, &page->users, struct user, entry)
+ {
+ list_remove(&user->entry);
+ HeapFree(GetProcessHeap(), 0, user->name);
+ HeapFree(GetProcessHeap(), 0, user);
+ }
+
+ if (page->image_list_user) ImageList_Destroy(page->image_list_user);
+ if (page->security) ISecurityInformation_Release(page->security);
+ HeapFree(GetProcessHeap(), 0, page);
+}
+
+static void users_clear(struct security_page *page)
+{
+ struct user *user, *user2;
+
+ LIST_FOR_EACH_ENTRY_SAFE(user, user2, &page->users, struct user, entry)
+ {
+ /* TODO: Remove from GUI */
+
+ list_remove(&user->entry);
+ HeapFree(GetProcessHeap(), 0, user->name);
+ HeapFree(GetProcessHeap(), 0, user);
+ }
+}
+
+static WCHAR *get_sid_name(PSID sid, SID_NAME_USE *sid_type)
+{
+ WCHAR *name, *domain;
+ DWORD domain_len = 0;
+ DWORD name_len = 0;
+ BOOL ret;
+
+ LookupAccountSidW(NULL, sid, NULL, &name_len, NULL, &domain_len, sid_type);
+ if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+ return NULL;
+ if (!(name = HeapAlloc(GetProcessHeap(), 0, name_len * sizeof(WCHAR))))
+ return NULL;
+ if (!(domain = HeapAlloc(GetProcessHeap(), 0, domain_len * sizeof(WCHAR))))
+ goto error;
+
+ ret = LookupAccountSidW(NULL, sid, name, &name_len, domain, &domain_len, sid_type);
+ HeapFree(GetProcessHeap(), 0, domain);
+ if (ret) return name;
+
+error:
+ HeapFree(GetProcessHeap(), 0, name);
return NULL;
}
-BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi)
+static BOOL users_add(struct security_page *page, PSID sid)
+{
+ SID_NAME_USE sid_type;
+ struct user *user;
+ DWORD sid_len;
+ LVITEMW item;
+ WCHAR *name;
+
+ /* check if we already processed this user or group */
+ LIST_FOR_EACH_ENTRY( user, &page->users, struct user, entry )
+ {
+ if (EqualSid(sid, &user->sid))
+ return TRUE;
+ }
+
+ if (!(name = get_sid_name(sid, &sid_type)))
+ return FALSE;
+
+ sid_len = GetLengthSid(sid);
+ user = HeapAlloc(GetProcessHeap(), 0, offsetof(struct user, sid) + sid_len);
+ if (!user)
+ {
+ HeapFree(GetProcessHeap(), 0, name);
+ return FALSE;
+ }
+
+ user->name = name;
+ CopySid(sid_len, &user->sid, sid);
+ list_add_tail(&page->users, &user->entry);
+
+ /* Add in GUI */
+ item.mask = LVIF_PARAM | LVIF_TEXT;
+ item.iItem = -1;
+ item.iSubItem = 0;
+ item.pszText = name;
+ item.lParam = (LPARAM)user;
+
+ if (page->image_list_user)
+ {
+ item.mask |= LVIF_IMAGE;
+ item.iImage = (sid_type == SidTypeGroup || sid_type == SidTypeWellKnownGroup) ? 0 : 1;
+ }
+
+ ListView_InsertItemW(GetDlgItem(page->dialog, IDC_USERS), &item);
+ return TRUE;
+}
+
+static PSID get_sid_from_ace(ACE_HEADER *ace)
+{
+ switch (ace->AceType)
+ {
+ case ACCESS_ALLOWED_ACE_TYPE:
+ return (SID *)&((ACCESS_ALLOWED_ACE *)ace)->SidStart;
+ case ACCESS_DENIED_ACE_TYPE:
+ return (SID *)&((ACCESS_DENIED_ACE *)ace)->SidStart;
+ default:
+ FIXME("Don't know how to extract SID from ace type %d\n", ace->AceType);
+ return NULL;
+ }
+}
+
+static void users_refresh(struct security_page *page)
+{
+ BOOL defaulted, present;
+ ACE_HEADER *ace;
+ DWORD index;
+ ACL *dacl;
+ PSID sid;
+
+ users_clear(page);
+
+ /* Add Owner to list */
+ if (GetSecurityDescriptorOwner(page->sd, &sid, &defaulted))
+ users_add(page, sid);
+
+ /* Everyone else who appears in the DACL */
+ if (GetSecurityDescriptorDacl(page->sd, &present, &dacl, &defaulted) && present)
+ {
+ for (index = 0; index < dacl->AceCount; index++)
+ {
+ if (!GetAce(dacl, index, (void**)&ace))
+ break;
+ if (!(sid = get_sid_from_ace(ace)))
+ continue;
+ users_add(page, sid);
+ }
+ }
+}
+
+static HIMAGELIST create_image_list(UINT resource, UINT width, UINT height, UINT count, COLORREF mask_color)
+{
+ HIMAGELIST image_list;
+ HBITMAP image;
+ INT ret;
+
+ if (!(image_list = ImageList_Create(width, height, ILC_COLOR32 | ILC_MASK, 0, count)))
+ return NULL;
+ if (!(image = LoadBitmapW(aclui_instance, MAKEINTRESOURCEW(resource))))
+ goto error;
+
+ ret = ImageList_AddMasked(image_list, image, mask_color);
+ DeleteObject(image);
+ if (ret != -1) return image_list;
+
+error:
+ ImageList_Destroy(image_list);
+ return NULL;
+}
+
+static void compute_access_masks(PSECURITY_DESCRIPTOR sd, PSID sid, ACCESS_MASK *allowed, ACCESS_MASK *denied)
+{
+ BOOL defaulted, present;
+ ACE_HEADER *ace;
+ PSID ace_sid;
+ DWORD index;
+ ACL *dacl;
+
+ *allowed = 0;
+ *denied = 0;
+
+ if (!GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted) || !present)
+ return;
+
+ for (index = 0; index < dacl->AceCount; index++)
+ {
+ if (!GetAce(dacl, index, (void**)&ace))
+ break;
+
+ ace_sid = get_sid_from_ace(ace);
+ if (!ace_sid || !EqualSid(ace_sid, sid))
+ continue;
+
+ if (ace->AceType == ACCESS_ALLOWED_ACE_TYPE)
+ *allowed |= ((ACCESS_ALLOWED_ACE*)ace)->Mask;
+ else if (ace->AceType == ACCESS_DENIED_ACE_TYPE)
+ *denied |= ((ACCESS_DENIED_ACE*)ace)->Mask;
+ }
+}
+
+static void show_ace_entries(struct security_page *page, struct user *user)
+{
+ static const WCHAR yesW[] = {'X',0};
+ static const WCHAR noW[] = {'-',0};
+
+ ACCESS_MASK allowed, denied;
+ WCHAR *infotext;
+ ULONG i, index;
+ LVITEMW item;
+ HWND control;
+
+ compute_access_masks(page->sd, &user->sid, &allowed, &denied);
+
+ if ((infotext = load_formatstr(IDS_PERMISSION_FOR, user->name)))
+ {
+ SetDlgItemTextW(page->dialog, IDC_ACE_USER, infotext);
+ LocalFree(infotext);
+ }
+
+ control = GetDlgItem(page->dialog, IDC_ACE);
+ index = 0;
+ for (i = 0; i < page->access_count; i++)
+ {
+ if (!(page->access[i].dwFlags & SI_ACCESS_GENERAL))
+ continue;
+
+ item.mask = LVIF_TEXT;
+ item.iItem = index;
+
+ item.iSubItem = 1;
+ if ((page->access[i].mask & allowed) == page->access[i].mask)
+ item.pszText = (WCHAR *)yesW;
+ else
+ item.pszText = (WCHAR *)noW;
+ ListView_SetItemW(control, &item);
+
+ item.iSubItem = 2;
+ if ((page->access[i].mask & denied) == page->access[i].mask)
+ item.pszText = (WCHAR *)yesW;
+ else
+ item.pszText = (WCHAR *)noW;
+ ListView_SetItemW(control, &item);
+
+ index++;
+ }
+}
+
+static void create_ace_entries(struct security_page *page)
+{
+ WCHAR str[256];
+ HWND control;
+ LVITEMW item;
+ ULONG i, index;
+
+ control = GetDlgItem(page->dialog, IDC_ACE);
+ index = 0;
+ for (i = 0; i < page->access_count; i++)
+ {
+ if (!(page->access[i].dwFlags & SI_ACCESS_GENERAL))
+ continue;
+
+ item.mask = LVIF_TEXT;
+ item.iItem = index;
+ item.iSubItem = 0;
+ if (IS_INTRESOURCE(page->access[i].pszName))
+ {
+ str[0] = 0;
+ LoadStringW(page->info.hInstance, (UINT)(DWORD_PTR)page->access[i].pszName, str, 256);
+ item.pszText = str;
+ }
+ else
+ item.pszText = (WCHAR *)page->access[i].pszName;
+ ListView_InsertItemW(control, &item);
+
+ index++;
+ }
+}
+
+static void security_page_init_dlg(HWND hwnd, struct security_page *page)
+{
+ LVCOLUMNW column;
+ HWND control;
+ RECT rect;
+ ULONG def = 0;
+
+ page->dialog = hwnd;
+
+ if (FAILED(ISecurityInformation_GetSecurity(page->security, DACL_SECURITY_INFORMATION |
+ OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION,
+ &page->sd, FALSE)))
+ return;
+
+ if (FAILED(ISecurityInformation_GetAccessRights(page->security, NULL, 0, &page->access,
+ &page->access_count, &def)))
+ return;
+
+ /* Prepare user list */
+ control = GetDlgItem(hwnd, IDC_USERS);
+ SendMessageW(control, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
+
+ GetClientRect(control, &rect);
+ column.mask = LVCF_FMT | LVCF_WIDTH;
+ column.fmt = LVCFMT_LEFT;
+ column.cx = rect.right - rect.left;
+ ListView_InsertColumnW(control, 0, &column);
+
+ if ((page->image_list_user = create_image_list(IDB_USER_ICONS, 18, 18, 2, RGB(255, 0, 255))))
+ SendMessageW(control, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)page->image_list_user);
+
+ /* Prepare ACE list */
+ control = GetDlgItem(hwnd, IDC_ACE);
+ SendMessageW(control, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
+
+ column.mask = LVCF_FMT | LVCF_WIDTH;
+ column.fmt = LVCFMT_LEFT;
+ column.cx = 170;
+ ListView_InsertColumnW(control, 0, &column);
+
+ column.mask = LVCF_FMT | LVCF_WIDTH;
+ column.fmt = LVCFMT_CENTER;
+ column.cx = 85;
+ ListView_InsertColumnW(control, 1, &column);
+
+ column.mask = LVCF_FMT | LVCF_WIDTH;
+ column.fmt = LVCFMT_CENTER;
+ column.cx = 85;
+ ListView_InsertColumnW(control, 2, &column);
+
+ users_refresh(page);
+ create_ace_entries(page);
+
+ if (!list_empty(&page->users))
+ {
+ LVITEMW item;
+ item.mask = LVIF_STATE;
+ item.iItem = 0;
+ item.iSubItem = 0;
+ item.state = LVIS_FOCUSED | LVIS_SELECTED;
+ item.stateMask = item.state;
+ ListView_SetItemW(GetDlgItem(hwnd, IDC_USERS), &item);
+ }
+}
+
+static INT_PTR CALLBACK security_page_proc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
- FIXME("(%p, %p): stub\n", owner, psi);
+ switch (msg)
+ {
+ case WM_INITDIALOG:
+ {
+ LPPROPSHEETPAGEW ppsp = (LPPROPSHEETPAGEW)lParam;
+ SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)ppsp->lParam);
+ security_page_init_dlg(hwndDlg, (struct security_page *)ppsp->lParam);
+ break;
+ }
+
+ case WM_COMMAND:
+ if (LOWORD(wParam) == IDC_USER_ADD ||
+ LOWORD(wParam) == IDC_USER_REMOVE)
+ {
+ /* TODO: Adding & removing users */
+ MessageBoxA(hwndDlg, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION);
+ }
+ break;
+
+ case WM_NOTIFY:
+ {
+ struct security_page *page = (struct security_page *)GetWindowLongPtrW(hwndDlg, DWLP_USER);
+ NMHDR *hdr = (NMHDR *)lParam;
+
+ if (hdr->hwndFrom == GetDlgItem(hwndDlg, IDC_USERS) && hdr->code == LVN_ITEMCHANGED)
+ {
+ NMLISTVIEW *nmv = (NMLISTVIEW *)lParam;
+ if (!(nmv->uOldState & LVIS_SELECTED) && (nmv->uNewState & LVIS_SELECTED))
+ show_ace_entries(page, (struct user *)nmv->lParam);
+ return TRUE;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
return FALSE;
}
+
+static UINT CALLBACK security_page_callback(HWND hwnd, UINT msg, LPPROPSHEETPAGEW ppsp)
+{
+ struct security_page *page = (struct security_page *)ppsp->lParam;
+
+ if (msg == PSPCB_RELEASE)
+ security_page_free(page);
+
+ return 1;
+}
+
+static HPROPSHEETPAGE create_security_property_page(ISecurityInformation *security)
+{
+ struct security_page *page;
+ PROPSHEETPAGEW propsheet;
+ HPROPSHEETPAGE ret;
+
+ if (!(page = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*page))))
+ return NULL;
+
+ list_init(&page->users);
+ page->security = security;
+ ISecurityInformation_AddRef(security);
+
+ if (FAILED(ISecurityInformation_GetObjectInformation(security, &page->info)))
+ goto error;
+
+ memset(&propsheet, 0, sizeof(propsheet));
+ propsheet.dwSize = sizeof(propsheet);
+ propsheet.dwFlags = PSP_DEFAULT | PSP_USECALLBACK;
+ propsheet.hInstance = aclui_instance;
+ propsheet.u.pszTemplate = (LPWSTR)MAKEINTRESOURCE(IDD_SECURITY_PROPERTIES);
+ propsheet.pfnDlgProc = security_page_proc;
+ propsheet.pfnCallback = security_page_callback;
+ propsheet.lParam = (LPARAM)page;
+
+ if (page->info.dwFlags & SI_PAGE_TITLE)
+ {
+ propsheet.pszTitle = page->info.pszPageTitle;
+ propsheet.dwFlags |= PSP_USETITLE;
+ }
+
+ if ((ret = CreatePropertySheetPageW(&propsheet)))
+ return ret;
+
+error:
+ security_page_free(page);
+ return NULL;
+}
+
+HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi)
+{
+ FIXME("(%p): semi-stub\n", psi);
+
+ InitCommonControls();
+ return create_security_property_page(psi);
+}
+
+BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi)
+{
+ PROPSHEETHEADERW prop;
+ HPROPSHEETPAGE pages[1];
+ SI_OBJECT_INFO info;
+ BOOL ret;
+
+ TRACE("(%p, %p)\n", owner, psi);
+
+ if (FAILED(ISecurityInformation_GetObjectInformation(psi, &info)))
+ return FALSE;
+ if (!(pages[0] = CreateSecurityPage(psi)))
+ return FALSE;
+
+ memset(&prop, 0, sizeof(prop));
+ prop.dwSize = sizeof(prop);
+ prop.dwFlags = PSH_DEFAULT;
+ prop.hwndParent = owner;
+ prop.hInstance = aclui_instance;
+ prop.pszCaption = load_formatstr(IDS_PERMISSION_FOR, info.pszObjectName);
+ prop.nPages = 1;
+ prop.u2.nStartPage = 0;
+ prop.u3.phpage = pages;
+
+ ret = PropertySheetW(&prop) != -1;
+ LocalFree((void *)prop.pszCaption);
+ return ret;
+}
diff --git a/dlls/aclui/resource.h b/dlls/aclui/resource.h
new file mode 100644
index 00000000000..ba3eb8160ab
--- /dev/null
+++ b/dlls/aclui/resource.h
@@ -0,0 +1,38 @@
+/*
+ * Definitions for aclui dialog controls
+ *
+ * Copyright (c) 2017 Michael Müller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_ACLUI__
+#define __WINE_ACLUI__
+
+#define IDD_SECURITY_PROPERTIES 100
+
+#define IDC_USERS 101
+#define IDC_USER_ADD 102
+#define IDC_USER_REMOVE 103
+
+#define IDC_ACE_USER 110
+#define IDC_ACE 111
+
+#define IDS_PERMISSION_FOR 1000
+
+#define IDB_USER_ICONS 2000
+#define IDB_CHECKBOX 2001
+
+#endif /* __WINE_ACLUI__ */
diff --git a/dlls/aclui/user_icons.bmp b/dlls/aclui/user_icons.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..29259e2724ccf67b7e3e84c3fc6d749bc9e8ae26
GIT binary patch
literal 2730
zcmdUtc~F#P0LH1N8IS3YY|3(`$+FC$Q3M3!8WF=I!cj3Jj^t)pSCB(Uu2clUR2&33
zmt$E#SWXd>M2$=FNK;cX1Ox;D6*{J|rkY>xw}vCAo72=EeY4NL`+nd1{Py{t_qBB>
zousF|c8KpNp*Mx52tB1YUGEt&P8ZJ&pS>qB9lg-gyZ_O%U9u`<^ud#kPmfy&di<}{
zakhb0O*)MQyY8!{B!$ke8g;%$TT?AHpKYKjQ9<Q)`9rGS5x~WIjZVh+t~9YeWct~V
zEwe@`w-H)Mmdu6>KWlM+A%)TIkK`T6*g}5L`zZYvknL+p)?dmLW4gBmX<im&3QoGe
z9hD;2`2T&>{G?_dsa{rOyBm_@A>?UD@ut;exz8p2V*`?1=8)iGhP3WM|43gK1tH7D
z8bj?`$*&atY)>N!!&Z{9b}ngd2BZl8)|L9C$rjUnv2_eX;$7(MM3$P2bJ7mhChsOT
z=mS(TbJRY@6#LC%zs!Utv2O)po-5eN&a=t#v*MUCZVaonEFE>gyQI1rpz=1>`qjSk
z(1bfsn;cG_mytG~lq=p*pDej8P3ojEj2pLaVHO&|OY6Ov?B~V=9~T_mY|#WQL?bt)
zYP}h?p*9TO?4xFrJ%xfVWy(|7^3BomF{~!lPD(-+YqOMycaZ#LLdVm>Idf1&k$5*L
zr_`C0DQBH6m+H&LFk;ksOk3y41SyOES|-TdnIdy0dA*&;V$RV|9jHu{Q+uqL^3Q@f
z6yt!}-<-;AK4Umi&wW?VQyR9MQhyUF6lNR<m``n>IUT3!80_s7`OHM$Cggh?k>h28
zI&>v>bAK4a3Cqpm<q$a&6&_3s^kHI<uU0lb4itsj;}(&C_3lPYQZ8V%rx};XM9O1a
z8S1<;hBJDODz|!aV51$?qSyKudy0aW(A?BWbIS?xLsw82>!|HWx_>As^dUy|$rfgQ
z5_m7iMmdusH!x|VKa;{0%naI$S!Nq^vaX|_ah;iIU6?7`*?r{lL!8k(BmLcIBGynF
zX2<4D3M^wQuuMKJbOwvKgKUWoK@+-+k_hL=GS=*j<CVxDCIoo#f?oj7Ir{Rvhscw7
zn5Fw~;9fI;OVv%RRlU5O-i4dy+GAN#uG>BB1c!%VnsgGA+-_zGkK{AX>BfBTSv(`R
z^T+hxAIrGw{wwxzo0;kq%5=X}UXy3?x;z7;T_^B8G{~M)BgD7d;ls+Cyd^qvEbe$L
zYqY1unO|d`-=lp88+9+HBA4WyExKNmed%xg5y~3gP-HVBxR4n^g-rEHV^-X86m>)F
zJu^bWiD8^Xp4pk#kyUl+<el&Ti3K_BIF$C`T|0pP=YxDCyjH3nZKnCk4%Fucbuyf`
z7c(cOTAbY`tadh_zp0!TWlC()&!Z4L53y&<if{0qs-4S&KkH<D@!cJks=KsV;#-E<
zb9#i0M{lu0)5k1v4$X6~lW@FOC&P7@28+aFtWvkLJg<#;+v=Dm%fvdWfT$xqC~CTh
zsO#p&_rK`mNc+_@a+ei_9jrS%NV3SHy7(heU*2YQc|Y%nel2r4sBa(E$w{hcz$*SA
zcKgn<DCIN;F$Z|nKLbT-l}_L2c^N;tmRv=4Xn-)$OLW6+?Vc?a{hH?X;Gk-IB4%KE
z4dzk%F^;Z8e}fXI_@XEBjn5*@hns%GvET}BmA!Z#9AHgFKeh$kEX!@<+acZi{UEQs
mZ-|`3t(<G``Nvrv<n3+g$E*Ar9%a|qcJ$w2KFI$MfBy-k@DaHH
literal 0
HcmV?d00001
--
2.20.1

2
staging/upstream-commit
View File

@ -1 +1 @@
6d5659103f49db9e045087dd0093acc3b9a4b919
31af1aeb7895bddf59a73886b89759f76881bc9e