Release 2.3.

Probably fixed by cab9282d10e4b2868a0dd85383b1126c0d6c591a.

patches/Compiler_Warnings/definition

@@ -1 +0,0 @@
-Category: stable

patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

@@ -1,4 +1,4 @@
-From a41dac0b19ec2ba3807da4ac42d77717d79f1115 Mon Sep 17 00:00:00 2001
+From 41ee5d7699182ea01c61223ab9d0a10473e16ac2 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: kernel32: Add winediag message to show warning, that this isn't
@@ -9,7 +9,7 @@ Subject: kernel32: Add winediag message to show warning, that this isn't
  1 file changed, 9 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index b0c06e3..a2c1d4c 100644
+index 6d0fc74cdf4..ed1d967ffdf 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
 @@ -65,6 +65,7 @@
@@ -20,7 +20,7 @@ index b0c06e3..a2c1d4c 100644
  
  #ifdef __APPLE__
  extern char **__wine_get_main_environment(void);
-@@ -1099,6 +1100,14 @@ static DWORD WINAPI start_process( PEB *peb )
+@@ -1104,6 +1105,14 @@ static DWORD WINAPI start_process( PEB *peb )
          DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(),
                   debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry );
  
@@ -32,9 +32,9 @@ index b0c06e3..a2c1d4c 100644
 +    else
 +        WARN_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
 +
-     SetLastError( 0 );  /* clear error code */
-     if (peb->BeingDebugged) DbgBreakPoint();
-     return call_process_entry( peb, entry );
+     if (!CheckRemoteDebuggerPresent( GetCurrentProcess(), &being_debugged ))
+         being_debugged = FALSE;
+ 
 -- 
-2.5.1
+2.11.0
 

patches/Staging/definition

@@ -1 +0,0 @@
-Category: stable

patches/advapi-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch

@@ -0,0 +1,55 @@
+From ce0ab0ccd6e4953a9673d15e00cf602668469c2c 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:04:36 +0100
+Subject: advapi32: Fix error code when calling LsaOpenPolicy for non existing
+ remote machine.
+
+---
+ dlls/advapi32/lsa.c       |  2 +-
+ dlls/advapi32/tests/lsa.c | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
+index b8dedbd6d58..e5e3b1649c0 100644
+--- a/dlls/advapi32/lsa.c
++++ b/dlls/advapi32/lsa.c
+@@ -692,7 +692,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
+           ObjectAttributes, DesiredAccess, PolicyHandle);
+ 
+     ADVAPI_ForceLocalComputer(SystemName ? SystemName->Buffer : NULL,
+-                              STATUS_ACCESS_VIOLATION);
++                              RPC_NT_SERVER_UNAVAILABLE);
+     dumpLsaAttributes(ObjectAttributes);
+ 
+     if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe;
+diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c
+index 4daf75f58d1..7ddda731be2 100644
+--- a/dlls/advapi32/tests/lsa.c
++++ b/dlls/advapi32/tests/lsa.c
+@@ -70,6 +70,8 @@ static BOOL init(void)
+ 
+ static void test_lsa(void)
+ {
++    static WCHAR machineW[] = {'W','i','n','e','N','o','M','a','c','h','i','n','e',0};
++    LSA_UNICODE_STRING machine;
+     NTSTATUS status;
+     LSA_HANDLE handle;
+     LSA_OBJECT_ATTRIBUTES object_attributes;
+@@ -77,6 +79,14 @@ static void test_lsa(void)
+     ZeroMemory(&object_attributes, sizeof(object_attributes));
+     object_attributes.Length = sizeof(object_attributes);
+ 
++    machine.Buffer = machineW;
++    machine.Length = sizeof(machineW) - 2;
++    machine.MaximumLength = sizeof(machineW);
++
++    status = pLsaOpenPolicy( &machine, &object_attributes, POLICY_LOOKUP_NAMES, &handle);
++    ok(status == RPC_NT_SERVER_UNAVAILABLE,
++       "LsaOpenPolicy(POLICY_LOOKUP_NAMES) for invalid machine returned 0x%08x\n", status);
++
+     status = pLsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle);
+     ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
+        "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08x\n", status);
+-- 
+2.11.0
+

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

@@ -0,0 +1,34 @@
+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/advapi-LsaLookupPrivilegeName/0003-advapi32-Implement-LsaLookupPrivilegeName.patch

@@ -0,0 +1,162 @@
+From fdc085e009942fa89ef5f0cd4104ab78c9d80b1b 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:50:06 +0100
+Subject: advapi32: Implement LsaLookupPrivilegeName.
+
+---
+ dlls/advapi32/advapi32.spec   |  2 +-
+ dlls/advapi32/advapi32_misc.h |  2 ++
+ dlls/advapi32/lsa.c           | 38 ++++++++++++++++++++++++++++++++++++++
+ dlls/advapi32/security.c      | 27 ++++++++++++++++++---------
+ include/ntsecapi.h            |  1 +
+ 5 files changed, 60 insertions(+), 10 deletions(-)
+
+diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
+index 3000973265c..2c599c8bd92 100644
+--- a/dlls/advapi32/advapi32.spec
++++ b/dlls/advapi32/advapi32.spec
+@@ -446,7 +446,7 @@
+ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr)
+ @ stdcall LsaLookupNames(long long ptr ptr ptr)
+ @ stub LsaLookupPrivilegeDisplayName
+-# @ stub LsaLookupPrivilegeName
++@ stdcall LsaLookupPrivilegeName(long ptr ptr)
+ # @ stub LsaLookupPrivilegeValue
+ @ stdcall LsaLookupSids(ptr long ptr ptr ptr)
+ # @ stub LsaManageSidNameMapping
+diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h
+index d116ecb836e..ecb07f635a6 100644
+--- a/dlls/advapi32/advapi32_misc.h
++++ b/dlls/advapi32/advapi32_misc.h
+@@ -68,4 +68,6 @@ static inline WCHAR *strdupAW( const char *src )
+     return dst;
+ }
+ 
++const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1];
++
+ #endif /* __WINE_ADVAPI32MISC_H */
+diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
+index 0f2167d19ab..6a7a69a9eb7 100644
+--- a/dlls/advapi32/lsa.c
++++ b/dlls/advapi32/lsa.c
+@@ -1012,3 +1012,41 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification(
+     FIXME("(%d,%p) stub\n", class, event);
+     return STATUS_SUCCESS;
+ }
++
++/******************************************************************************
++ * LsaLookupPrivilegeName [ADVAPI32.@]
++ *
++ */
++NTSTATUS WINAPI LsaLookupPrivilegeName(
++    LSA_HANDLE handle,
++    PLUID lpLuid,
++    PUNICODE_STRING *name)
++{
++    UNICODE_STRING *priv_unicode;
++    size_t priv_size;
++    WCHAR *strW;
++
++    TRACE("(%p, %p, %p)\n", handle, lpLuid, name);
++
++    if (!handle)
++        return STATUS_INVALID_HANDLE;
++
++    if (!name)
++        return STATUS_INVALID_PARAMETER;
++
++    if (lpLuid->HighPart ||
++        (lpLuid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE ||
++         lpLuid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE))
++        return STATUS_NO_SUCH_PRIVILEGE;
++
++    priv_size = (strlenW(WellKnownPrivNames[lpLuid->LowPart]) + 1) * sizeof(WCHAR);
++    priv_unicode = heap_alloc(sizeof(*priv_unicode) + priv_size);
++    if (!priv_unicode) return STATUS_NO_MEMORY;
++
++    strW = (WCHAR *)(priv_unicode + 1);
++    strcpyW(strW, WellKnownPrivNames[lpLuid->LowPart]);
++    RtlInitUnicodeString(priv_unicode, strW);
++
++    *name = priv_unicode;
++    return STATUS_SUCCESS;
++}
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index b0b368d6abf..24ec3099713 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -1840,7 +1840,7 @@ static const WCHAR SE_IMPERSONATE_NAME_W[] =
+ static const WCHAR SE_CREATE_GLOBAL_NAME_W[] =
+  { 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 };
+ 
+-static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] =
++const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] =
+ {
+     NULL,
+     NULL,
+@@ -2043,33 +2043,42 @@ BOOL WINAPI
+ LookupPrivilegeNameW( LPCWSTR lpSystemName, PLUID lpLuid, LPWSTR lpName,
+  LPDWORD cchName)
+ {
++    UNICODE_STRING system_name, *priv;
++    LSA_HANDLE lsa;
++    NTSTATUS status;
+     size_t privNameLen;
+ 
+     TRACE("%s,%p,%p,%p\n",debugstr_w(lpSystemName), lpLuid, lpName, cchName);
+ 
+-    if (!ADVAPI_IsLocalComputer(lpSystemName))
++    RtlInitUnicodeString(&system_name, lpSystemName);
++    status = LsaOpenPolicy(&system_name, NULL, POLICY_LOOKUP_NAMES, &lsa);
++    if (status)
+     {
+-        SetLastError(RPC_S_SERVER_UNAVAILABLE);
++        SetLastError(LsaNtStatusToWinError(status));
+         return FALSE;
+     }
+-    if (lpLuid->HighPart || (lpLuid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE ||
+-     lpLuid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE))
++
++    status = LsaLookupPrivilegeName(&lsa, lpLuid, &priv);
++    LsaClose(lsa);
++    if (status)
+     {
+-        SetLastError(ERROR_NO_SUCH_PRIVILEGE);
++        SetLastError(LsaNtStatusToWinError(status));
+         return FALSE;
+     }
+-    privNameLen = strlenW(WellKnownPrivNames[lpLuid->LowPart]);
+-    /* Windows crashes if cchName is NULL, so will I */
++
++    privNameLen = priv->Length / sizeof(WCHAR);
+     if (*cchName <= privNameLen)
+     {
+         *cchName = privNameLen + 1;
++        LsaFreeMemory(priv);
+         SetLastError(ERROR_INSUFFICIENT_BUFFER);
+         return FALSE;
+     }
+     else
+     {
+-        strcpyW(lpName, WellKnownPrivNames[lpLuid->LowPart]);
++        strcpyW(lpName, priv->Buffer);
+         *cchName = privNameLen;
++        LsaFreeMemory(priv);
+         return TRUE;
+     }
+ }
+diff --git a/include/ntsecapi.h b/include/ntsecapi.h
+index 2bb3d312e43..0bf0eca43ed 100644
+--- a/include/ntsecapi.h
++++ b/include/ntsecapi.h
+@@ -370,6 +370,7 @@ NTSTATUS WINAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING,PLSA_REFEREN
+                                PLSA_TRANSLATED_SID*);
+ NTSTATUS WINAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*,
+                                 PLSA_TRANSLATED_SID2*);
++NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE,PLUID,PUNICODE_STRING*);
+ NTSTATUS WINAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID *,PLSA_REFERENCED_DOMAIN_LIST *,PLSA_TRANSLATED_NAME *);
+ ULONG WINAPI LsaNtStatusToWinError(NTSTATUS);
+ NTSTATUS WINAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE);
+-- 
+2.11.0
+

patches/advapi-LsaLookupPrivilegeName/0004-advapi32-Add-stub-for-LsaLookupPrivilegeDisplayName.patch

@@ -0,0 +1,62 @@
+From 01efac6b4fa338715ad775c147a6bfc42e0bc38e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Mon, 6 Mar 2017 00:01:53 +0100
+Subject: advapi32: Add stub for LsaLookupPrivilegeDisplayName.
+
+---
+ dlls/advapi32/advapi32.spec |  2 +-
+ dlls/advapi32/lsa.c         | 21 +++++++++++++++++++++
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
+index 2c599c8bd92..ce1838d8c5a 100644
+--- a/dlls/advapi32/advapi32.spec
++++ b/dlls/advapi32/advapi32.spec
+@@ -445,7 +445,7 @@
+ # @ stub LsaICLookupSidsWithCreds
+ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr)
+ @ stdcall LsaLookupNames(long long ptr ptr ptr)
+-@ stub LsaLookupPrivilegeDisplayName
++@ stdcall LsaLookupPrivilegeDisplayName(long ptr ptr ptr)
+ @ stdcall LsaLookupPrivilegeName(long ptr ptr)
+ # @ stub LsaLookupPrivilegeValue
+ @ stdcall LsaLookupSids(ptr long ptr ptr ptr)
+diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
+index 6a7a69a9eb7..fdb238f74b2 100644
+--- a/dlls/advapi32/lsa.c
++++ b/dlls/advapi32/lsa.c
+@@ -45,6 +45,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
+         return FailureCode; \
+ }
+ 
++static LPCSTR debugstr_us( const UNICODE_STRING *us )
++{
++    if (!us) return "(null)";
++    return debugstr_wn(us->Buffer, us->Length / sizeof(WCHAR));
++}
++
+ static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa)
+ {
+     if (oa)
+@@ -1050,3 +1056,18 @@ NTSTATUS WINAPI LsaLookupPrivilegeName(
+     *name = priv_unicode;
+     return STATUS_SUCCESS;
+ }
++
++/******************************************************************************
++ * LsaLookupPrivilegeDisplayName [ADVAPI32.@]
++ *
++ */
++NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(
++    LSA_HANDLE handle,
++    PLSA_UNICODE_STRING name,
++    PLSA_UNICODE_STRING *dispname,
++    SHORT *language)
++{
++    FIXME("(%p, %s, %p, %p)\n", handle, debugstr_us(name), dispname, language);
++
++    return STATUS_NO_SUCH_PRIVILEGE;
++}
+-- 
+2.11.0
+

patches/advapi-LsaLookupPrivilegeName/definition

@@ -0,0 +1 @@
+Fixes: Add LsaLookupPrivilege[Display]Name stubs

patches/advapi32-AddMandatoryAce/0001-advapi32-Implement-AddMandatoryAce.patch

@@ -1,185 +0,0 @@
-From 9904ee15d00d0809c12759446c09adc1981e3cf9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 29 Aug 2016 19:45:47 +0200
-Subject: advapi32: Implement AddMandatoryAce.
-
----
- dlls/advapi32/security.c       |  6 ++++--
- dlls/advapi32/tests/security.c | 45 ++++++++++++++++++++++++++++++++++++++++++
- dlls/ntdll/ntdll.spec          |  1 +
- dlls/ntdll/sec.c               | 25 +++++++++++++++++++++++
- include/winbase.h              |  1 +
- include/winternl.h             |  1 +
- 6 files changed, 77 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index 28331df..45c0f7e 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -1711,10 +1711,12 @@ BOOL WINAPI AddAce(
-     return set_ntstatus(RtlAddAce(pAcl, dwAceRevision, dwStartingAceIndex, pAceList, nAceListLength));
- }
- 
-+/******************************************************************************
-+ *  AddMandatoryAce [ADVAPI32.@]
-+ */
- BOOL WINAPI AddMandatoryAce(ACL *acl, DWORD ace_revision, DWORD ace_flags, DWORD mandatory_policy, PSID label_sid)
- {
--    FIXME("%p %x %x %x %p - stub\n", acl, ace_revision, ace_flags, mandatory_policy, label_sid);
--    return FALSE;
-+    return set_ntstatus(RtlAddMandatoryAce(acl, ace_revision, ace_flags, mandatory_policy, SYSTEM_MANDATORY_LABEL_ACE_TYPE, label_sid));
- }
- 
- /******************************************************************************
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 18f4e04..cdbe4f8 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -65,6 +65,7 @@
- static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID);
- static BOOL (WINAPI *pAddAccessDeniedAceEx)(PACL, DWORD, DWORD, DWORD, PSID);
- static BOOL (WINAPI *pAddAuditAccessAceEx)(PACL, DWORD, DWORD, DWORD, PSID, BOOL, BOOL);
-+static BOOL (WINAPI *pAddMandatoryAce)(PACL,DWORD,DWORD,DWORD,PSID);
- static VOID (WINAPI *pBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid );
- static VOID (WINAPI *pBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName );
- static VOID (WINAPI *pBuildTrusteeWithObjectsAndNameA)( PTRUSTEEA pTrustee,
-@@ -199,6 +200,7 @@ static void init(void)
-     pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx");
-     pAddAccessDeniedAceEx = (void *)GetProcAddress(hmod, "AddAccessDeniedAceEx");
-     pAddAuditAccessAceEx = (void *)GetProcAddress(hmod, "AddAuditAccessAceEx");
-+    pAddMandatoryAce = (void *)GetProcAddress(hmod, "AddMandatoryAce");
-     pCheckTokenMembership = (void *)GetProcAddress(hmod, "CheckTokenMembership");
-     pConvertStringSecurityDescriptorToSecurityDescriptorA =
-         (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" );
-@@ -6064,6 +6066,48 @@ static void test_default_dacl_owner_sid(void)
-     CloseHandle( handle );
- }
- 
-+static void test_integrity(void)
-+{
-+    static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY},
-+                                                    {SECURITY_MANDATORY_LOW_RID}};
-+    SYSTEM_MANDATORY_LABEL_ACE *ace;
-+    char buffer_acl[256];
-+    ACL *pAcl = (ACL*)&buffer_acl;
-+    BOOL ret, found;
-+    DWORD index;
-+
-+    if (!pAddMandatoryAce)
-+    {
-+        win_skip("Mandatory integrity labels not supported, skipping test\n");
-+        return;
-+    }
-+
-+    ret = InitializeAcl(pAcl, 256, ACL_REVISION);
-+    ok(ret, "InitializeAcl failed with %u\n", GetLastError());
-+
-+    ret = pAddMandatoryAce(pAcl, ACL_REVISION, 0, 0x1234, &low_level);
-+    ok(!ret, "AddMandatoryAce succeeded\n");
-+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER got %u\n", GetLastError());
-+
-+    ret = pAddMandatoryAce(pAcl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level);
-+    ok(ret, "AddMandatoryAce failed with %u\n", GetLastError());
-+
-+    index = 0;
-+    found = FALSE;
-+    while (pGetAce( pAcl, index++, (void **)&ace ))
-+    {
-+        if (ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE)
-+        {
-+            found = TRUE;
-+            ok(ace->Header.AceFlags == 0, "Expected 0 as flags, got %x\n", ace->Header.AceFlags);
-+            ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP,
-+               "Expected SYSTEM_MANDATORY_LABEL_NO_WRITE_UP as flag, got %x\n", ace->Mask);
-+            ok(EqualSid(&ace->SidStart, &low_level), "Expected low integrity level\n");
-+        }
-+    }
-+    ok(found, "Could not find mandatory label\n");
-+}
-+
- static void test_AdjustTokenPrivileges(void)
- {
-     TOKEN_PRIVILEGES tp, prev;
-@@ -6444,6 +6488,7 @@ START_TEST(security)
-     test_CreateRestrictedToken();
-     test_TokenIntegrityLevel();
-     test_default_dacl_owner_sid();
-+    test_integrity();
-     test_AdjustTokenPrivileges();
-     test_AddAce();
-     test_system_security_access();
-diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 28aa2df..f6f8eba 100644
---- a/dlls/ntdll/ntdll.spec
-+++ b/dlls/ntdll/ntdll.spec
-@@ -422,6 +422,7 @@
- @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long)
- @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long)
- # @ stub RtlAddCompoundAce
-+@ stdcall RtlAddMandatoryAce(ptr long long long long ptr)
- # @ stub RtlAddRange
- @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long)
- @ stdcall RtlAddRefActivationContext(ptr)
-diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
-index 3bc52ac..daa2cae 100644
---- a/dlls/ntdll/sec.c
-+++ b/dlls/ntdll/sec.c
-@@ -1379,6 +1379,31 @@ NTSTATUS WINAPI RtlAddAuditAccessObjectAce(
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-+/**************************************************************************
-+ *  RtlAddMandatoryAce     [NTDLL.@]
-+ */
-+NTSTATUS WINAPI RtlAddMandatoryAce(
-+    IN OUT PACL pAcl,
-+    IN DWORD dwAceRevision,
-+    IN DWORD dwAceFlags,
-+    IN DWORD dwMandatoryFlags,
-+    IN DWORD dwAceType,
-+    IN PSID pSid)
-+{
-+    static DWORD valid_flags = SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | SYSTEM_MANDATORY_LABEL_NO_READ_UP |
-+                               SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP;
-+
-+    TRACE("(%p,%d,0x%08x,0x%08x,%u,%p)\n",pAcl,dwAceRevision,dwAceFlags,dwMandatoryFlags, dwAceType, pSid);
-+
-+    if (dwAceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE)
-+        return STATUS_INVALID_PARAMETER;
-+
-+    if (dwMandatoryFlags & ~valid_flags)
-+        return STATUS_INVALID_PARAMETER;
-+
-+    return add_access_ace(pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, pSid, dwAceType);
-+}
-+
- /******************************************************************************
-  *  RtlValidAcl		[NTDLL.@]
-  */
-diff --git a/include/winbase.h b/include/winbase.h
-index eff5972..42c826d 100644
---- a/include/winbase.h
-+++ b/include/winbase.h
-@@ -1693,6 +1693,7 @@ WINBASEAPI ATOM        WINAPI AddAtomW(LPCWSTR);
- #define                       AddAtom WINELIB_NAME_AW(AddAtom)
- WINADVAPI  BOOL        WINAPI AddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL);
- WINADVAPI  BOOL        WINAPI AddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL);
-+WINADVAPI  BOOL        WINAPI AddMandatoryAce(PACL,DWORD,DWORD,DWORD,PSID);
- WINBASEAPI VOID        WINAPI AddRefActCtx(HANDLE);
- WINBASEAPI PVOID       WINAPI AddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
- WINADVAPI  BOOL        WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD);
-diff --git a/include/winternl.h b/include/winternl.h
-index f35091c..c104e6f 100644
---- a/include/winternl.h
-+++ b/include/winternl.h
-@@ -2405,6 +2405,7 @@ NTSYSAPI NTSTATUS  WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_
- NTSYSAPI NTSTATUS  WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL);
- NTSYSAPI NTSTATUS  WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL);
- NTSYSAPI NTSTATUS  WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL);
-+NTSYSAPI NTSTATUS  WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID);
- NTSYSAPI void      WINAPI RtlAddRefActivationContext(HANDLE);
- NTSYSAPI PVOID     WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
- NTSYSAPI NTSTATUS  WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);
--- 
-2.9.0
-

patches/advapi32-AddMandatoryAce/definition

@@ -1 +0,0 @@
-Fixes: Implement advapi32.AddMandatoryAce

patches/advapi32-GetExplicitEntriesFromAclW/0001-advapi32-Implement-GetExplicitEntriesFromAclW.patch

@@ -1,4 +1,4 @@
-From cb383abcb7d36d739092a93c1f276895622b6806 Mon Sep 17 00:00:00 2001
+From b4469d7a12637ef2b57df3f6aebbe65c9b52ef57 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 28 Aug 2016 21:56:41 +0200
 Subject: advapi32: Implement GetExplicitEntriesFromAclW.
@@ -9,7 +9,7 @@ Subject: advapi32: Implement GetExplicitEntriesFromAclW.
  2 files changed, 221 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index 92a1789..c60aa4e 100644
+index 7e41c0a7361..ccd0bf64cab 100644
 --- a/dlls/advapi32/security.c
 +++ b/dlls/advapi32/security.c
 @@ -4202,8 +4202,85 @@ DWORD WINAPI GetExplicitEntriesFromAclA( PACL pacl, PULONG pcCountOfExplicitEntr
@@ -101,7 +101,7 @@ index 92a1789..c60aa4e 100644
  
  /******************************************************************************
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index cf104ab..2bcb108 100644
+index c31dfbeace3..23cbff58117 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -133,6 +133,7 @@ static BOOL     (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*);
@@ -120,8 +120,8 @@ index cf104ab..2bcb108 100644
  
      myARGC = winetest_get_mainargs( &myARGV );
  }
-@@ -6378,6 +6380,145 @@ static void test_pseudo_tokens(void)
-                  "Expected ERROR_NO_TOKEN, got %u\n", GetLastError());
+@@ -6451,6 +6453,145 @@ static void test_maximum_allowed(void)
+     CloseHandle(handle);
  }
  
 +static void test_GetExplicitEntriesFromAclW(void)
@@ -266,12 +266,12 @@ index cf104ab..2bcb108 100644
  START_TEST(security)
  {
      init();
-@@ -6424,4 +6565,5 @@ START_TEST(security)
-     test_system_security_access();
+@@ -6499,4 +6640,5 @@ START_TEST(security)
      test_GetSidIdentifierAuthority();
      test_pseudo_tokens();
+     test_maximum_allowed();
 +    test_GetExplicitEntriesFromAclW();
  }
 -- 
-2.9.0
+2.11.0
 

patches/advapi32-LsaLookupSids/0004-advapi32-Fallback-to-Sid-string-when-LookupAccountSi.patch

@@ -1,4 +1,4 @@
-From 616c17cc58a4943d3a367704943e737d5713740d Mon Sep 17 00:00:00 2001
+From 77d43d721793edda9b419f7426442a35f0cb5918 Mon Sep 17 00:00:00 2001
 From: Qian Hong <qhong@codeweavers.com>
 Date: Tue, 7 Apr 2015 11:23:34 +0800
 Subject: advapi32: Fallback to Sid string when LookupAccountSid fails.
@@ -8,7 +8,7 @@ Subject: advapi32: Fallback to Sid string when LookupAccountSid fails.
  1 file changed, 31 insertions(+)
 
 diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 258b8ca..93afa20 100644
+index 1b270a80829..b8dedbd6d58 100644
 --- a/dlls/advapi32/lsa.c
 +++ b/dlls/advapi32/lsa.c
 @@ -29,6 +29,7 @@
@@ -19,8 +19,8 @@ index 258b8ca..93afa20 100644
  #include "advapi32_misc.h"
  
  #include "wine/debug.h"
-@@ -554,6 +555,21 @@ NTSTATUS WINAPI LsaLookupSids(
-                 heap_free(name);
+@@ -562,6 +563,21 @@ NTSTATUS WINAPI LsaLookupSids(
+                 domain.MaximumLength = sizeof(WCHAR);
              }
          }
 +        else
@@ -41,9 +41,9 @@ index 258b8ca..93afa20 100644
      }
  
      /* now we have full length needed for both */
-@@ -593,6 +609,21 @@ NTSTATUS WINAPI LsaLookupSids(
-                 heap_free(domain.Buffer);
-             }
+@@ -605,6 +621,21 @@ NTSTATUS WINAPI LsaLookupSids(
+             (*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data);
+             heap_free(domain.Buffer);
          }
 +        else
 +        {
@@ -64,5 +64,5 @@ index 258b8ca..93afa20 100644
          name_buffer += name_size;
      }
 -- 
-2.3.5
+2.11.0
 

patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch

@@ -1,4 +1,4 @@
-From 51fb5229fdb33887fe25440defc8df09d1623abb Mon Sep 17 00:00:00 2001
+From 77c8c1ec52dac0b2ad058a3c52de93422bf91ee6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 15 Jan 2016 13:01:15 +0100
 Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
@@ -13,7 +13,7 @@ Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
  create mode 100644 dlls/kernelbase/misc.c
 
 diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in
-index b9caed0..2beb34b 100644
+index b9caed090b2..2beb34bafdb 100644
 --- a/dlls/kernelbase/Makefile.in
 +++ b/dlls/kernelbase/Makefile.in
 @@ -1 +1,4 @@
@@ -22,7 +22,7 @@ index b9caed0..2beb34b 100644
 +C_SRCS = \
 +	misc.c
 diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index f104030..e09112e 100644
+index f104030ab25..14d2578262f 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -1,3 +1,6 @@
@@ -96,7 +96,7 @@ index f104030..e09112e 100644
 -@ stub BaseReleaseProcessDllPath
 -@ stub BaseReleaseProcessExePath
 +@ stub BaseDumpAppcompatCache
-+@ stub BaseFlushAppcompatCache
++@ stdcall BaseFlushAppcompatCache() kernel32.BaseFlushAppcompatCache
 +@ stub BaseFormatObjectAttributes
 +@ stub BaseFreeAppCompatDataForProcess
 +@ stub BaseGetNamedObjectDirectory
@@ -244,7 +244,7 @@ index f104030..e09112e 100644
 +@ stdcall CreateWaitableTimerW(ptr long wstr) kernel32.CreateWaitableTimerW
  @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid
 +@ stub CtrlRoutine
-+@ stdcall DeactivateActCtx(long ptr) kernel32.DeactivateActCtx
++@ stdcall DeactivateActCtx(long long) kernel32.DeactivateActCtx
 +@ stdcall DebugActiveProcess(long) kernel32.DebugActiveProcess
 +@ stdcall DebugActiveProcessStop(long) kernel32.DebugActiveProcessStop
  @ stdcall DebugBreak() kernel32.DebugBreak
@@ -433,7 +433,7 @@ index f104030..e09112e 100644
  @ stub GetCalendar
  @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx
  @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW
-+@ stdcall GetCommConfig(long ptr long) kernel32.GetCommConfig
++@ stdcall GetCommConfig(long ptr ptr) kernel32.GetCommConfig
 +@ stdcall GetCommMask(long ptr) kernel32.GetCommMask
 +@ stdcall GetCommModemStatus(long ptr) kernel32.GetCommModemStatus
 +@ stdcall GetCommProperties(long ptr) kernel32.GetCommProperties
@@ -464,7 +464,7 @@ index f104030..e09112e 100644
 +@ stub GetCurrentPackageApplicationResourcesContext
 +@ stub GetCurrentPackageContext
 +@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
-+@ stub GetCurrentPackageFullName
++@ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName
 +@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
 +@ stub GetCurrentPackageInfo
 +@ stub GetCurrentPackagePath
@@ -1354,7 +1354,7 @@ index f104030..e09112e 100644
 +@ stub SetClientTimeZoneInformation
 +@ stdcall SetCommBreak(long) kernel32.SetCommBreak
 +@ stdcall SetCommConfig(long ptr long) kernel32.SetCommConfig
-+@ stdcall SetCommMask(long ptr) kernel32.SetCommMask
++@ stdcall SetCommMask(long long) kernel32.SetCommMask
 +@ stdcall SetCommState(long ptr) kernel32.SetCommState
 +@ stdcall SetCommTimeouts(long ptr) kernel32.SetCommTimeouts
 +@ stdcall SetComputerNameA(str) kernel32.SetComputerNameA
@@ -1367,8 +1367,8 @@ index f104030..e09112e 100644
 +@ stdcall SetConsoleCtrlHandler(ptr long) kernel32.SetConsoleCtrlHandler
 +@ stdcall SetConsoleCursorInfo(long ptr) kernel32.SetConsoleCursorInfo
 +@ stdcall SetConsoleCursorPosition(long long) kernel32.SetConsoleCursorPosition
-+@ stdcall SetConsoleInputExeNameA(ptr) kernel32.SetConsoleInputExeNameA
-+@ stdcall SetConsoleInputExeNameW(ptr) kernel32.SetConsoleInputExeNameW
++@ stdcall SetConsoleInputExeNameA(str) kernel32.SetConsoleInputExeNameA
++@ stdcall SetConsoleInputExeNameW(wstr) kernel32.SetConsoleInputExeNameW
 +@ stdcall SetConsoleMode(long long) kernel32.SetConsoleMode
 +@ stdcall SetConsoleOutputCP(long) kernel32.SetConsoleOutputCP
 +@ stdcall SetConsoleScreenBufferInfoEx(long ptr) kernel32.SetConsoleScreenBufferInfoEx
@@ -1715,7 +1715,7 @@ index f104030..e09112e 100644
 +@ stub wprintf
 diff --git a/dlls/kernelbase/misc.c b/dlls/kernelbase/misc.c
 new file mode 100644
-index 0000000..be1591a
+index 00000000000..be1591aee7e
 --- /dev/null
 +++ b/dlls/kernelbase/misc.c
 @@ -0,0 +1,37 @@
@@ -1757,7 +1757,7 @@ index 0000000..be1591a
 +    return FALSE;
 +}
 diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
-index 6b6ead2..7c2a9d1 100644
+index 6b6ead26968..7c2a9d117e0 100644
 --- a/dlls/shlwapi/shlwapi.spec
 +++ b/dlls/shlwapi/shlwapi.spec
 @@ -417,7 +417,7 @@
@@ -1770,10 +1770,10 @@ index 6b6ead2..7c2a9d1 100644
  422 stdcall -noname SHGlobalCounterCreateNamedA(str long)
  423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long)
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 8e11529..eba8548 100755
+index 1e2400e4c7f..a245aefe406 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -233,6 +233,7 @@ my @dll_groups =
+@@ -249,6 +249,7 @@ my @dll_groups =
   [
    "kernel32",
    "advapi32",
@@ -1782,5 +1782,5 @@ index 8e11529..eba8548 100755
    "kernelbase",
    "api-ms-win-core-bem-l1-1-0",
 -- 
-2.9.0
+2.11.0
 

patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch

@@ -1,81 +1,52 @@
-From 0f19391f2d2b5478137635a66a560bb9e097075a Mon Sep 17 00:00:00 2001
+From aefdbc0fabb66052164ecd45fecfb0b947a130ac Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:02:34 +0200
 Subject: uiautomationcore: Add dll and stub some functions.
 
 ---
- configure.ac                                |   1 +
- dlls/uiautomationcore/Makefile.in           |   5 ++
- dlls/uiautomationcore/main.c                | 117 ++++++++++++++++++++++++++++
- dlls/uiautomationcore/uiautomationcore.spec |  99 +++++++++++++++++++++++
- include/uiautomationcoreapi.h               |  16 ++++
- 5 files changed, 238 insertions(+)
- create mode 100644 dlls/uiautomationcore/Makefile.in
- create mode 100644 dlls/uiautomationcore/main.c
- create mode 100644 dlls/uiautomationcore/uiautomationcore.spec
+ dlls/uiautomationcore/Makefile.in           |  1 +
+ dlls/uiautomationcore/uia_main.c            | 89 ++++++++++++++++++++++++++++-
+ dlls/uiautomationcore/uiautomationcore.spec | 14 +++--
+ include/uiautomationcoreapi.h               | 16 ++++++
+ 4 files changed, 114 insertions(+), 6 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 4cfcdb1..9e8bbb9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3314,6 +3314,7 @@ WINE_CONFIG_TEST(dlls/twain_32/tests)
- WINE_CONFIG_DLL(typelib.dll16,enable_win16)
- WINE_CONFIG_DLL(ucrtbase,,[implib])
- WINE_CONFIG_TEST(dlls/ucrtbase/tests)
-+WINE_CONFIG_DLL(uiautomationcore)
- WINE_CONFIG_DLL(unicows,,[implib])
- WINE_CONFIG_DLL(updspapi)
- WINE_CONFIG_DLL(url,,[implib])
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-new file mode 100644
-index 0000000..bd6f9d6
---- /dev/null
+index 78d6254a015..029fc2e4995 100644
+--- a/dlls/uiautomationcore/Makefile.in
 +++ b/dlls/uiautomationcore/Makefile.in
-@@ -0,0 +1,5 @@
-+MODULE    = uiautomationcore.dll
+@@ -1,4 +1,5 @@
+ MODULE = uiautomationcore.dll
 +IMPORTS   = uuid
-+
-+C_SRCS = \
-+	main.c
-diff --git a/dlls/uiautomationcore/main.c b/dlls/uiautomationcore/main.c
-new file mode 100644
-index 0000000..71fe84c
---- /dev/null
-+++ b/dlls/uiautomationcore/main.c
-@@ -0,0 +1,117 @@
-+/*
-+ * uiautomationcore API
-+ *
+ 
+ C_SRCS = \
+ 	uia_main.c
+diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
+index 994d8e6080b..f1429faeff9 100644
+--- a/dlls/uiautomationcore/uia_main.c
++++ b/dlls/uiautomationcore/uia_main.c
+@@ -1,4 +1,5 @@
+ /*
 + * Copyright 2016 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include "config.h"
-+
+  * Copyright 2017 Jacek Caban for CodeWeavers
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -16,7 +17,11 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
+-#include "uiautomationcore.h"
 +#include <stdarg.h>
-+
 +#include "windef.h"
 +#include "winbase.h"
-+#include "wine/debug.h"
-+
 +#define COBJMACROS
 +#include "uiautomationcoreapi.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
-+
+ 
+ #include "wine/debug.h"
+ 
+@@ -37,11 +42,91 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv)
+     return TRUE;
+ }
+ 
 +static HRESULT WINAPI dummy_QueryInterface(IUnknown *iface, REFIID iid, void **ppv)
 +{
 +    TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), ppv);
@@ -115,12 +86,18 @@ index 0000000..71fe84c
 +
 +static IUnknown dummy = { &dummy_Vtbl };
 +
++/***********************************************************************
++ *          UiaLookupId (uiautomationcore.@)
++ */
 +int WINAPI UiaLookupId(AutomationIdentifierType type, const GUID *guid)
 +{
 +    FIXME("(%d, %s)\n", type, debugstr_guid(guid));
 +    return 1;
 +}
 +
++/***********************************************************************
++ *          UiaGetReservedMixedAttributeValue (uiautomationcore.@)
++ */
 +HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
 +{
 +    FIXME("(%p): stub\n", value);
@@ -129,6 +106,9 @@ index 0000000..71fe84c
 +    return S_OK;
 +}
 +
++/***********************************************************************
++ *          UiaGetReservedNotSupportedValue (uiautomationcore.@)
++ */
 +HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
 +{
 +    FIXME("(%p): stub\n", value);
@@ -137,6 +117,9 @@ index 0000000..71fe84c
 +    return S_OK;
 +}
 +
++/***********************************************************************
++ *          UiaReturnRawElementProvider (uiautomationcore.@)
++ */
 +LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lparam,
 +                                           IRawElementProviderSimple *provider)
 +{
@@ -144,129 +127,68 @@ index 0000000..71fe84c
 +    return 0;
 +}
 +
-+
-+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-+{
-+    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
-+
-+    switch (reason)
-+    {
-+        case DLL_WINE_PREATTACH:
-+            return FALSE;    /* prefer native version */
-+        case DLL_PROCESS_ATTACH:
-+            DisableThreadLibraryCalls(instance);
-+            break;
-+    }
-+
-+    return TRUE;
-+}
+ /***********************************************************************
+  *          UiaClientsAreListening (uiautomationcore.@)
+  */
+ BOOL WINAPI UiaClientsAreListening(void)
+ {
+-    FIXME("()\n");
++    FIXME("(): stub\n");
+     return FALSE;
+ }
 diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
-new file mode 100644
-index 0000000..321cd06
---- /dev/null
+index 3026001b6b7..221711c41d2 100644
+--- a/dlls/uiautomationcore/uiautomationcore.spec
 +++ b/dlls/uiautomationcore/uiautomationcore.spec
-@@ -0,0 +1,99 @@
-+@ stub DllCanUnloadNow
-+@ stub DllGetClassObject
-+@ stub DllRegisterServer
-+@ stub DllUnregisterServer
-+@ stub DockPattern_SetDockPosition
-+@ stub ExpandCollapsePattern_Collapse
-+@ stub ExpandCollapsePattern_Expand
-+@ stub GridPattern_GetItem
-+@ stub InvokePattern_Invoke
-+@ stub ItemContainerPattern_FindItemByProperty
-+@ stub LegacyIAccessiblePattern_DoDefaultAction
-+@ stub LegacyIAccessiblePattern_GetIAccessible
-+@ stub LegacyIAccessiblePattern_Select
-+@ stub LegacyIAccessiblePattern_SetValue
-+@ stub MultipleViewPattern_GetViewName
-+@ stub MultipleViewPattern_SetCurrentView
-+@ stub RangeValuePattern_SetValue
-+@ stub ScrollItemPattern_ScrollIntoView
-+@ stub ScrollPattern_Scroll
-+@ stub ScrollPattern_SetScrollPercent
-+@ stub SelectionItemPattern_AddToSelection
-+@ stub SelectionItemPattern_RemoveFromSelection
-+@ stub SelectionItemPattern_Select
-+@ stub SynchronizedInputPattern_Cancel
-+@ stub SynchronizedInputPattern_StartListening
-+@ stub TextPattern_GetSelection
-+@ stub TextPattern_GetVisibleRanges
-+@ stub TextPattern_RangeFromChild
-+@ stub TextPattern_RangeFromPoint
-+@ stub TextPattern_get_DocumentRange
-+@ stub TextPattern_get_SupportedTextSelection
-+@ stub TextRange_AddToSelection
-+@ stub TextRange_Clone
-+@ stub TextRange_Compare
-+@ stub TextRange_CompareEndpoints
-+@ stub TextRange_ExpandToEnclosingUnit
-+@ stub TextRange_FindAttribute
-+@ stub TextRange_FindText
-+@ stub TextRange_GetAttributeValue
-+@ stub TextRange_GetBoundingRectangles
-+@ stub TextRange_GetChildren
-+@ stub TextRange_GetEnclosingElement
-+@ stub TextRange_GetText
-+@ stub TextRange_Move
-+@ stub TextRange_MoveEndpointByRange
-+@ stub TextRange_MoveEndpointByUnit
-+@ stub TextRange_RemoveFromSelection
-+@ stub TextRange_ScrollIntoView
-+@ stub TextRange_Select
-+@ stub TogglePattern_Toggle
-+@ stub TransformPattern_Move
-+@ stub TransformPattern_Resize
-+@ stub TransformPattern_Rotate
-+@ stub UiaAddEvent
-+@ stub UiaClientsAreListening
+@@ -53,14 +53,16 @@
+ @ stub TransformPattern_Rotate
+ @ stub UiaAddEvent
+ @ stdcall UiaClientsAreListening()
 +@ stub UiaDisconnectAllProviders
 +@ stub UiaDisconnectProvider
-+@ stub UiaEventAddWindow
-+@ stub UiaEventRemoveWindow
-+@ stub UiaFind
-+@ stub UiaGetErrorDescription
-+@ stub UiaGetPatternProvider
-+@ stub UiaGetPropertyValue
+ @ stub UiaEventAddWindow
+ @ stub UiaEventRemoveWindow
+ @ stub UiaFind
+ @ stub UiaGetErrorDescription
+ @ stub UiaGetPatternProvider
+ @ stub UiaGetPropertyValue
+-@ stub UiaGetReservedMixedAttributeValue
+-@ stub UiaGetReservedNotSupportedValue
 +@ stdcall UiaGetReservedMixedAttributeValue(ptr)
 +@ stdcall UiaGetReservedNotSupportedValue(ptr)
-+@ stub UiaGetRootNode
-+@ stub UiaGetRuntimeId
-+@ stub UiaGetUpdatedCache
-+@ stub UiaHPatternObjectFromVariant
-+@ stub UiaHTextRangeFromVariant
-+@ stub UiaHUiaNodeFromVariant
-+@ stub UiaHasServerSideProvider
-+@ stub UiaHostProviderFromHwnd
+ @ stub UiaGetRootNode
+ @ stub UiaGetRuntimeId
+ @ stub UiaGetUpdatedCache
+@@ -69,7 +71,8 @@
+ @ stub UiaHUiaNodeFromVariant
+ @ stub UiaHasServerSideProvider
+ @ stub UiaHostProviderFromHwnd
+-@ stub UiaLookupId
 +@ stub UiaIAccessibleFromProvider
 +@ stdcall UiaLookupId(long ptr)
-+@ stub UiaNavigate
-+@ stub UiaNodeFromFocus
-+@ stub UiaNodeFromHandle
-+@ stub UiaNodeFromPoint
-+@ stub UiaNodeFromProvider
-+@ stub UiaNodeRelease
-+@ stub UiaPatternRelease
+ @ stub UiaNavigate
+ @ stub UiaNodeFromFocus
+ @ stub UiaNodeFromHandle
+@@ -77,13 +80,16 @@
+ @ stub UiaNodeFromProvider
+ @ stub UiaNodeRelease
+ @ stub UiaPatternRelease
 +@ stub UiaProviderForNonClient
 +@ stub UiaProviderFromIAccessible
-+@ stub UiaRaiseAsyncContentLoadedEvent
-+@ stub UiaRaiseAutomationEvent
-+@ stub UiaRaiseAutomationPropertyChangedEvent
-+@ stub UiaRaiseStructureChangedEvent
+ @ stub UiaRaiseAsyncContentLoadedEvent
+ @ stub UiaRaiseAutomationEvent
+ @ stub UiaRaiseAutomationPropertyChangedEvent
+ @ stub UiaRaiseStructureChangedEvent
 +@ stub UiaRaiseTextEditTextChangedEvent
-+@ stub UiaRegisterProviderCallback
-+@ stub UiaRemoveEvent
+ @ stub UiaRegisterProviderCallback
+ @ stub UiaRemoveEvent
+-@ stub UiaReturnRawElementProvider
 +@ stdcall UiaReturnRawElementProvider(long long long ptr)
-+@ stub UiaSetFocus
-+@ stub UiaTextRangeRelease
-+@ stub ValuePattern_SetValue
-+@ stub VirtualizedItemPattern_Realize
-+@ stub WindowPattern_Close
-+@ stub WindowPattern_SetWindowVisualState
-+@ stub WindowPattern_WaitForInputIdle
+ @ stub UiaSetFocus
+ @ stub UiaTextRangeRelease
+ @ stub ValuePattern_SetValue
 diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
-index 340f500..b9107ce 100644
+index 340f5005db4..b9107ceb792 100644
 --- a/include/uiautomationcoreapi.h
 +++ b/include/uiautomationcoreapi.h
 @@ -19,6 +19,8 @@
@@ -307,5 +229,5 @@ index 340f500..b9107ce 100644
  #ifdef __cplusplus
  }
 -- 
-2.9.0
+2.11.0
 

patches/api-ms-win-Stub_DLLs/0028-uiautomationcore-Add-stub-for-UiaClientsAreListening.patch

@@ -1,43 +0,0 @@
-From 7b2e5b361ebe380ae671b8f3d2ae4c90167354dc Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 15 Nov 2016 22:00:38 +0100
-Subject: uiautomationcore: Add stub for UiaClientsAreListening.
-
----
- dlls/uiautomationcore/main.c                | 6 ++++++
- dlls/uiautomationcore/uiautomationcore.spec | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/uiautomationcore/main.c b/dlls/uiautomationcore/main.c
-index 71fe84c..6ea1351 100644
---- a/dlls/uiautomationcore/main.c
-+++ b/dlls/uiautomationcore/main.c
-@@ -99,6 +99,12 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lpar
-     return 0;
- }
- 
-+BOOL WINAPI UiaClientsAreListening(void)
-+{
-+    FIXME("(): stub\n");
-+    return FALSE;
-+}
-+
- 
- BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
- {
-diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
-index 321cd06..221711c 100644
---- a/dlls/uiautomationcore/uiautomationcore.spec
-+++ b/dlls/uiautomationcore/uiautomationcore.spec
-@@ -52,7 +52,7 @@
- @ stub TransformPattern_Resize
- @ stub TransformPattern_Rotate
- @ stub UiaAddEvent
--@ stub UiaClientsAreListening
-+@ stdcall UiaClientsAreListening()
- @ stub UiaDisconnectAllProviders
- @ stub UiaDisconnectProvider
- @ stub UiaEventAddWindow
--- 
-2.9.0
-

patches/avifil32-AVIFileGetStream/0001-avifil32-AVIFileGetStream-should-set-stream-to-NULL-.patch

@@ -1,42 +0,0 @@
-From 64ce8c391c3706a2b3ce9b5f8f76710d5751a766 Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Thu, 20 Oct 2016 17:48:24 +0800
-Subject: avifil32: AVIFileGetStream should set stream to NULL in case of an
- error.
-
----
- dlls/avifil32/avifile.c   | 1 +
- dlls/avifil32/tests/api.c | 5 +++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
-index f649d05..7a4caaa 100644
---- a/dlls/avifil32/avifile.c
-+++ b/dlls/avifil32/avifile.c
-@@ -316,6 +316,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D
-   }
- 
-   /* Sorry, but the specified stream doesn't exist */
-+  *avis = NULL;
-   return AVIERR_NODATA;
- }
- 
-diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c
-index b3d822d..8a00865 100644
---- a/dlls/avifil32/tests/api.c
-+++ b/dlls/avifil32/tests/api.c
-@@ -373,6 +373,11 @@ static void test_default_data(void)
-     res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L);
-     ok(res == 0, "Unable to open file: error=%u\n", res);
- 
-+    pStream0 = (void *)0xdeadbeef;
-+    res = AVIFileGetStream(pFile, &pStream0, ~0, 0);
-+    ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %#x\n", res);
-+    ok(pStream0 == NULL, "AVIFileGetStream should set stream to NULL\n");
-+
-     res = AVIFileGetStream(pFile, &pStream0, 0, 0);
-     ok(res == 0, "Unable to open video stream: error=%u\n", res);
- 
--- 
-2.9.0
-

patches/avifil32-AVIFileGetStream/definition

@@ -1 +0,0 @@
-Fixes: [41579] AVIFileGetStream should set stream to NULL in case of an error

patches/bcrypt-Improvements/0001-bcrypt-Add-AES-provider.patch

@@ -1,4 +1,4 @@
-From c178117abacbf8644ae05429999ff8e8f8585a7e Mon Sep 17 00:00:00 2001
+From 489a67ec803b382248134be53f3449c206e208ff Mon Sep 17 00:00:00 2001
 From: Hans Leidekker <hans@codeweavers.com>
 Date: Mon, 19 Dec 2016 19:38:52 +0100
 Subject: bcrypt: Add AES provider.
@@ -53,7 +53,7 @@ index e299fe0cce8..962953e509b 100644
  @ stub BCryptUnregisterConfigChangeNotify
  @ stub BCryptUnregisterProvider
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 6023c942e49..5e066283f6e 100644
+index 6023c942e49..5867dbdc3fa 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
 @@ -49,6 +49,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -208,7 +208,7 @@ index 6023c942e49..5e066283f6e 100644
      return BCryptDestroyHash( handle );
  }
  
-+#if defined(HAVE_GNUTLS_HASH)
++#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
 +struct key
 +{
 +    struct object      hdr;

patches/bcrypt-Improvements/0026-bcrypt-Implement-support-for-ECB-chain-mode.patch

@@ -0,0 +1,375 @@
+From cbf5204cddb1146f236c04660856418074c613d7 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 5 Mar 2017 23:18:03 +0100
+Subject: bcrypt: Implement support for ECB chain mode.
+
+---
+ dlls/bcrypt/bcrypt_main.c  |  43 ++++++++--
+ dlls/bcrypt/tests/bcrypt.c | 206 +++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 240 insertions(+), 9 deletions(-)
+
+diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
+index 1b548c9f406..a161eb26d8f 100644
+--- a/dlls/bcrypt/bcrypt_main.c
++++ b/dlls/bcrypt/bcrypt_main.c
+@@ -186,6 +186,7 @@ enum alg_id
+ 
+ enum mode_id
+ {
++    MODE_ID_ECB,
+     MODE_ID_CBC,
+     MODE_ID_GCM
+ };
+@@ -519,8 +520,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
+             const WCHAR *mode;
+             switch (alg->mode)
+             {
+-                case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break;
++                case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break;
+                 case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break;
++                case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break;
+                 default: return STATUS_NOT_IMPLEMENTED;
+             }
+ 
+@@ -619,7 +621,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA
+     case ALG_ID_AES:
+         if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
+         {
+-            if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
++            if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size ))
++            {
++                alg->mode = MODE_ID_ECB;
++                return STATUS_SUCCESS;
++            }
++            else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
+             {
+                 alg->mode = MODE_ID_CBC;
+                 return STATUS_SUCCESS;
+@@ -951,7 +958,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val
+ {
+     if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
+     {
+-        if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
++        if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size ))
++        {
++            key->mode = MODE_ID_ECB;
++            return STATUS_SUCCESS;
++        }
++        else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
+         {
+             key->mode = MODE_ID_CBC;
+             return STATUS_SUCCESS;
+@@ -981,6 +993,7 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key )
+         switch (key->mode)
+         {
+             case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM;
++            case MODE_ID_ECB: /* can be emulated with CBC + empty IV */
+             case MODE_ID_CBC:
+             default:          return GNUTLS_CIPHER_AES_128_CBC;
+         }
+@@ -992,6 +1005,7 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key )
+ 
+ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
+ {
++    static const UCHAR zero_iv[16];
+     gnutls_cipher_algorithm_t cipher;
+     gnutls_datum_t secret, vector;
+     int ret;
+@@ -1005,15 +1019,18 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
+     if ((cipher = get_gnutls_cipher( key )) == GNUTLS_CIPHER_UNKNOWN)
+         return STATUS_NOT_SUPPORTED;
+ 
+-    secret.data = key->secret;
+-    secret.size = key->secret_len;
+-    if (iv)
++    if (!iv)
+     {
+-        vector.data = iv;
+-        vector.size = iv_len;
++        iv      = (UCHAR *)zero_iv;
++        iv_len  = sizeof(zero_iv);
+     }
+ 
+-    if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, iv ? &vector : NULL )))
++    secret.data = key->secret;
++    secret.size = key->secret_len;
++    vector.data = iv;
++    vector.size = iv_len;
++
++    if ((ret = pgnutls_cipher_init( &key->handle, cipher, &secret, &vector )))
+     {
+         pgnutls_perror( ret );
+         return STATUS_INTERNAL_ERROR;
+@@ -1277,11 +1294,15 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
+     if (!output) return STATUS_SUCCESS;
+     if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL;
+ 
++    if (key->mode == MODE_ID_ECB && iv)
++        return STATUS_INVALID_PARAMETER;
++
+     src = input;
+     dst = output;
+     while (bytes_left >= key->block_size)
+     {
+         if ((status = key_encrypt( key, src, key->block_size, dst, key->block_size ))) return status;
++        if (key->mode == MODE_ID_ECB && (status = key_set_params( key, iv, iv_len ))) return status;
+         bytes_left -= key->block_size;
+         src += key->block_size;
+         dst += key->block_size;
+@@ -1364,11 +1385,15 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
+     else if (output_len < *ret_len)
+         return STATUS_BUFFER_TOO_SMALL;
+ 
++    if (key->mode == MODE_ID_ECB && iv)
++        return STATUS_INVALID_PARAMETER;
++
+     src = input;
+     dst = output;
+     while (bytes_left >= key->block_size)
+     {
+         if ((status = key_decrypt( key, src, key->block_size, dst, key->block_size ))) return status;
++        if (key->mode == MODE_ID_ECB && (status = key_set_params( key, iv, iv_len ))) return status;
+         bytes_left -= key->block_size;
+         src += key->block_size;
+         dst += key->block_size;
+diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
+index 8be4c5b809d..aa8e7e17490 100644
+--- a/dlls/bcrypt/tests/bcrypt.c
++++ b/dlls/bcrypt/tests/bcrypt.c
+@@ -997,6 +997,15 @@ static void test_BCryptEncrypt(void)
+     static UCHAR expected4[] =
+         {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67,
+          0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94};
++    static UCHAR expected5[] =
++        {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a};
++    static UCHAR expected6[] =
++        {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a,
++         0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70};
++    static UCHAR expected7[] =
++        {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a,
++         0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99,
++         0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99};
+     static UCHAR expected_tag[] =
+         {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
+     static UCHAR expected_tag2[] =
+@@ -1209,6 +1218,97 @@ static void test_BCryptEncrypt(void)
+     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
+     HeapFree(GetProcessHeap(), 0, buf);
+ 
++    /******************
++     * AES - ECB mode *
++     ******************/
++
++    ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++
++    len = 0xdeadbeef;
++    size = sizeof(len);
++    ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++
++    buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
++    ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++
++    /* initialization vector is not allowed */
++    size = 0;
++    memcpy(ivbuf, iv, sizeof(iv));
++    ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0);
++    ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
++    ok(size == 16, "got %u\n", size);
++
++    /* input size is a multiple of block size */
++    size = 0;
++    ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, NULL, 0, &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 16, "got %u\n", size);
++
++    size = 0;
++    memset(ciphertext, 0, sizeof(ciphertext));
++    ret = pBCryptEncrypt(key, data, 16, NULL, NULL, 16, ciphertext, 16, &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 16, "got %u\n", size);
++    ok(!memcmp(ciphertext, expected5, sizeof(expected5)), "wrong data\n");
++    for (i = 0; i < 16; i++)
++        ok(ciphertext[i] == expected5[i], "%u: %02x != %02x\n", i, ciphertext[i], expected5[i]);
++
++    /* input size is not a multiple of block size */
++    size = 0;
++    ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, 0);
++    ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret);
++    ok(size == 17, "got %u\n", size);
++
++    /* input size is not a multiple of block size, block padding set */
++    size = 0;
++    ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++
++    size = 0;
++    memset(ciphertext, 0, sizeof(ciphertext));
++    ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++    ok(!memcmp(ciphertext, expected6, sizeof(expected6)), "wrong data\n");
++    for (i = 0; i < 32; i++)
++        ok(ciphertext[i] == expected6[i], "%u: %02x != %02x\n", i, ciphertext[i], expected6[i]);
++
++    /* input size is a multiple of block size, block padding set */
++    size = 0;
++    ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 48, "got %u\n", size);
++
++    size = 0;
++    memset(ciphertext, 0, sizeof(ciphertext));
++    ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 48, "got %u\n", size);
++    ok(!memcmp(ciphertext, expected7, sizeof(expected7)), "wrong data\n");
++    for (i = 0; i < 48; i++)
++        ok(ciphertext[i] == expected7[i], "%u: %02x != %02x\n", i, ciphertext[i], expected7[i]);
++
++    /* output size too small */
++    size = 0;
++    memset(ciphertext, 0, sizeof(ciphertext));
++    ret = pBCryptEncrypt(key, data, 17, NULL, NULL, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++
++    size = 0;
++    memset(ciphertext, 0, sizeof(ciphertext));
++    ret = pBCryptEncrypt(key, data2, 32, NULL, NULL, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret);
++    ok(size == 48, "got %u\n", size);
++
++    ret = pBCryptDestroyKey(key);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    HeapFree(GetProcessHeap(), 0, buf);
++
+     ret = pBCryptCloseAlgorithmProvider(aes, 0);
+     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
+ }
+@@ -1243,6 +1343,13 @@ static void test_BCryptDecrypt(void)
+     static UCHAR ciphertext4[] =
+         {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67,
+          0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94};
++    static UCHAR ciphertext5[] =
++        {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a,
++         0x84,0x07,0x66,0xb7,0x49,0xc0,0x9b,0x49,0x74,0x28,0x8c,0x10,0xb9,0xc2,0x09,0x70};
++    static UCHAR ciphertext6[] =
++        {0x0a,0x94,0x0b,0xb5,0x41,0x6e,0xf0,0x45,0xf1,0xc3,0x94,0x58,0xc6,0x53,0xea,0x5a,
++         0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99,
++         0x95,0x4f,0x64,0xf2,0xe4,0xe8,0x6e,0x9e,0xee,0x82,0xd2,0x02,0x16,0x68,0x48,0x99};
+     static UCHAR tag[] =
+         {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
+     static UCHAR tag2[] =
+@@ -1411,6 +1518,105 @@ static void test_BCryptDecrypt(void)
+     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
+     HeapFree(GetProcessHeap(), 0, buf);
+ 
++    /******************
++     * AES - ECB mode *
++     ******************/
++
++    ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++
++    len = 0xdeadbeef;
++    size = sizeof(len);
++    ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++
++    buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
++    ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++
++    /* initialization vector is not allowed */
++    size = 0;
++    memcpy(ivbuf, iv, sizeof(iv));
++    ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0);
++    ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++
++    /* input size is a multiple of block size */
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++
++    size = 0;
++    memset(plaintext, 0, sizeof(plaintext));
++    ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 32, &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++    ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n");
++
++    /* test with padding smaller than block size */
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, NULL, 0, &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++
++    size = 0;
++    memset(plaintext, 0, sizeof(plaintext));
++    ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 17, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 17, "got %u\n", size);
++    ok(!memcmp(plaintext, expected2, sizeof(expected2)), "wrong data\n");
++
++    /* test with padding of block size */
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, NULL, 0, &size, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 48, "got %u\n", size);
++
++    size = 0;
++    memset(plaintext, 0, sizeof(plaintext));
++    ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 32, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++    ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n");
++
++    /* output size too small */
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext4, 32, NULL, NULL, 16, plaintext, 31, &size, 0);
++    ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 15, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret);
++    ok(size == 32, "got %u\n", size);
++
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext5, 32, NULL, NULL, 16, plaintext, 16, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret);
++    ok(size == 17, "got %u\n", size);
++
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext6, 48, NULL, NULL, 16, plaintext, 31, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret);
++    ok(size == 48, "got %u\n", size);
++
++    /* input size is not a multiple of block size */
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, 0);
++    ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret);
++    ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size);
++
++    /* input size is not a multiple of block size, block padding set */
++    size = 0;
++    ret = pBCryptDecrypt(key, ciphertext4, 17, NULL, NULL, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING);
++    ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret);
++    ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size);
++
++    ret = pBCryptDestroyKey(key);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    HeapFree(GetProcessHeap(), 0, buf);
++
+     ret = pBCryptCloseAlgorithmProvider(aes, 0);
+     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
+ }
+-- 
+2.11.0
+

patches/bcrypt-Improvements/definition

@@ -1,2 +1,3 @@
 Fixes: [41951] Implement bcrypt.BCryptDuplicateHash
 Fixes: [40418] Implement BCrypt AES provider
+Fixes: [42553] Implement BCrypt ECB chaining mode