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

Fix rebase

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2022-02-26 06:12:01 +11:00
parent 5d957e4169
commit 776c2a6800
3 changed files with 26 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server-File_Permissions/0002-server-Allow-to-open-files-without-any-permission-bi.patch
View File

@ -1,4 +1,4 @@
From 4d5eb31badf375562d45bdf58c748707c2fda3ac Mon Sep 17 00:00:00 2001
From c79db3f36aa653ec986ba948e547202fd95ed151 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 3 Apr 2015 03:58:47 +0200
Subject: [PATCH] server: Allow to open files without any permission bits. (try
@ -8,12 +8,12 @@ Changes in v2:
* As suggested by Piotr, fix the problem for both files and directories.
* Pay attention to requested access attributes - this fixes a couple more todo_wine's.
---
dlls/advapi32/tests/security.c | 26 ++++++++++++++++----------
dlls/advapi32/tests/security.c | 32 ++++++++++++--------------------
server/fd.c | 20 ++++++++++++++++++++
2 files changed, 36 insertions(+), 10 deletions(-)
2 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 135a45f7727..cbc558aaed5 100644
index 135a45f7727..2147d0f1700 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3710,17 +3710,13 @@ static void test_CreateDirectoryA(void)
@ -40,27 +40,27 @@ index 135a45f7727..cbc558aaed5 100644
CloseHandle(hTemp);
/* Test inheritance of ACLs in NtCreateFile without security descriptor */
@@ -3789,6 +3785,7 @@ static void test_CreateDirectoryA(void)
@@ -3789,17 +3785,13 @@ static void test_CreateDirectoryA(void)
error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
(PSID *)&owner, NULL, &pDacl, NULL, &pSD);
+<<<<<<< HEAD
todo_wine
- todo_wine
ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
if (error == ERROR_SUCCESS)
@@ -3800,6 +3797,15 @@ static void test_CreateDirectoryA(void)
acl_size.AceCount);
LocalFree(pSD);
}
+=======
+ ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error);
- if (error == ERROR_SUCCESS)
- {
- bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
- ok(bret, "GetAclInformation failed\n");
- todo_wine
- ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
- acl_size.AceCount);
- LocalFree(pSD);
- }
+ bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
+ ok(bret, "GetAclInformation failed\n");
+ todo_wine
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
+ acl_size.AceCount);
+ LocalFree(pSD);
+>>>>>>> eca474978f0 (server: Allow to open files without any permission bits. (try 2))
CloseHandle(hTemp);
done:

8
patches/server-File_Permissions/0004-advapi32-tests-Add-tests-for-ACL-inheritance-in-Crea.patch
View File

@ -1,4 +1,4 @@
From 22cf6534ece0dbe705bacf9d3d4c4228749e535d Mon Sep 17 00:00:00 2001
From 9efbce075628f4d6fc45a8727373e7311128b927 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 3 Apr 2015 03:58:59 +0200
Subject: [PATCH] advapi32/tests: Add tests for ACL inheritance in
@ -9,11 +9,11 @@ Subject: [PATCH] advapi32/tests: Add tests for ACL inheritance in
1 file changed, 70 insertions(+)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index cbc558aaed5..7b67a40afd5 100644
index 2147d0f1700..cd039c734e9 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3808,6 +3808,76 @@ static void test_CreateDirectoryA(void)
>>>>>>> eca474978f0 (server: Allow to open files without any permission bits. (try 2))
@@ -3794,6 +3794,76 @@ static void test_CreateDirectoryA(void)
LocalFree(pSD);
CloseHandle(hTemp);
+ /* Test inheritance of ACLs in CreateDirectory without security descriptor */

42
patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch
View File

@ -1,18 +1,18 @@
From 10b178b8989629da42c7ad99f92c89b7552b3b8c Mon Sep 17 00:00:00 2001
From cd7fb7888c26a3ccbbc13404f671ed7525041e81 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 30 Mar 2015 12:50:21 +0200
Subject: [PATCH] server: Temporarily store the full security descriptor for
file objects.
---
dlls/advapi32/tests/security.c | 34 +++--------
dlls/advapi32/tests/security.c | 16 ++----
server/change.c | 8 ++-
server/file.c | 100 +++++++++++++++++++++------------
server/file.h | 3 +-
4 files changed, 82 insertions(+), 63 deletions(-)
4 files changed, 80 insertions(+), 47 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index a32bb714c4f..ad3d715bd26 100644
index 7f0c248cd7a..f1ec827d683 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -3702,7 +3702,6 @@ static void test_CreateDirectoryA(void)
@ -31,37 +31,7 @@ index a32bb714c4f..ad3d715bd26 100644
ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
acl_size.AceCount);
LocalFree(pSD);
@@ -3785,27 +3783,13 @@ static void test_CreateDirectoryA(void)
error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
(PSID *)&owner, NULL, &pDacl, NULL, &pSD);
-<<<<<<< HEAD
- todo_wine
- ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
- if (error == ERROR_SUCCESS)
- {
- bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
- ok(bret, "GetAclInformation failed\n");
- todo_wine
- ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
- acl_size.AceCount);
- LocalFree(pSD);
- }
-=======
- ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error);
+ ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %dl\n", error);
bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
ok(bret, "GetAclInformation failed\n");
todo_wine
- ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
acl_size.AceCount);
LocalFree(pSD);
->>>>>>> eca474978f0 (server: Allow to open files without any permission bits. (try 2))
CloseHandle(hTemp);
/* Test inheritance of ACLs in CreateDirectory without security descriptor */
@@ -3850,7 +3834,6 @@ static void test_CreateDirectoryA(void)
@@ -3836,7 +3834,6 @@ static void test_CreateDirectoryA(void)
ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error);
bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
ok(bret, "GetAclInformation failed\n");
@ -69,7 +39,7 @@ index a32bb714c4f..ad3d715bd26 100644
ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
acl_size.AceCount);
LocalFree(pSD);
@@ -4949,23 +4932,22 @@ static void test_GetSecurityInfo(void)
@@ -4935,23 +4932,22 @@ static void test_GetSecurityInfo(void)
bret = GetAce(pDacl, 0, (VOID **)&ace);
ok(bret, "Failed to get Current User ACE.\n");
bret = EqualSid(&ace->SidStart, user_sid);