Removed patch to fix various bugs in RtlUnwindEx on x86_64 (accepted upstream).

patches/advapi32-Revert_DACL/0001-Revert-advapi32-Add-DACL-inheritance-support-in-SetS.patch

@@ -1,4 +1,4 @@
-From 8ce7a8b0f7ea6a94ae8327b4a3d07a10c12a2c9e Mon Sep 17 00:00:00 2001
+From e498b901443fffeb344b2dcc4627da4b520f0af9 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 27 Mar 2015 15:32:04 +0100
 Subject: Revert "advapi32: Add DACL inheritance support in SetSecurityInfo."
@@ -10,7 +10,7 @@ This reverts commit f974d726720eff4fcd7371bca95e6cdcc4b4a848.
  2 files changed, 14 insertions(+), 139 deletions(-)
 
 diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index 71a8c92..e8cdcc5 100644
+index 2cd3f74..e8cdcc5 100644
 --- a/dlls/advapi32/security.c
 +++ b/dlls/advapi32/security.c
 @@ -4052,8 +4052,6 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName,
@@ -35,7 +35,7 @@ index 71a8c92..e8cdcc5 100644
          SetSecurityDescriptorGroup(&sd, psidGroup, FALSE);
      if (SecurityInfo & DACL_SECURITY_INFORMATION)
 -    {
--        if (ObjectType == SE_FILE_OBJECT)
+-        if (ObjectType == SE_FILE_OBJECT && pDacl)
 -        {
 -            SECURITY_DESCRIPTOR_CONTROL control;
 -            PSECURITY_DESCRIPTOR psd;
@@ -172,10 +172,10 @@ index 71a8c92..e8cdcc5 100644
  }
  
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 15c3b1d..6d3f9ac 100644
+index 466100d..53fd643 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -3417,22 +3417,25 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3615,22 +3615,25 @@ static void test_GetNamedSecurityInfoA(void)
  
      error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
              NULL, NULL, &pDacl, NULL, &pSD);
@@ -210,7 +210,7 @@ index 15c3b1d..6d3f9ac 100644
 +    todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
      CloseHandle(h);
  
-     /* NtSetSecurityObject doesn't inherit DACL entries */
+     /* test setting NULL DACL */
 -- 
 2.3.3
 

patches/advapi32-Revert_DACL/0003-Revert-advapi32-Add-SetNamedSecurityInfo-test-with-e.patch

@@ -1,15 +1,15 @@
-From 0f1815d016ff6cce3fae3e49f7ddb18121e469c4 Mon Sep 17 00:00:00 2001
+From 0e64055fbe7f17de05328353457b93f720ef3bb7 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 27 Mar 2015 15:32:32 +0100
 Subject: Revert "advapi32: Add SetNamedSecurityInfo test with empty DACL."
 
 This reverts commit 02c4f5bd275d70d1dcb48bf95775efa376b50c22.
 ---
- dlls/advapi32/tests/security.c | 79 +++---------------------------------------
- 1 file changed, 4 insertions(+), 75 deletions(-)
+ dlls/advapi32/tests/security.c | 95 ++----------------------------------------
+ 1 file changed, 4 insertions(+), 91 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index bd552d6..7ee881f 100644
+index 00dd9e8..b19dbe8 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -125,7 +125,6 @@ static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTR
@@ -28,7 +28,7 @@ index bd552d6..7ee881f 100644
      pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile");
      pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U");
      pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString");
-@@ -3394,7 +3392,7 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3429,7 +3427,7 @@ static void test_GetNamedSecurityInfoA(void)
      char invalid_path[] = "/an invalid file path";
      int users_ace_id = -1, admins_ace_id = -1, i;
      char software_key[] = "MACHINE\\Software";
@@ -37,7 +37,7 @@ index bd552d6..7ee881f 100644
      SECURITY_DESCRIPTOR_CONTROL control;
      ACL_SIZE_INFORMATION acl_size;
      CHAR windows_dir[MAX_PATH];
-@@ -3406,12 +3404,11 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3441,12 +3439,11 @@ static void test_GetNamedSecurityInfoA(void)
      BOOL owner_defaulted;
      BOOL group_defaulted;
      BOOL dacl_defaulted;
@@ -51,7 +51,7 @@ index bd552d6..7ee881f 100644
  
      if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid)
      {
-@@ -3516,8 +3513,8 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3551,8 +3548,8 @@ static void test_GetNamedSecurityInfoA(void)
      bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE);
      ok(bret, "Failed to add ACL to security desciptor.\n");
      GetTempFileNameA(".", "foo", 0, tmpfile);
@@ -62,7 +62,7 @@ index bd552d6..7ee881f 100644
      SetLastError(0xdeadbeef);
      error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL,
                                     NULL, pDacl, NULL);
-@@ -3569,74 +3566,6 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3604,90 +3601,6 @@ static void test_GetNamedSecurityInfoA(void)
      }
      LocalFree(pSD);
      HeapFree(GetProcessHeap(), 0, user);
@@ -99,6 +99,22 @@ index bd552d6..7ee881f 100644
 -    todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
 -    CloseHandle(h);
 -
+-    /* test setting NULL DACL */
+-    error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
+-            DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL);
+-    ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error);
+-
+-    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION,
+-                NULL, NULL, &pDacl, NULL, &pSD);
+-    ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);
+-    todo_wine ok(!pDacl, "pDacl != NULL\n");
+-    LocalFree(pSD);
+-
+-    h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ,
+-            NULL, OPEN_EXISTING, 0, NULL);
+-    ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+-    CloseHandle(h);
+-
 -    /* NtSetSecurityObject doesn't inherit DACL entries */
 -    pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*);
 -    InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION);