Release 2.4.

Probably fixed by cab9282d10e4b2868a0dd85383b1126c0d6c591a.

LICENSE.md

@@ -7,7 +7,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 [LGPLv2.1](#gnu-lgpl-version-21), to stay compatible with Wine:
 
 ```
-Copyright (C) 2014-2016 the Wine Staging project authors.
+Copyright (C) 2014-2017 the Wine Staging project authors.
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

patches/Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch

@@ -1,25 +0,0 @@
-From 1d2744df97beb00c40ae4c9d307334f4fe0c253d Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 31 Jul 2016 00:01:52 +0200
-Subject: include: Avoid shift overflow warning.
-
----
- include/d3dtypes.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/d3dtypes.h b/include/d3dtypes.h
-index 75aee55..8a884a8 100644
---- a/include/d3dtypes.h
-+++ b/include/d3dtypes.h
-@@ -53,7 +53,7 @@ typedef LONG D3DFIXED;
- #define RGBA_GETRED(rgb)        (((rgb) >> 16) & 0xff)
- #define RGBA_GETGREEN(rgb)      (((rgb) >> 8) & 0xff)
- #define RGBA_GETBLUE(rgb)       ((rgb) & 0xff)
--#define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
-+#define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
- 
- #define D3DRGB(r, g, b) \
-     (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255))
--- 
-2.9.0
-

patches/Compiler_Warnings/0017-server-Workaround-duplicate-condition-warning-of-GCC.patch

@@ -1,85 +0,0 @@
-From c3170561ea6c0de42ae71925e31e08941e1b96dc Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 31 Jul 2016 00:03:02 +0200
-Subject: server: Workaround duplicate condition warning of GCC 6.
-
----
- server/request.c | 13 ++++++++++---
- server/sock.c    |  9 ++++++++-
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/server/request.c b/server/request.c
-index 597bf88..483884b 100644
---- a/server/request.c
-+++ b/server/request.c
-@@ -220,6 +220,13 @@ const void *get_req_data_after_objattr( const struct object_attributes *attr, da
-     return ptr;
- }
- 
-+static inline int should_retry( int err )
-+{
-+    if (err == EWOULDBLOCK) return 1;
-+    if (err == EAGAIN) return 1;
-+    return 0;
-+}
-+
- /* write the remaining part of the reply */
- void write_reply( struct thread *thread )
- {
-@@ -241,7 +248,7 @@ void write_reply( struct thread *thread )
-     }
-     if (errno == EPIPE)
-         kill_thread( thread, 0 );  /* normal death */
--    else if (errno != EWOULDBLOCK && errno != EAGAIN)
-+    else if (!should_retry( errno ))
-         fatal_protocol_error( thread, "reply write: %s\n", strerror( errno ));
- }
- 
-@@ -368,7 +375,7 @@ error:
-         kill_thread( thread, 0 );
-     else if (ret > 0)
-         fatal_protocol_error( thread, "partial read %d\n", ret );
--    else if (errno != EWOULDBLOCK && errno != EAGAIN)
-+    else if (!should_retry( errno ))
-         fatal_protocol_error( thread, "read: %s\n", strerror( errno ));
- }
- 
-@@ -449,7 +456,7 @@ int receive_fd( struct process *process )
-     }
-     else
-     {
--        if (errno != EWOULDBLOCK && errno != EAGAIN)
-+        if (!should_retry( errno ))
-         {
-             fprintf( stderr, "Protocol error: process %04x: ", process->id );
-             perror( "recvmsg" );
-diff --git a/server/sock.c b/server/sock.c
-index dc10d2a..4f76163 100644
---- a/server/sock.c
-+++ b/server/sock.c
-@@ -1065,6 +1065,13 @@ static void ifchange_wake_up( struct object *obj, unsigned int status )
-     }
- }
- 
-+static inline int should_retry( int err )
-+{
-+    if (err == EWOULDBLOCK) return 1;
-+    if (err == EAGAIN) return 1;
-+    return 0;
-+}
-+
- static void ifchange_poll_event( struct fd *fd, int event )
- {
-     struct object *ifchange = get_fd_user( fd );
-@@ -1075,7 +1082,7 @@ static void ifchange_poll_event( struct fd *fd, int event )
-     r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT );
-     if (r < 0)
-     {
--        if (errno == EWOULDBLOCK || errno == EAGAIN)
-+        if (should_retry( errno ))
-             return; /* retry when poll() says the socket is ready */
-         status = sock_get_ntstatus( errno );
-     }
--- 
-2.9.0
-

patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,17 +1,40 @@
-From 869fbc7190eb77e027be4bcd98d938198189c3dd Mon Sep 17 00:00:00 2001
+From 744549e1ecc76c3764079d337c09445d01a3527e Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
 Subject: dwrite: Avoid implicit cast of interface pointer.
 
 ---
+ dlls/dwrite/font.c   | 4 ++--
  dlls/dwrite/layout.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
+index d9ddce0..0a90c20 100644
+--- a/dlls/dwrite/font.c
++++ b/dlls/dwrite/font.c
+@@ -1684,7 +1684,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
+-    return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont3_iface);
++    return CONTAINING_RECORD((IDWriteFont3 *)iface, struct dwrite_font, IDWriteFont3_iface);
+ }
+ 
+ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1692,7 +1692,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
+-    return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface);
++    return CONTAINING_RECORD((IDWriteFontFace4 *)iface, struct dwrite_fontface, IDWriteFontFace4_iface);
+ }
+ 
+ void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 38b5e32..24f4abc 100644
+index 706ed4e..c76a909 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5115,7 +5115,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5196,7 +5196,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
@@ -21,5 +44,5 @@ index 38b5e32..24f4abc 100644
  
  HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
 -- 
-2.7.1
+2.9.0
 

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-GetExplicitEntriesFromAclW/0001-advapi32-Implement-GetExplicitEntriesFromAclW.patch

@@ -0,0 +1,277 @@
+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.
+
+---
+ dlls/advapi32/security.c       |  81 ++++++++++++++++++++++-
+ dlls/advapi32/tests/security.c | 142 +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 221 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+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
+ DWORD WINAPI GetExplicitEntriesFromAclW( PACL pacl, PULONG pcCountOfExplicitEntries,
+         PEXPLICIT_ACCESSW* pListOfExplicitEntries)
+ {
+-    FIXME("%p %p %p\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries);
+-    return ERROR_CALL_NOT_IMPLEMENTED;
++    ACL_SIZE_INFORMATION sizeinfo;
++    EXPLICIT_ACCESSW* entries;
++    MAX_SID *sid_entries;
++    ACE_HEADER *ace;
++    NTSTATUS status;
++    int i;
++
++    FIXME("%p %p %p: semi-stub\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries);
++
++    if (!pcCountOfExplicitEntries || !pListOfExplicitEntries)
++        return ERROR_INVALID_PARAMETER;
++
++    status = RtlQueryInformationAcl(pacl, &sizeinfo, sizeof(sizeinfo), AclSizeInformation);
++    if (status) return RtlNtStatusToDosError(status);
++
++    if (!sizeinfo.AceCount)
++    {
++        *pcCountOfExplicitEntries = 0;
++        *pListOfExplicitEntries = NULL;
++        return ERROR_SUCCESS;
++    }
++
++    entries = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, (sizeof(EXPLICIT_ACCESSW) + sizeof(MAX_SID)) * sizeinfo.AceCount);
++    if (!entries) return ERROR_OUTOFMEMORY;
++    sid_entries = (MAX_SID*)((char*)entries + sizeof(EXPLICIT_ACCESSW) * sizeinfo.AceCount);
++
++    for (i = 0; i < sizeinfo.AceCount; i++)
++    {
++        status = RtlGetAce(pacl, i, (void**)&ace);
++        if (status) goto error;
++
++        switch (ace->AceType)
++        {
++            case ACCESS_ALLOWED_ACE_TYPE:
++            {
++                ACCESS_ALLOWED_ACE *allow = (ACCESS_ALLOWED_ACE *)ace;
++                entries[i].grfAccessMode = GRANT_ACCESS;
++                entries[i].grfInheritance = ace->AceFlags;
++                entries[i].grfAccessPermissions = allow->Mask;
++
++                CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&allow->SidStart);
++                entries[i].Trustee.pMultipleTrustee = NULL;
++                entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
++                entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID;
++                entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
++                entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i];
++                break;
++            }
++
++            case ACCESS_DENIED_ACE_TYPE:
++            {
++                ACCESS_DENIED_ACE *deny = (ACCESS_DENIED_ACE *)ace;
++                entries[i].grfAccessMode = DENY_ACCESS;
++                entries[i].grfInheritance = ace->AceFlags;
++                entries[i].grfAccessPermissions = deny->Mask;
++
++                CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&deny->SidStart);
++                entries[i].Trustee.pMultipleTrustee = NULL;
++                entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
++                entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID;
++                entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
++                entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i];
++                break;
++            }
++
++            default:
++                FIXME("Unhandled ace type %d\n", ace->AceType);
++                entries[i].grfAccessMode = NOT_USED_ACCESS;
++                continue;
++        }
++    }
++
++    *pcCountOfExplicitEntries = sizeinfo.AceCount;
++    *pListOfExplicitEntries = entries;
++    return ERROR_SUCCESS;
++
++error:
++    LocalFree(entries);
++    return RtlNtStatusToDosError(status);
+ }
+ 
+ /******************************************************************************
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+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*);
+ static void     (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ);
+ static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING);
+ static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID);
++static DWORD    (WINAPI *pGetExplicitEntriesFromAclW)(PACL,PULONG,PEXPLICIT_ACCESSW*);
+ 
+ static HMODULE hmod;
+ static int     myARGC;
+@@ -227,6 +228,7 @@ static void init(void)
+     pGetAce = (void *)GetProcAddress(hmod, "GetAce");
+     pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid");
+     pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority");
++    pGetExplicitEntriesFromAclW = (void *)GetProcAddress(hmod, "GetExplicitEntriesFromAclW");
+ 
+     myARGC = winetest_get_mainargs( &myARGV );
+ }
+@@ -6451,6 +6453,145 @@ static void test_maximum_allowed(void)
+     CloseHandle(handle);
+ }
+ 
++static void test_GetExplicitEntriesFromAclW(void)
++{
++    static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
++    SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
++    SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY };
++    PSID everyone_sid = NULL, users_sid = NULL;
++    EXPLICIT_ACCESSW access;
++    EXPLICIT_ACCESSW *access2;
++    PACL new_acl, old_acl = NULL;
++    ULONG count;
++    DWORD res;
++
++    if (!pGetExplicitEntriesFromAclW)
++    {
++        win_skip("GetExplicitEntriesFromAclW is not available\n");
++        return;
++    }
++
++    if (!pSetEntriesInAclW)
++    {
++        win_skip("SetEntriesInAclW is not available\n");
++        return;
++    }
++
++    old_acl = HeapAlloc(GetProcessHeap(), 0, 256);
++    res = InitializeAcl(old_acl, 256, ACL_REVISION);
++    if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
++    {
++        win_skip("ACLs not implemented - skipping tests\n");
++        HeapFree(GetProcessHeap(), 0, old_acl);
++        return;
++    }
++    ok(res, "InitializeAcl failed with error %d\n", GetLastError());
++
++    res = AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &everyone_sid);
++    ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError());
++
++    res = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID,
++                                   DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &users_sid);
++    ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError());
++
++    res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, users_sid);
++    ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError());
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(old_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 1, "Expected count == 1, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_READ, "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n");
++    LocalFree(access2);
++
++    access.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
++    access.Trustee.pMultipleTrustee = NULL;
++
++    access.grfAccessPermissions = KEY_WRITE;
++    access.grfAccessMode = GRANT_ACCESS;
++    access.grfInheritance = NO_INHERITANCE;
++    access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
++    access.Trustee.TrusteeForm = TRUSTEE_IS_SID;
++    access.Trustee.ptstrName = everyone_sid;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 2, "Expected count == 2, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN,
++       "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n");
++    LocalFree(access2);
++    LocalFree(new_acl);
++
++    access.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 2, "Expected count == 2, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN,
++       "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n");
++    LocalFree(access2);
++    LocalFree(new_acl);
++
++    access.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
++    access.Trustee.ptstrName = (LPWSTR)wszCurrentUser;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 2, "Expected count == 2, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN,
++       "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    LocalFree(access2);
++    LocalFree(new_acl);
++
++    access.grfAccessMode = REVOKE_ACCESS;
++    access.Trustee.TrusteeForm = TRUSTEE_IS_SID;
++    access.Trustee.ptstrName = users_sid;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = (void *)0xdeadbeef;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 0, "Expected count == 0, got %d\n", count);
++    ok(access2 == NULL, "access2 was not NULL\n");
++    LocalFree(new_acl);
++
++    FreeSid(users_sid);
++    FreeSid(everyone_sid);
++    HeapFree(GetProcessHeap(), 0, old_acl);
++}
++
+ START_TEST(security)
+ {
+     init();
+@@ -6499,4 +6640,5 @@ START_TEST(security)
+     test_GetSidIdentifierAuthority();
+     test_pseudo_tokens();
+     test_maximum_allowed();
++    test_GetExplicitEntriesFromAclW();
+ }
+-- 
+2.11.0
+

patches/advapi32-GetExplicitEntriesFromAclW/definition

@@ -0,0 +1 @@
+Fixes: Implement semi-stub for advapi32.GetExplicitEntriesFromAclW

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/advapi32-WinBuiltinAnyPackageSid/0001-advapi32-SDDL-assigns-the-AC-abbreviation-to-WinBuil.patch

@@ -0,0 +1,26 @@
+From e71a9b9a10c2de28a617f9490c3d135b1e12adf1 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 16 Dec 2016 13:20:32 +0800
+Subject: advapi32: SDDL assigns the "AC" abbreviation to
+ WinBuiltinAnyPackageSid.
+
+---
+ dlls/advapi32/security.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index 28331df..3b585aa 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -135,7 +135,7 @@ static const WELLKNOWNSID WellKnownSids[] =
+     { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } },
+     { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } },
+     { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } },
+-    { {0,0}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } },
++    { {'A','C'}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } },
+ };
+ 
+ /* these SIDs must be constructed as relative to some domain - only the RID is well-known */
+-- 
+2.9.0
+

patches/advapi32-WinBuiltinAnyPackageSid/0002-advapi32-tests-Add-a-test-that-compares-a-well-known.patch

@@ -0,0 +1,227 @@
+From 13a60cc5ea59cc2f18ac19888fe51628f9f0774a 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
+ created from a SDDL abbreviation.
+
+---
+ dlls/advapi32/tests/security.c | 130 +++++++++++++++++++++++++++++------------
+ 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
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -2,7 +2,7 @@
+  * Unit tests for security functions
+  *
+  * Copyright (c) 2004 Mike McCormack
+- * Copyright (c) 2011 Dmitry Timoshkov
++ * Copyright (c) 2011,2013,2014,2016 Dmitry Timoshkov
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -138,14 +138,6 @@ static HMODULE hmod;
+ static int     myARGC;
+ static char**  myARGV;
+ 
+-struct strsid_entry
+-{
+-    const char *str;
+-    DWORD flags;
+-};
+-#define STRSID_OK     0
+-#define STRSID_OPT    1
+-
+ #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)
+     return res;
+ }
+ 
+-struct sidRef
+-{
+-    SID_IDENTIFIER_AUTHORITY auth;
+-    const char *refStr;
+-};
+-
+ static void init(void)
+ {
+     HMODULE hntdll;
+@@ -297,7 +283,11 @@ static void test_group_equal(HANDLE Handle, PSID expected, int line)
+ 
+ static void test_sid(void)
+ {
+-    struct sidRef refs[] = {
++    static struct
++    {
++        SID_IDENTIFIER_AUTHORITY auth;
++        const char *refStr;
++    } refs[] = {
+      { { {0x00,0x00,0x33,0x44,0x55,0x66} }, "S-1-860116326-1" },
+      { { {0x00,0x00,0x01,0x02,0x03,0x04} }, "S-1-16909060-1"  },
+      { { {0x00,0x00,0x00,0x01,0x02,0x03} }, "S-1-66051-1"     },
+@@ -305,24 +295,60 @@ static void test_sid(void)
+      { { {0x00,0x00,0x00,0x00,0x00,0x02} }, "S-1-2-1"         },
+      { { {0x00,0x00,0x00,0x00,0x00,0x0c} }, "S-1-12-1"        },
+     };
+-    struct strsid_entry strsid_table[] = {
+-        {"AO", STRSID_OK},  {"RU", STRSID_OK},  {"AN", STRSID_OK},  {"AU", STRSID_OK},
+-        {"BA", STRSID_OK},  {"BG", STRSID_OK},  {"BO", STRSID_OK},  {"BU", STRSID_OK},
+-        {"CA", STRSID_OPT}, {"CG", STRSID_OK},  {"CO", STRSID_OK},  {"DA", STRSID_OPT},
+-        {"DC", STRSID_OPT}, {"DD", STRSID_OPT}, {"DG", STRSID_OPT}, {"DU", STRSID_OPT},
+-        {"EA", STRSID_OPT}, {"ED", STRSID_OK},  {"WD", STRSID_OK},  {"PA", STRSID_OPT},
+-        {"IU", STRSID_OK},  {"LA", STRSID_OK},  {"LG", STRSID_OK},  {"LS", STRSID_OK},
+-        {"SY", STRSID_OK},  {"NU", STRSID_OK},  {"NO", STRSID_OK},  {"NS", STRSID_OK},
+-        {"PO", STRSID_OK},  {"PS", STRSID_OK},  {"PU", STRSID_OK},  {"RS", STRSID_OPT},
+-        {"RD", STRSID_OK},  {"RE", STRSID_OK},  {"RC", STRSID_OK},  {"SA", STRSID_OPT},
+-        {"SO", STRSID_OK},  {"SU", STRSID_OK}};
+-
++    static const struct
++    {
++        const char *str;
++        WELL_KNOWN_SID_TYPE sid_type;
++        BOOL optional;
++    } strsid_table[] = {
++        /* Please keep the list sorted. */
++        { "AC", WinBuiltinAnyPackageSid, TRUE },
++        { "AN", WinAnonymousSid },
++        { "AO", WinBuiltinAccountOperatorsSid },
++        { "AU", WinAuthenticatedUserSid },
++        { "BA", WinBuiltinAdministratorsSid },
++        { "BG", WinBuiltinGuestsSid },
++        { "BO", WinBuiltinBackupOperatorsSid },
++        { "BU", WinBuiltinUsersSid },
++        { "CA", WinAccountCertAdminsSid, TRUE},
++        { "CG", WinCreatorGroupSid },
++        { "CO", WinCreatorOwnerSid },
++        { "DA", WinAccountDomainAdminsSid, TRUE},
++        { "DC", WinAccountComputersSid, TRUE},
++        { "DD", WinAccountControllersSid, TRUE},
++        { "DG", WinAccountDomainGuestsSid, TRUE},
++        { "DU", WinAccountDomainUsersSid, TRUE},
++        { "EA", WinAccountEnterpriseAdminsSid, TRUE},
++        { "ED", WinEnterpriseControllersSid },
++        { "IU", WinInteractiveSid },
++        { "LA", WinAccountAdministratorSid },
++        { "LG", WinAccountGuestSid },
++        { "LS", WinLocalServiceSid },
++        { "NO", WinBuiltinNetworkConfigurationOperatorsSid },
++        { "NS", WinNetworkServiceSid },
++        { "NU", WinNetworkSid },
++        { "PA", WinAccountPolicyAdminsSid, TRUE},
++        { "PO", WinBuiltinPrintOperatorsSid },
++        { "PS", WinSelfSid },
++        { "PU", WinBuiltinPowerUsersSid },
++        { "RC", WinRestrictedCodeSid },
++        { "RD", WinBuiltinRemoteDesktopUsersSid },
++        { "RE", WinBuiltinReplicatorSid },
++        { "RS", WinAccountRasAndIasServersSid, TRUE },
++        { "RU", WinBuiltinPreWindows2000CompatibleAccessSid },
++        { "SA", WinAccountSchemaAdminsSid, TRUE },
++        { "SO", WinBuiltinSystemOperatorsSid },
++        { "SU", WinServiceSid },
++        { "SY", WinLocalSystemSid },
++        { "WD", WinWorldSid },
++    };
++    SID_IDENTIFIER_AUTHORITY domain_ident = { SECURITY_NT_AUTHORITY };
+     const char noSubAuthStr[] = "S-1-5";
+     unsigned int i;
+-    PSID psid = NULL;
++    PSID psid, domain_sid;
+     SID *pisid;
+     BOOL r;
+-    LPSTR str = NULL;
++    LPSTR str;
+ 
+     if( !pConvertSidToStringSidA || !pConvertStringSidToSidA )
+     {
+@@ -402,7 +428,7 @@ static void test_sid(void)
+     }
+ 
+     /* string constant format not supported before XP */
+-    r = pConvertStringSidToSidA(strsid_table[0].str, &psid);
++    r = pConvertStringSidToSidA("AN", &psid);
+     if(!r)
+     {
+         win_skip("String constant format not supported\n");
+@@ -410,25 +436,51 @@ static void test_sid(void)
+     }
+     LocalFree(psid);
+ 
++    AllocateAndInitializeSid(&domain_ident, 4, SECURITY_NT_NON_UNIQUE, 0, 0, 0, 0, 0, 0, 0, &domain_sid);
++
+     for(i = 0; i < sizeof(strsid_table) / sizeof(strsid_table[0]); i++)
+     {
+-        char *temp;
+-
+         SetLastError(0xdeadbeef);
+         r = pConvertStringSidToSidA(strsid_table[i].str, &psid);
+ 
+-        if (!(strsid_table[i].flags & STRSID_OPT))
++        if (!(strsid_table[i].optional))
+         {
+             ok(r, "%s: got %u\n", strsid_table[i].str, GetLastError());
+         }
+ 
+         if (r)
+         {
+-            if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp)))
++            char buf[SECURITY_MAX_SID_SIZE];
++            char *sid_string, *well_known_sid_string;
++            DWORD n, size;
++
++            /* zero out domain id before comparison to simplify things */
++            if (strsid_table[i].sid_type == WinAccountAdministratorSid ||
++                strsid_table[i].sid_type == WinAccountGuestSid)
+             {
+-                trace(" %s: %s\n", strsid_table[i].str, temp);
+-                LocalFree(temp);
++                for (n = 1; n <= 3; n++)
++                    *GetSidSubAuthority(psid, n) = 0;
+             }
++
++            r = pConvertSidToStringSidA(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);
++
++            size = sizeof(buf);
++            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);
++            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);
++
++            ok(strcmp(sid_string, well_known_sid_string) == 0,
++               "%u: (%u) expected %s, got %s\n", i, strsid_table[i].sid_type, well_known_sid_string, sid_string);
++
++            LocalFree(well_known_sid_string);
++            LocalFree(sid_string);
+             LocalFree(psid);
+         }
+         else
+@@ -439,6 +491,8 @@ static void test_sid(void)
+                 trace(" %s: couldn't be converted\n", strsid_table[i].str);
+         }
+     }
++
++    LocalFree(domain_sid);
+ }
+ 
+ static void test_trustee(void)
+@@ -2288,7 +2342,7 @@ static void test_LookupAccountSid(void)
+     if (pCreateWellKnownSid && pConvertSidToStringSidA)
+     {
+         trace("Well Known SIDs:\n");
+-        for (i = 0; i <= 60; i++)
++        for (i = 0; i <= 84; i++)
+         {
+             size = SECURITY_MAX_SID_SIZE;
+             if (pCreateWellKnownSid(i, NULL, &max_sid.sid, &size))
+-- 
+2.9.0
+

patches/advapi32-WinBuiltinAnyPackageSid/definition

@@ -0,0 +1 @@
+Fixes: [41934] Assigns the AC abbreviation to WinBuiltinAnyPackageSid

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

@@ -1,4 +1,4 @@
-From 446107bd1bda89cfdb656dd1f0e06dcb328c00ed 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 23ca440..19cf953 100644
+index f104030ab25..14d2578262f 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -1,3 +1,6 @@
@@ -96,7 +96,7 @@ index 23ca440..19cf953 100644
 -@ stub BaseReleaseProcessDllPath
 -@ stub BaseReleaseProcessExePath
 +@ stub BaseDumpAppcompatCache
-+@ stub BaseFlushAppcompatCache
++@ stdcall BaseFlushAppcompatCache() kernel32.BaseFlushAppcompatCache
 +@ stub BaseFormatObjectAttributes
 +@ stub BaseFreeAppCompatDataForProcess
 +@ stub BaseGetNamedObjectDirectory
@@ -244,13 +244,13 @@ index 23ca440..19cf953 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
  @ stdcall DecodePointer(ptr) kernel32.DecodePointer
 +@ stub DecodeRemotePointer
- @ stub DecodeSystemPointer
+ @ stdcall DecodeSystemPointer(ptr) kernel32.DecodeSystemPointer
  @ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW
 +@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook
 +@ stub DelayLoadFailureHookLookup
@@ -294,7 +294,7 @@ index 23ca440..19cf953 100644
 +@ stub EmptyWorkingSet
  @ stdcall EncodePointer(ptr) kernel32.EncodePointer
 +@ stub EncodeRemotePointer
- @ stub EncodeSystemPointer
+ @ stdcall EncodeSystemPointer(ptr) kernel32.EncodeSystemPointer
 +@ stub EnterCriticalPolicySectionInternal
  @ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection
 +@ stub EnterSynchronizationBarrier
@@ -343,7 +343,7 @@ index 23ca440..19cf953 100644
 +@ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite
 +@ stub EventWriteEx
 +@ stub EventWriteString
-+@ stub EventWriteTransfer
++@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer
  @ stdcall ExitProcess(long) kernel32.ExitProcess
  @ stdcall ExitThread(long) kernel32.ExitThread
  @ stdcall ExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA
@@ -433,7 +433,7 @@ index 23ca440..19cf953 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 23ca440..19cf953 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 23ca440..19cf953 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 23ca440..19cf953 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
@@ -1379,7 +1379,7 @@ index 23ca440..19cf953 100644
  @ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount
  @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA
  @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW
- @ stub SetDefaultDllDirectories
+ @ stdcall SetDefaultDllDirectories(long) kernel32.SetDefaultDllDirectories
 +@ stub SetDynamicTimeZoneInformation
  @ stdcall SetEndOfFile(long) kernel32.SetEndOfFile
  @ stub SetEnvironmentStringsW
@@ -1715,7 +1715,7 @@ index 23ca440..19cf953 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,17 +1770,17 @@ 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 d658f30..c1a0f15 100755
+index 1e2400e4c7f..a245aefe406 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -195,6 +195,7 @@ my @dll_groups =
+@@ -249,6 +249,7 @@ my @dll_groups =
   [
    "kernel32",
    "advapi32",
 +  "shlwapi",
    "user32",
    "kernelbase",
-  ],
+   "api-ms-win-core-bem-l1-1-0",
 -- 
-2.9.0
+2.11.0
 

patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 2f51e46724cd93eedfa9024dc3f88bfdd2eb3172 Mon Sep 17 00:00:00 2001
+From 97744349e9a23aa024910d87a89bd94652db4914 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:07:09 +0100
 Subject: api-ms-win-core-quirks-l1-1-0: Add dll.
@@ -13,17 +13,17 @@ Subject: api-ms-win-core-quirks-l1-1-0: Add dll.
  create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 7374b74..1cf8036 100644
+index 84316f9..e826dd0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2729,6 +2729,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2)
+@@ -2720,6 +2720,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2)
  WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0)
 +WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0)
+ WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0)
 diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..9486e8b
@@ -46,11 +46,11 @@ index 0000000..54ce373
 +@ stub QuirkIsEnabledForPackage2
 +@ stub QuirkIsEnabledForProcess
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 572c0b8..e62c2cd 100755
+index eba8548..609f7a0 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -225,6 +225,10 @@ my @dll_groups =
-   "kernelbase",
+@@ -239,6 +239,10 @@ my @dll_groups =
+   "api-ms-win-core-bem-l1-1-0",
   ],
   [
 +  "kernelbase",
@@ -61,5 +61,5 @@ index 572c0b8..e62c2cd 100755
    "api-ms-win-downlevel-ole32-l1-1-0",
    "api-ms-win-core-com-l1-1-0",
 -- 
-2.6.4
+2.9.0