Rebase against 2a667e28ba7800288f5873a4b13bc0baf6e4a857.

patches/advapi32-LsaLookupPrivilegeName/0002-advapi32-Use-TRACE-for-LsaOpenPolicy-LsaClose.patch

@@ -1,34 +0,0 @@
-From 1941137bff72a2297812bbd05fb6f6a1578426b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sun, 5 Mar 2017 23:05:54 +0100
-Subject: advapi32: Use TRACE for LsaOpenPolicy/LsaClose.
-
----
- dlls/advapi32/lsa.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index e5e3b1649c0..0f2167d19ab 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -136,7 +136,7 @@ NTSTATUS WINAPI LsaAddAccountRights(
-  */
- NTSTATUS WINAPI LsaClose(IN LSA_HANDLE ObjectHandle)
- {
--    FIXME("(%p) stub\n", ObjectHandle);
-+    TRACE("(%p) semi-stub\n", ObjectHandle);
-     return STATUS_SUCCESS;
- }
- 
-@@ -687,7 +687,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
-     IN ACCESS_MASK DesiredAccess,
-     IN OUT PLSA_HANDLE PolicyHandle)
- {
--    FIXME("(%s,%p,0x%08x,%p) stub\n",
-+    TRACE("(%s,%p,0x%08x,%p) semi-stub\n",
-           SystemName?debugstr_w(SystemName->Buffer):"(null)",
-           ObjectAttributes, DesiredAccess, PolicyHandle);
- 
--- 
-2.11.0
-

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "9172ca5baa27b0c929b14a49f60333613cc30c65"
+	echo "2a667e28ba7800288f5873a4b13bc0baf6e4a857"
 }
 
 # Show version information
@@ -1476,7 +1476,6 @@ fi
 # |
 if test "$enable_advapi32_LsaLookupPrivilegeName" -eq 1; then
 	patch_apply advapi32-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch
-	patch_apply advapi32-LsaLookupPrivilegeName/0002-advapi32-Use-TRACE-for-LsaOpenPolicy-LsaClose.patch
 fi
 
 # Patchset api-ms-win-Stub_DLLs

staging/upstream-commit

@@ -1 +1 @@
-9172ca5baa27b0c929b14a49f60333613cc30c65
+2a667e28ba7800288f5873a4b13bc0baf6e4a857