You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 7ea710c69ba46f6255c0e049b5c29bc3e06b6433.
The apiset's have been left until the dll's these use are actually in wine. ext-ms-win-xaml-pal-l1-1-0 ext-ms-win-appmodel-usercontext
This commit is contained in:
Alistair Leslie-Hughes
@@ -1,4 +1,4 @@
|
||||
From 0b74f0d359fb05b1b38f211269313b7e02690e86 Mon Sep 17 00:00:00 2001
|
||||
From 4d5eb31badf375562d45bdf58c748707c2fda3ac 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,67 +8,67 @@ 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 | 32 ++++++++++++--------------------
|
||||
dlls/advapi32/tests/security.c | 26 ++++++++++++++++----------
|
||||
server/fd.c | 20 ++++++++++++++++++++
|
||||
2 files changed, 32 insertions(+), 20 deletions(-)
|
||||
2 files changed, 36 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index 020e69277e0..9466b01bc99 100644
|
||||
index 135a45f7727..cbc558aaed5 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -3699,17 +3699,13 @@ static void test_CreateDirectoryA(void)
|
||||
@@ -3710,17 +3710,13 @@ static void test_CreateDirectoryA(void)
|
||||
error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
|
||||
OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
|
||||
(PSID *)&owner, NULL, &pDacl, NULL, &pSD);
|
||||
- todo_wine
|
||||
ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error);
|
||||
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 (%d != 0).\n",
|
||||
- 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);
|
||||
CloseHandle(hTemp);
|
||||
|
||||
/* Test inheritance of ACLs in NtCreateFile without security descriptor */
|
||||
@@ -3778,17 +3774,13 @@ static void test_CreateDirectoryA(void)
|
||||
@@ -3789,6 +3785,7 @@ static void test_CreateDirectoryA(void)
|
||||
error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
|
||||
OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
|
||||
(PSID *)&owner, NULL, &pDacl, NULL, &pSD);
|
||||
- todo_wine
|
||||
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 (%d != 0).\n",
|
||||
- acl_size.AceCount);
|
||||
- LocalFree(pSD);
|
||||
- }
|
||||
+<<<<<<< HEAD
|
||||
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);
|
||||
+ 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",
|
||||
+ acl_size.AceCount);
|
||||
+ LocalFree(pSD);
|
||||
+>>>>>>> eca474978f0 (server: Allow to open files without any permission bits. (try 2))
|
||||
CloseHandle(hTemp);
|
||||
|
||||
done:
|
||||
diff --git a/server/fd.c b/server/fd.c
|
||||
index c0425694294..100881f21a6 100644
|
||||
index 31b64b30d43..2ff0b480f40 100644
|
||||
--- a/server/fd.c
|
||||
+++ b/server/fd.c
|
||||
@@ -1908,6 +1908,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
|
||||
@@ -2044,6 +2044,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
|
||||
int root_fd = -1;
|
||||
int rw_mode;
|
||||
char *path;
|
||||
@@ -76,7 +76,7 @@ index c0425694294..100881f21a6 100644
|
||||
int created = (flags & O_CREAT);
|
||||
|
||||
if (((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) ||
|
||||
@@ -1972,10 +1973,28 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
|
||||
@@ -2116,10 +2117,28 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
|
||||
if ((access & FILE_UNIX_WRITE_ACCESS) || (flags & O_CREAT))
|
||||
fd->unix_fd = open( name, O_RDONLY | (flags & ~(O_TRUNC | O_CREAT | O_EXCL)), *mode );
|
||||
}
|
||||
@@ -105,7 +105,7 @@ index c0425694294..100881f21a6 100644
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
@@ -1992,6 +2011,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
|
||||
@@ -2130,6 +2149,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
|
||||
closed_fd->unlink = 0;
|
||||
closed_fd->unlink_name = fd->unlink_name;
|
||||
closed_fd->unix_name = fd->unix_name;
|
||||
@@ -114,5 +114,5 @@ index c0425694294..100881f21a6 100644
|
||||
*mode = st.st_mode;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
From 0c188a73bf19cbdb18c61d0a8417e9557c3daf59 Mon Sep 17 00:00:00 2001
|
||||
From 22cf6534ece0dbe705bacf9d3d4c4228749e535d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 3 Apr 2015 03:58:59 +0200
|
||||
Subject: advapi32/tests: Add tests for ACL inheritance in CreateDirectoryA.
|
||||
Subject: [PATCH] advapi32/tests: Add tests for ACL inheritance in
|
||||
CreateDirectoryA.
|
||||
|
||||
---
|
||||
dlls/advapi32/tests/security.c | 70 ++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/advapi32/tests/security.c | 70 ++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 70 insertions(+)
|
||||
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index 329ae09..36ef972 100644
|
||||
index cbc558aaed5..7b67a40afd5 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -3404,6 +3404,76 @@ static void test_CreateDirectoryA(void)
|
||||
LocalFree(pSD);
|
||||
@@ -3808,6 +3808,76 @@ static void test_CreateDirectoryA(void)
|
||||
>>>>>>> eca474978f0 (server: Allow to open files without any permission bits. (try 2))
|
||||
CloseHandle(hTemp);
|
||||
|
||||
+ /* Test inheritance of ACLs in CreateDirectory without security descriptor */
|
||||
@@ -89,5 +90,5 @@ index 329ae09..36ef972 100644
|
||||
HeapFree(GetProcessHeap(), 0, user);
|
||||
bret = RemoveDirectoryA(tmpdir);
|
||||
--
|
||||
2.3.3
|
||||
2.34.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user