From cde035a721ea354ad1720a3852a5ce07a3129557 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 8 Dec 2015 18:33:36 +0100 Subject: [PATCH] Rebase against 571dc0faa502b63880e905c35d3e3da6d87c5599. --- README.md | 2 +- ...tError-to-0-in-GetSidIdentifierAutho.patch | 92 ------------------- .../definition | 1 - patches/patchinstall.sh | 20 +--- staging/changelog | 5 + 5 files changed, 8 insertions(+), 112 deletions(-) delete mode 100644 patches/advapi32-GetSidIdentifierAuthority/0001-advapi32-Set-LastError-to-0-in-GetSidIdentifierAutho.patch delete mode 100644 patches/advapi32-GetSidIdentifierAuthority/definition diff --git a/README.md b/README.md index cf24bfa7..b42d44a4 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,7 @@ for more details.* * SO_CONNECT_TIME returns the appropriate time * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652)) * Set EOF on file which has a memory mapping should fail -* Set LastError to 0 in GetSidIdentifierAuthority +* ~~Set LastError to 0 in GetSidIdentifierAuthority~~ * Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile * Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards ([Wine Bug #21817](https://bugs.winehq.org/show_bug.cgi?id=21817)) * Show unmounted devices in winecfg and allow changing the unix path diff --git a/patches/advapi32-GetSidIdentifierAuthority/0001-advapi32-Set-LastError-to-0-in-GetSidIdentifierAutho.patch b/patches/advapi32-GetSidIdentifierAuthority/0001-advapi32-Set-LastError-to-0-in-GetSidIdentifierAutho.patch deleted file mode 100644 index a5b22cfe..00000000 --- a/patches/advapi32-GetSidIdentifierAuthority/0001-advapi32-Set-LastError-to-0-in-GetSidIdentifierAutho.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 86fe5438cdd5e3fbd3fd29c1240b6908ad70f2bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 4 Dec 2015 21:06:40 +0100 -Subject: advapi32: Set LastError to 0 in GetSidIdentifierAuthority. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michael Müller ---- - dlls/advapi32/security.c | 3 ++- - dlls/advapi32/tests/security.c | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 33 insertions(+), 1 deletion(-) - -diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c -index c64981e..08f88c0 100644 ---- a/dlls/advapi32/security.c -+++ b/dlls/advapi32/security.c -@@ -1167,7 +1167,8 @@ GetEffectiveRightsFromAclW( PACL pacl, PTRUSTEEW pTrustee, PACCESS_MASK pAccessR - PSID_IDENTIFIER_AUTHORITY WINAPI - GetSidIdentifierAuthority( PSID pSid ) - { -- return RtlIdentifierAuthoritySid(pSid); -+ SetLastError(ERROR_SUCCESS); -+ return RtlIdentifierAuthoritySid(pSid); - } - - /****************************************************************************** -diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c -index b171a81..f62601f 100644 ---- a/dlls/advapi32/tests/security.c -+++ b/dlls/advapi32/tests/security.c -@@ -132,6 +132,7 @@ static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_S - static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); - static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); - static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); -+static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID); - - static HMODULE hmod; - static int myARGC; -@@ -196,6 +197,7 @@ static void init(void) - pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); - pGetAce = (void *)GetProcAddress(hmod, "GetAce"); - pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); -+ pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); - - myARGC = winetest_get_mainargs( &myARGV ); - } -@@ -6040,6 +6042,34 @@ static void test_GetWindowsAccountDomainSid(void) - HeapFree(GetProcessHeap(), 0, user); - } - -+static void test_GetSidIdentifierAuthority(void) -+{ -+ char buffer[SECURITY_MAX_SID_SIZE]; -+ PSID authority_sid = (PSID *)&buffer; -+ PSID_IDENTIFIER_AUTHORITY id; -+ BOOL ret; -+ -+ if (!pGetSidIdentifierAuthority) -+ { -+ win_skip("GetSidIdentifierAuthority not available\n"); -+ return; -+ } -+ -+ memset(buffer, 0xcc, sizeof(buffer)); -+ ret = IsValidSid(authority_sid); -+ ok(!ret, "expected FALSE, got %u\n", ret); -+ -+ SetLastError(0xdeadbeef); -+ id = GetSidIdentifierAuthority(authority_sid); -+ ok(id != NULL, "got NULL pointer as identifier authority\n"); -+ ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); -+ -+ SetLastError(0xdeadbeef); -+ id = GetSidIdentifierAuthority(NULL); -+ ok(id != NULL, "got NULL pointer as identifier authority\n"); -+ ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); -+} -+ - START_TEST(security) - { - init(); -@@ -6084,4 +6114,5 @@ START_TEST(security) - test_AdjustTokenPrivileges(); - test_AddAce(); - test_system_security_access(); -+ test_GetSidIdentifierAuthority(); - } --- -2.6.2 - diff --git a/patches/advapi32-GetSidIdentifierAuthority/definition b/patches/advapi32-GetSidIdentifierAuthority/definition deleted file mode 100644 index e9b5fd16..00000000 --- a/patches/advapi32-GetSidIdentifierAuthority/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Set LastError to 0 in GetSidIdentifierAuthority diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 20672585..3c40d751 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "ffee96a80c0585fb5fcb041382540e2014d2f77b" + echo "571dc0faa502b63880e905c35d3e3da6d87c5599" } # Show version information version() { - echo "Wine Staging 1.8-rc3" + echo "Wine Staging 1.8-rc4 (unreleased)" echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" @@ -87,7 +87,6 @@ patch_enable_all () enable_Exagear="$1" enable_Pipelight="$1" enable_Staging="$1" - enable_advapi32_GetSidIdentifierAuthority="$1" enable_advapi32_LsaLookupSids="$1" enable_advapi32_RegCreateKeyTransacted="$1" enable_advapi32_SetSecurityInfo="$1" @@ -372,9 +371,6 @@ patch_enable () Staging) enable_Staging="$2" ;; - advapi32-GetSidIdentifierAuthority) - enable_advapi32_GetSidIdentifierAuthority="$2" - ;; advapi32-LsaLookupSids) enable_advapi32_LsaLookupSids="$2" ;; @@ -2239,18 +2235,6 @@ if test "$enable_Staging" -eq 1; then ) >> "$patchlist" fi -# Patchset advapi32-GetSidIdentifierAuthority -# | -# | Modified files: -# | * dlls/advapi32/security.c, dlls/advapi32/tests/security.c -# | -if test "$enable_advapi32_GetSidIdentifierAuthority" -eq 1; then - patch_apply advapi32-GetSidIdentifierAuthority/0001-advapi32-Set-LastError-to-0-in-GetSidIdentifierAutho.patch - ( - echo '+ { "Michael Müller", "advapi32: Set LastError to 0 in GetSidIdentifierAuthority.", 1 },'; - ) >> "$patchlist" -fi - # Patchset server-CreateProcess_ACLs # | # | This patchset fixes the following Wine bugs: diff --git a/staging/changelog b/staging/changelog index 20fa2065..cfae9fac 100644 --- a/staging/changelog +++ b/staging/changelog @@ -1,3 +1,8 @@ +wine-staging (1.8~rc4) UNRELEASED; urgency=low + * Removed patch to set LastError to 0 in GetSidIdentifierAuthority (accepted + upstream). + -- Sebastian Lackner Tue, 08 Dec 2015 18:32:59 +0100 + wine-staging (1.8~rc3) unstable; urgency=low * Updated patch for d3dx9_36 DrawText implementation and fixed multiple bugs. * Removed patch for delayed end of DST in Europe/Istanbul (accepted upstream).