Rebase against 437c6674b06663908472d31ed68fcab6e2fdd5f7.

wine-compholio · Jul 12, 2017 · 96a77f3 · 96a77f3
1 parent 4c1a868
commit 96a77f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...2-WinBuiltinAnyPackageSid/0002-advapi32-tests-Add-a-test-that-compares-a-well-known.patch b/...2-WinBuiltinAnyPackageSid/0002-advapi32-tests-Add-a-test-that-compares-a-well-known.patch
@@ -1,4 +1,4 @@
-From 13a60cc5ea59cc2f18ac19888fe51628f9f0774a Mon Sep 17 00:00:00 2001
+From 393f8906d8b26414fb4fc89c692cb5247be6b4c2 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 16 Dec 2016 13:23:15 +0800
 Subject: advapi32/tests: Add a test that compares a well-known SID to a SID
@@ -9,7 +9,7 @@ Subject: advapi32/tests: Add a test that compares a well-known SID to a SID
  1 file changed, 92 insertions(+), 38 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 18f4e04..4e1f53b 100644
+index dfe2f871d42..808547ddbc0 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -2,7 +2,7 @@
@@ -36,7 +36,7 @@ index 18f4e04..4e1f53b 100644
  #define SID_SLOTS 4
  static char debugsid_str[SID_SLOTS][256];
  static int debugsid_index = 0;
-@@ -175,12 +167,6 @@ static const char* debugstr_sid(PSID sid)
+@@ -174,12 +166,6 @@ static const char* debugstr_sid(PSID sid)
      return res;
  }
 
@@ -135,7 +135,7 @@ index 18f4e04..4e1f53b 100644
 -    LPSTR str = NULL;
 +    LPSTR str;
 
-     if( !pConvertSidToStringSidA || !pConvertStringSidToSidA )
+     if( !pConvertStringSidToSidA )
      {
 @@ -402,7 +428,7 @@ static void test_sid(void)
      }
@@ -167,7 +167,7 @@ index 18f4e04..4e1f53b 100644
 
          if (r)
          {
--            if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp)))
+-            if ((winetest_debug > 1) && (ConvertSidToStringSidA(psid, &temp)))
 +            char buf[SECURITY_MAX_SID_SIZE];
 +            char *sid_string, *well_known_sid_string;
 +            DWORD n, size;
@@ -182,7 +182,7 @@ index 18f4e04..4e1f53b 100644
 +                    *GetSidSubAuthority(psid, n) = 0;
              }
 +
-+            r = pConvertSidToStringSidA(psid, &sid_string);
++            r = ConvertSidToStringSidA(psid, &sid_string);
 +            ok(r, "%s: ConvertSidToStringSid error %u\n", strsid_table[i].str, GetLastError());
 +            if (winetest_debug > 1)
 +                trace("%s => %s\n", strsid_table[i].str, sid_string);
@@ -191,7 +191,7 @@ index 18f4e04..4e1f53b 100644
 +            r = pCreateWellKnownSid(strsid_table[i].sid_type, domain_sid, buf, &size);
 +            ok(r, "%u: CreateWellKnownSid(%u) error %u\n", i, strsid_table[i].sid_type, GetLastError());
 +
-+            r = pConvertSidToStringSidA(buf, &well_known_sid_string);
++            r = ConvertSidToStringSidA(buf, &well_known_sid_string);
 +            ok(r, "%u: ConvertSidToStringSi(%u) error %u\n", i, strsid_table[i].sid_type, GetLastError());
 +            if (winetest_debug > 1)
 +                trace("%u => %s\n", strsid_table[i].sid_type, well_known_sid_string);
@@ -214,7 +214,7 @@ index 18f4e04..4e1f53b 100644
 
  static void test_trustee(void)
 @@ -2288,7 +2342,7 @@ static void test_LookupAccountSid(void)
-     if (pCreateWellKnownSid && pConvertSidToStringSidA)
+     if (pCreateWellKnownSid)
      {
          trace("Well Known SIDs:\n");
 -        for (i = 0; i <= 60; i++)
@@ -223,5 +223,5 @@ index 18f4e04..4e1f53b 100644
              size = SECURITY_MAX_SID_SIZE;
              if (pCreateWellKnownSid(i, NULL, &max_sid.sid, &size))
 -- 
-2.9.0
+2.13.1
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "35f82ba444930b770684f0bd623c505d52c7b58f"
+	echo "437c6674b06663908472d31ed68fcab6e2fdd5f7"
 }
 
 # Show version information