From a23ff2f6579c2c1c7009cfbf71921d6cec1147ee Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 24 Feb 2024 09:30:48 +1100 Subject: [PATCH] Rebase against 1b32ac45f821ee1fe06a3dc4f903a81a190216c7. --- ...s-Add-tests-for-ACL-inheritance-in-Crea.patch | 10 +++++----- ...s-Add-ACL-inheritance-tests-for-creatin.patch | 16 ++++++++-------- staging/upstream-commit | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/server-File_Permissions/0004-advapi32-tests-Add-tests-for-ACL-inheritance-in-Crea.patch b/patches/server-File_Permissions/0004-advapi32-tests-Add-tests-for-ACL-inheritance-in-Crea.patch index 4aee7e11..58964ff7 100644 --- a/patches/server-File_Permissions/0004-advapi32-tests-Add-tests-for-ACL-inheritance-in-Crea.patch +++ b/patches/server-File_Permissions/0004-advapi32-tests-Add-tests-for-ACL-inheritance-in-Crea.patch @@ -1,4 +1,4 @@ -From 9efbce075628f4d6fc45a8727373e7311128b927 Mon Sep 17 00:00:00 2001 +From b942e1cb4b0d96f9ea183048fa2b1409c9655c68 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 3 Apr 2015 03:58:59 +0200 Subject: [PATCH] advapi32/tests: Add tests for ACL inheritance in @@ -9,10 +9,10 @@ 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 2147d0f1700..cd039c734e9 100644 +index 8c7888f9e52..1726236f424 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c -@@ -3794,6 +3794,76 @@ static void test_CreateDirectoryA(void) +@@ -3866,6 +3866,76 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); @@ -87,8 +87,8 @@ index 2147d0f1700..cd039c734e9 100644 + ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError()); + done: - HeapFree(GetProcessHeap(), 0, user); + free(user); bret = RemoveDirectoryA(tmpdir); -- -2.34.1 +2.43.0 diff --git a/patches/server-File_Permissions/0005-advapi32-tests-Add-ACL-inheritance-tests-for-creatin.patch b/patches/server-File_Permissions/0005-advapi32-tests-Add-ACL-inheritance-tests-for-creatin.patch index 309fb31c..62e40c24 100644 --- a/patches/server-File_Permissions/0005-advapi32-tests-Add-ACL-inheritance-tests-for-creatin.patch +++ b/patches/server-File_Permissions/0005-advapi32-tests-Add-ACL-inheritance-tests-for-creatin.patch @@ -1,18 +1,18 @@ -From 39e8ae54cb3e8dcd4ef48e190f96b6dd48b40969 Mon Sep 17 00:00:00 2001 +From 303af824dcdd63c1afe27aa8690d4f3a5d962189 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 3 Apr 2015 03:59:05 +0200 -Subject: advapi32/tests: Add ACL inheritance tests for creating subdirectories - with NtCreateFile. +Subject: [PATCH] advapi32/tests: Add ACL inheritance tests for creating + subdirectories with NtCreateFile. --- - dlls/advapi32/tests/security.c | 76 ++++++++++++++++++++++++++++++++++++++++++ + dlls/advapi32/tests/security.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c -index 36ef972..a0532f6 100644 +index 1726236f424..641fb79e634 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c -@@ -3474,6 +3474,82 @@ static void test_CreateDirectoryA(void) +@@ -3936,6 +3936,82 @@ static void test_CreateDirectoryA(void) bret = RemoveDirectoryA(tmpfile); ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError()); @@ -93,8 +93,8 @@ index 36ef972..a0532f6 100644 + CloseHandle(hTemp); + done: - HeapFree(GetProcessHeap(), 0, user); + free(user); bret = RemoveDirectoryA(tmpdir); -- -2.3.3 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index b792dcd9..dec2f400 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -232b18d820e08fe6534249a64d3afdbf35d0b688 +1b32ac45f821ee1fe06a3dc4f903a81a190216c7