Release 1.9.21.

[api-ms-win-Stub_DLLs]
Removed some stub dlls (accepted upstream).

[wmic-Query_Path]
Removed patch to improve cmd line parser and add support for path command
(accepted upstream).

patches/Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch

@@ -0,0 +1,39 @@
+From 0cd3973a47317aff488c63eeb33ddedb2cba2b50 Mon Sep 17 00:00:00 2001
+From: Hans Leidekker <hans@codeweavers.com>
+Date: Sat, 15 Oct 2016 17:27:41 +0200
+Subject: include: Avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR.
+
+---
+ include/evntrace.h | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/include/evntrace.h b/include/evntrace.h
+index b54cd11..bb1ce03 100644
+--- a/include/evntrace.h
++++ b/include/evntrace.h
+@@ -248,16 +248,14 @@ typedef struct _EVENT_TRACE_PROPERTIES
+     ULONG LoggerNameOffset;
+ } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES;
+ 
+-typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR;
+-
+ typedef struct _ENABLE_TRACE_PARAMETERS
+ {
+-    ULONG                    Version;
+-    ULONG                    EnableProperty;
+-    ULONG                    ControlFlags;
+-    GUID                     SourceId;
+-    PEVENT_FILTER_DESCRIPTOR EnableFilterDesc;
+-    ULONG                    FilterDescCount;
++    ULONG                            Version;
++    ULONG                            EnableProperty;
++    ULONG                            ControlFlags;
++    GUID                             SourceId;
++    struct _EVENT_FILTER_DESCRIPTOR *EnableFilterDesc;
++    ULONG                            FilterDescCount;
+ } ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS;
+ 
+ #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0)
+-- 
+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/advapi32-GetExplicitEntriesFromAclW/0001-advapi32-Implement-GetExplicitEntriesFromAclW.patch

@@ -0,0 +1,277 @@
+From cb383abcb7d36d739092a93c1f276895622b6806 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 92a1789..c60aa4e 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 cf104ab..2bcb108 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 );
+ }
+@@ -6378,6 +6380,145 @@ static void test_pseudo_tokens(void)
+                  "Expected ERROR_NO_TOKEN, got %u\n", GetLastError());
+ }
+ 
++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();
+@@ -6424,4 +6565,5 @@ START_TEST(security)
+     test_system_security_access();
+     test_GetSidIdentifierAuthority();
+     test_pseudo_tokens();
++    test_GetExplicitEntriesFromAclW();
+ }
+-- 
+2.9.0
+

patches/advapi32-GetExplicitEntriesFromAclW/definition

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

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 8467721c604c1ed81f31b6675b143e98321b368b 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.
@@ -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 f104030..8e62b4a 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -1,3 +1,6 @@
@@ -250,7 +250,7 @@ index 23ca440..19cf953 100644
  @ 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
@@ -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
@@ -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 f3b5c5e..8a7e514 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -195,6 +195,7 @@ my @dll_groups =
+@@ -230,6 +230,7 @@ my @dll_groups =
   [
    "kernel32",
    "advapi32",
 +  "shlwapi",
    "user32",
    "kernelbase",
-  ],
+   "api-ms-win-core-bem-l1-1-0",
 -- 
 2.9.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 88298227180510b5eee8b129ae964f14bf565d64 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 e97cd17..6d51b3f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2729,6 +2729,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1)
+@@ -2717,6 +2717,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1)
  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-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 8a7e514..3316f76 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -225,6 +225,10 @@ my @dll_groups =
-   "kernelbase",
+@@ -236,6 +236,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
 

patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch

@@ -1,90 +0,0 @@
-From fa095669c3bad1091523c6133c6a12541555dfbd 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:37:26 +0100
-Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll.
-
----
- configure.ac                                       |  1 +
- .../api-ms-win-appmodel-runtime-l1-1-1/Makefile.in |  1 +
- .../api-ms-win-appmodel-runtime-l1-1-1.spec        | 36 ++++++++++++++++++++++
- tools/make_specfiles                               |  1 +
- 4 files changed, 39 insertions(+)
- create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
- create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
-
-diff --git a/configure.ac b/configure.ac
-index 1ebf17a..2d2108b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2623,6 +2623,7 @@ WINE_CONFIG_DLL(advpack,,[implib])
- WINE_CONFIG_TEST(dlls/advpack/tests)
- WINE_CONFIG_DLL(amstream,,[clean])
- WINE_CONFIG_TEST(dlls/amstream/tests)
-+WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0)
-diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
-new file mode 100644
-index 0000000..289d96f
---- /dev/null
-+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-appmodel-runtime-l1-1-1.dll
-diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
-new file mode 100644
-index 0000000..2e5fbf1
---- /dev/null
-+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
-@@ -0,0 +1,36 @@
-+@ stub ClosePackageInfo
-+@ stub FindPackagesByPackageFamily
-+@ stub FormatApplicationUserModelId
-+@ stub GetApplicationUserModelId
-+@ stub GetApplicationUserModelIdFromToken
-+@ stub GetCurrentApplicationUserModelId
-+@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
-+@ stub GetCurrentPackageFullName
-+@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
-+@ stub GetCurrentPackageInfo
-+@ stub GetCurrentPackagePath
-+@ stub GetPackageApplicationIds
-+@ stub GetPackageFamilyName
-+@ stub GetPackageFamilyNameFromToken
-+@ stub GetPackageFullName
-+@ stub GetPackageFullNameFromToken
-+@ stub GetPackageId
-+@ stub GetPackageInfo
-+@ stub GetPackagePath
-+@ stub GetPackagePathByFullName
-+@ stub GetPackagesByPackageFamily
-+@ stub GetStagedPackageOrigin
-+@ stub GetStagedPackagePathByFullName
-+@ stub OpenPackageInfoByFullName
-+@ stub OpenPackageInfoByFullNameForUser
-+@ stub PackageFamilyNameFromFullName
-+@ stub PackageFamilyNameFromId
-+@ stub PackageFullNameFromId
-+@ stub PackageIdFromFullName
-+@ stub PackageNameAndPublisherIdFromFamilyName
-+@ stub ParseApplicationUserModelId
-+@ stub VerifyApplicationUserModelId
-+@ stub VerifyPackageFamilyName
-+@ stub VerifyPackageFullName
-+@ stub VerifyPackageId
-+@ stub VerifyPackageRelativeApplicationId
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 05010cc..d2158d8 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -161,6 +161,7 @@ my @dll_groups =
-  ],
-  [
-   "kernel32",
-+  "api-ms-win-appmodel-runtime-l1-1-1",
-   "api-ms-win-downlevel-normaliz-l1-1-0",
-   "api-ms-win-core-processthreads-l1-1-0",
-   "api-ms-win-core-debug-l1-1-0",
--- 
-2.6.4
-

patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch

@@ -1,55 +0,0 @@
-From 60ecb8d166d2b940052160dcb250cc458ba2f728 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:45:05 +0100
-Subject: api-ms-win-core-apiquery-l1-1-0: Add dll.
-
----
- configure.ac                                                             | 1 +
- dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in                         | 1 +
- .../api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec | 1 +
- tools/make_specfiles                                                     | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in
- create mode 100644 dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
-
-diff --git a/configure.ac b/configure.ac
-index 6ab0640..ce22c64 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2626,6 +2626,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests)
- WINE_CONFIG_DLL(amstream,,[clean])
- WINE_CONFIG_TEST(dlls/amstream/tests)
- WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1)
-+WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0)
-diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..492a265
---- /dev/null
-+++ b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-core-apiquery-l1-1-0.dll
-diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
-new file mode 100644
-index 0000000..1d99dd7
---- /dev/null
-+++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
-@@ -0,0 +1 @@
-+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 13a5674..cd0d761 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -264,6 +264,7 @@ my @dll_groups =
-   "msvcrt",
-   "ntdll",
-   "ntoskrnl.exe",
-+  "api-ms-win-core-apiquery-l1-1-0",
-   "api-ms-win-core-rtlsupport-l1-1-0",
-   "api-ms-win-core-rtlsupport-l1-2-0",
-  ],
--- 
-2.6.4
-

patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From d8b9e665f8ec796e7232700e0cc9df5b6b945c77 Mon Sep 17 00:00:00 2001
+From 55213631f626468dae79789336fb421aed983dc5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 16 Jan 2016 20:03:48 +0100
 Subject: api-ms-win-core-heap-l2-1-0: Add dll.
@@ -13,10 +13,10 @@ Subject: api-ms-win-core-heap-l2-1-0: Add dll.
  create mode 100644 dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 36d95c9..4fe0992 100644
+index 6b777c0..35e0636 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2645,6 +2645,7 @@ WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1)
+@@ -2676,6 +2676,7 @@ WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1)
  WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-heap-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0)
@@ -45,17 +45,17 @@ index 0000000..81308d2
 +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc
 +@ stdcall LocalUnlock(long) kernel32.LocalUnlock
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 03e753f..d945fbe 100755
+index 0bae7d4..cd4269e 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -185,6 +185,7 @@ my @dll_groups =
+@@ -169,6 +169,7 @@ my @dll_groups =
    "api-ms-win-core-handle-l1-1-0",
    "api-ms-win-core-heap-l1-1-0",
    "api-ms-win-core-heap-l1-2-0",
 +  "api-ms-win-core-heap-l2-1-0",
    "api-ms-win-core-heap-obsolete-l1-1-0",
+   "api-ms-win-core-io-l1-1-0",
    "api-ms-win-core-io-l1-1-1",
-   "api-ms-win-core-kernel32-legacy-l1-1-0",
 -- 
-2.6.4
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch

@@ -1,4 +1,4 @@
-From e7dfb60036cd8a437bbe586507ea7f895c0da0e0 Mon Sep 17 00:00:00 2001
+From 8f6353a291eaa4d1b61d2063c93a294b7deef7a7 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 17 Jan 2016 20:17:46 +0100
 Subject: shcore: Add dll.
@@ -13,10 +13,10 @@ Subject: shcore: Add dll.
  create mode 100644 dlls/shcore/shcore.spec
 
 diff --git a/configure.ac b/configure.ac
-index 7daf5a8..d5f8e7d 100644
+index 04015a1..557f26b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3238,6 +3238,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests)
+@@ -3289,6 +3289,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests)
  WINE_CONFIG_DLL(setupx.dll16,enable_win16)
  WINE_CONFIG_DLL(sfc,,[implib])
  WINE_CONFIG_DLL(sfc_os,,[implib])
@@ -121,10 +121,10 @@ index 0000000..12a4ef3
 +@ stub SetProcessReference
 +@ stub UnregisterScaleChangeEvent
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index ce6dc2f..cf8bc20 100755
+index 2c64243..611aaca 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -261,6 +261,11 @@ my @dll_groups =
+@@ -238,6 +238,11 @@ my @dll_groups =
    "api-ms-win-core-url-l1-1-0",
   ],
   [
@@ -134,8 +134,8 @@ index ce6dc2f..cf8bc20 100755
 + ],
 + [
    "user32",
+   "api-ms-win-core-stringansi-l1-1-0",
    "api-ms-win-core-string-l2-1-0",
-   "api-ms-win-downlevel-user32-l1-1-0",
 -- 
-2.7.1
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 9a4670c39fd3973522c8c5f7bb9252129aab0967 Mon Sep 17 00:00:00 2001
+From 49eb261c42d89a4c755914a40af797eb0b04d816 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:02:41 +0100
 Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll.
@@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll.
  create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index d5f8e7d..ec0afd4 100644
+index e8b9c2a..736c744 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2735,6 +2735,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0)
+@@ -2801,6 +2801,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0)
+ WINE_CONFIG_DLL(api-ms-win-service-private-l1-1-1)
+ WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0)
 +WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0)
  WINE_CONFIG_DLL(apphelp)
- WINE_CONFIG_TEST(dlls/apphelp/tests)
- WINE_CONFIG_DLL(appwiz.cpl,,[clean])
 diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..6588d13
@@ -41,10 +41,10 @@ index 0000000..edb8143
 +@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA
 +@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index cf8bc20..b5aa9d6 100755
+index 6fb6376..c19993d 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -266,6 +266,10 @@ my @dll_groups =
+@@ -270,6 +270,10 @@ my @dll_groups =
    "shcore",
   ],
   [
@@ -53,8 +53,8 @@ index cf8bc20..b5aa9d6 100755
 + ],
 + [
    "user32",
+   "api-ms-win-core-stringansi-l1-1-0",
    "api-ms-win-core-string-l2-1-0",
-   "api-ms-win-downlevel-user32-l1-1-0",
 -- 
-2.7.1
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch

@@ -1,4 +1,4 @@
-From 26c9cf2b9b71306ebb6c19c6b0838a8ca91f3613 Mon Sep 17 00:00:00 2001
+From faddf206cfe8bb34fb7f56c881723229b0d3e8e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:07:35 +0100
 Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
@@ -15,13 +15,13 @@ Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 1ac07ff..049de86 100644
+index 999a457..d099029 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2929,6 +2929,7 @@ WINE_CONFIG_DLL(evr)
- WINE_CONFIG_DLL(explorerframe,,[clean])
+@@ -3008,6 +3008,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
  WINE_CONFIG_TEST(dlls/explorerframe/tests)
  WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
  WINE_CONFIG_DLL(faultrep,,[implib])
  WINE_CONFIG_TEST(dlls/faultrep/tests)
@@ -90,5 +90,5 @@ index 0000000..3e28275
 +    return TRUE;
 +}
 -- 
-2.6.4
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch

@@ -1,4 +1,4 @@
-From 16af0df00d70307dd90c7dd836de57376b185844 Mon Sep 17 00:00:00 2001
+From 84ff59cbefcd2a4c5c5625a99fdbf06ebee7bba6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:12:45 +0100
 Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
@@ -15,17 +15,17 @@ Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
  create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 049de86..36924eb 100644
+index d099029..e2d7b8e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2928,6 +2928,7 @@ WINE_CONFIG_DLL(esent)
+@@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(esent)
  WINE_CONFIG_DLL(evr)
  WINE_CONFIG_DLL(explorerframe,,[clean])
  WINE_CONFIG_TEST(dlls/explorerframe/tests)
 +WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
- WINE_CONFIG_DLL(faultrep,,[implib])
 diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..16eee75
@@ -87,5 +87,5 @@ index 0000000..7a9e75f
 +    return S_OK;
 +}
 -- 
-2.6.4
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 7100e12fb3dcc986f210cf0a41e462fbcc122906 Mon Sep 17 00:00:00 2001
+From c0c54145e9b77cabfe520050f1a383659abd679f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 19 Jan 2016 16:19:11 +0100
 Subject: api-ms-win-shcore-thread-l1-1-0: Add dll
@@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-thread-l1-1-0: Add dll
  create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 442335d..d2bac7d 100644
+index 3847ab8..876b232 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2751,6 +2751,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0)
+@@ -2797,6 +2797,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0)
+ WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0)
  WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0)
 +WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0)
  WINE_CONFIG_DLL(apphelp)
- WINE_CONFIG_TEST(dlls/apphelp/tests)
- WINE_CONFIG_DLL(appwiz.cpl,,[clean])
 diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..0a20ccf
@@ -46,10 +46,10 @@ index 0000000..1533005
 +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef
 +@ stub SetProcessReference
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index f7d7ede..c7761b9 100755
+index e16a378..3fd4f36 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -266,6 +266,7 @@ my @dll_groups =
+@@ -268,6 +268,7 @@ my @dll_groups =
   [
    "shcore",
    "api-ms-win-shcore-obsolete-l1-1-0",
@@ -58,5 +58,5 @@ index f7d7ede..c7761b9 100755
   [
    "user32",
 -- 
-2.7.1
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From ffe4994aea8261274e79e142c0ba37df87ffdebb Mon Sep 17 00:00:00 2001
+From 116f061509b35ca571b5a7b19477d82c94437502 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 21 Jan 2016 00:52:33 +0100
 Subject: api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.
@@ -13,17 +13,17 @@ Subject: api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.
  create mode 100644 dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index dd3074a..2ba3014 100644
+index b7361d1..1ceda28 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2680,6 +2680,7 @@ WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0)
+@@ -2716,6 +2716,7 @@ 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-shlwapi-legacy-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0)
 +WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0)
+ WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0)
 diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in
 new file mode 100644
 index 0000000..3f39b0b
@@ -97,17 +97,17 @@ index 0000000..8b8b520
 +@ stdcall StrTrimA(str str) shlwapi.StrTrimA
 +@ stdcall StrTrimW(wstr wstr) shlwapi.StrTrimW
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 4a08e9c..3777632 100755
+index 8b202da..0f58756 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -258,6 +258,7 @@ my @dll_groups =
-   "api-ms-win-downlevel-shlwapi-l1-1-0",
-   "api-ms-win-downlevel-shlwapi-l2-1-0",
+@@ -235,6 +235,7 @@ my @dll_groups =
+   "api-ms-win-core-registryuserspecific-l1-1-0",
    "api-ms-win-core-shlwapi-legacy-l1-1-0",
+   "api-ms-win-core-shlwapi-obsolete-l1-1-0",
 +  "api-ms-win-core-shlwapi-obsolete-l1-2-0",
    "api-ms-win-core-url-l1-1-0",
   ],
   [
 -- 
-2.7.1
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 3c6d2e90631603492ca4aab85db1369f6b8377ac Mon Sep 17 00:00:00 2001
+From dece0c4c7519885d8e6da604de5735f1ebed7769 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 20:56:53 +0100
 Subject: api-ms-win-shcore-stream-l1-1-0: Add dll
@@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-stream-l1-1-0: Add dll
  create mode 100644 dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 0aeb5dd..ecd03c7 100644
+index d88aa46..f5d8f62 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2734,6 +2734,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0)
+@@ -2798,6 +2798,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0)
+ WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0)
  WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0)
 +WINE_CONFIG_DLL(api-ms-win-shcore-stream-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0)
- WINE_CONFIG_DLL(apphelp)
- WINE_CONFIG_TEST(dlls/apphelp/tests)
+ WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0)
 diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..df2caad
@@ -53,10 +53,10 @@ index 0000000..1ee9dd3
 +@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA
 +@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 46284d5..289b980 100755
+index 6a08495..dc429d7 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -268,6 +268,7 @@ my @dll_groups =
+@@ -270,6 +270,7 @@ my @dll_groups =
    "shcore",
    "api-ms-win-shcore-obsolete-l1-1-0",
    "api-ms-win-shcore-thread-l1-1-0",
@@ -65,5 +65,5 @@ index 46284d5..289b980 100755
   [
    "user32",
 -- 
-2.6.4
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 75862379c05979ced69231fc1d69a6d7a750dfcb Mon Sep 17 00:00:00 2001
+From 275174ba45b57fa9f65d2199700cab3a5cfea397 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:00:39 +0100
 Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
@@ -13,13 +13,13 @@ Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
  create mode 100644 dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index c46edf6..ff6de50 100644
+index 4afa294..b4572d3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2940,6 +2940,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
- WINE_CONFIG_TEST(dlls/explorerframe/tests)
+@@ -3012,6 +3012,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
  WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
  WINE_CONFIG_DLL(faultrep,,[implib])
@@ -43,10 +43,10 @@ index 0000000..22128a2
 +@ stdcall SetCapture(long) user32.SetCapture
 +@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 1b2c0bf..6e39ccc 100755
+index 542e207..4b53feb 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -277,6 +277,7 @@ my @dll_groups =
+@@ -283,6 +283,7 @@ my @dll_groups =
    "api-ms-win-core-string-l2-1-0",
    "api-ms-win-downlevel-user32-l1-1-0",
    "api-ms-win-ntuser-dc-access-l1-1-0",
@@ -55,5 +55,5 @@ index 1b2c0bf..6e39ccc 100755
   [
    "version",
 -- 
-2.7.1
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 1ee5402d4001e228e936b40ab7e3043c4e31c8b9 Mon Sep 17 00:00:00 2001
+From 4af99f6f4d4e56d5cc7adfa52263b71232807f2a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:02:52 +0100
 Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
@@ -13,12 +13,12 @@ Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
  create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 566b8f1..308f04e 100644
+index b4572d3..20d799a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2938,6 +2938,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
- WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
+@@ -3013,6 +3013,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
@@ -62,10 +62,10 @@ index 0000000..0a96983
 +@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
 +@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index f9aea98..52d6583 100755
+index 4b53feb..e7d6c74 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -300,6 +300,10 @@ my @dll_groups =
+@@ -312,6 +312,10 @@ my @dll_groups =
    "api-ms-win-core-winrt-string-l1-1-0",
   ],
   [
@@ -77,5 +77,5 @@ index f9aea98..52d6583 100755
    "irprops.cpl",
   ],
 -- 
-2.7.1
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 7e4ebcb33dad0af77407a89d2691a1c0c9690688 Mon Sep 17 00:00:00 2001
+From 11664cbe8489c457a4b286253155ba6837269953 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:05:14 +0100
 Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll
@@ -13,17 +13,17 @@ Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll
  create mode 100644 dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 402b642..1c707b3 100644
+index 6685769..356dd05 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2728,6 +2728,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0)
+@@ -2782,6 +2782,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
 +WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1)
  WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0)
- WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0)
 diff --git a/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..9641c2a
@@ -119,10 +119,10 @@ index 0000000..b7575c6
 +@ stdcall WaitMessage() user32.WaitMessage
 +@ stdcall WindowFromPoint(int64) user32.WindowFromPoint
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 4a782ba..090640b 100755
+index 1b1e722..56c813a 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -277,6 +277,7 @@ my @dll_groups =
+@@ -269,6 +269,7 @@ my @dll_groups =
    "api-ms-win-core-string-l2-1-0",
    "api-ms-win-downlevel-user32-l1-1-0",
    "api-ms-win-ntuser-dc-access-l1-1-0",
@@ -131,5 +131,5 @@ index 4a782ba..090640b 100755
   ],
   [
 -- 
-2.7.1
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 53a6d2753fe70e58d14e366c88dac1c8e65ea6aa Mon Sep 17 00:00:00 2001
+From b2c7de654c69a9d0aedb4c1d40cd4218df1869bb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:06:59 +0100
 Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
@@ -13,12 +13,12 @@ Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
  create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 9ee4464..f38d37a 100644
+index 9a621f7..99cf576 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2939,6 +2939,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
- WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
+@@ -3014,6 +3014,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
@@ -40,10 +40,10 @@ index 0000000..626c778
 +@ stdcall GetSysColor(long) user32.GetSysColor
 +@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index c88a32c..a602e5d 100755
+index 276e3b3..976dcb4 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -276,6 +276,7 @@ my @dll_groups =
+@@ -285,6 +285,7 @@ my @dll_groups =
    "api-ms-win-ntuser-dc-access-l1-1-0",
    "api-ms-win-rtcore-ntuser-window-l1-1-0",
    "ext-ms-win-ntuser-mouse-l1-1-0",
@@ -52,5 +52,5 @@ index c88a32c..a602e5d 100755
   [
    "version",
 -- 
-2.6.4
+2.9.0