Release 1.8.1.

(cherry picked from commit d924f74e90)

patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch

@@ -1,15 +1,15 @@
-From 78ee3e0a09735f835303b7ddd458c8852b4774fc Mon Sep 17 00:00:00 2001
+From 7cb209e122fc503190dcad411483147ebc6d6cb4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 11 Nov 2014 03:11:33 +0100
 Subject: ntdll: Implement emulation of SIDT instruction when using Exagear.
 
 ---
  configure.ac             |   8 ++
- dlls/ntdll/signal_i386.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 231 insertions(+)
+ dlls/ntdll/signal_i386.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 232 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index c9445e7..8a5b2d8 100644
+index 92d78a2..c88a139 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp
@@ -20,7 +20,7 @@ index c9445e7..8a5b2d8 100644
  
  AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
              [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
-@@ -372,6 +373,13 @@ fi
+@@ -367,6 +368,13 @@ fi
  WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
                    [gettext tools not found (or too old), translations won't be built.])
  
@@ -35,7 +35,7 @@ index c9445e7..8a5b2d8 100644
  
  dnl Check for -li386 for NetBSD and OpenBSD
 diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
-index 7121267..6976709 100644
+index 13df4bb..edf5ea8 100644
 --- a/dlls/ntdll/signal_i386.c
 +++ b/dlls/ntdll/signal_i386.c
 @@ -96,6 +96,14 @@ typedef struct
@@ -53,10 +53,11 @@ index 7121267..6976709 100644
  /***********************************************************************
   * signal context platform-specific definitions
   */
-@@ -1898,6 +1906,213 @@ static inline DWORD get_fpu_code( const CONTEXT *context )
+@@ -1573,6 +1581,214 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+     }
  }
  
- 
++
 +#ifdef EXAGEAR_COMPAT
 +
 +/***********************************************************************
@@ -264,10 +265,10 @@ index 7121267..6976709 100644
 +#endif /* EXAGEAR_COMPAT */
 +
 +
- /**********************************************************************
-  *		raise_segv_exception
-  */
-@@ -1907,6 +2122,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
+ /***********************************************************************
+  *           check_invalid_gs
+  *
+@@ -1902,6 +2118,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
  
      switch(rec->ExceptionCode)
      {
@@ -283,5 +284,5 @@ index 7121267..6976709 100644
          if (rec->NumberParameters == 2)
          {
 -- 
-2.7.1
+2.1.3
 

patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch

@@ -1,4 +1,4 @@
-From b0a0388503a1576fb9b1b91ca764251b30f7dd3e Mon Sep 17 00:00:00 2001
+From 8794d625750d35293adecbedc32cc02257817b05 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 20 Jul 2014 22:22:14 +0200
 Subject: wined3d: allow changing strict drawing through an exported function
@@ -9,23 +9,23 @@ Subject: wined3d: allow changing strict drawing through an exported function
  2 files changed, 7 insertions(+)
 
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index bbd2fb5..2fd0c0e 100644
+index 7a77003..5519a48 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
-@@ -220,6 +220,8 @@
+@@ -219,6 +219,8 @@
  @ cdecl wined3d_stateblock_decref(ptr)
  @ cdecl wined3d_stateblock_incref(ptr)
  
 +@ cdecl wined3d_strictdrawing_set(long)
 +
- @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr)
- @ cdecl wined3d_swapchain_decref(ptr)
- @ cdecl wined3d_swapchain_get_back_buffer(ptr long)
+ @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long)
+ @ cdecl wined3d_surface_decref(ptr)
+ @ cdecl wined3d_surface_from_resource(ptr)
 diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
-index 0543d97..6a62697 100644
+index 758ba43..7ccd3a1 100644
 --- a/dlls/wined3d/wined3d_main.c
 +++ b/dlls/wined3d/wined3d_main.c
-@@ -515,6 +515,11 @@ void wined3d_unregister_window(HWND window)
+@@ -505,6 +505,11 @@ void wined3d_unregister_window(HWND window)
      wined3d_wndproc_mutex_unlock();
  }
  
@@ -38,5 +38,5 @@ index 0543d97..6a62697 100644
  BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
  {
 -- 
-2.7.1
+2.1.3
 

patches/advapi32-RegCopyTree/0001-advapi32-tests-Improve-RegDeleteTree-tests.patch

@@ -1,55 +0,0 @@
-From 33d8e5aac7dfedd9230ef340eeef57398282147c Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 15 Feb 2016 03:38:48 +0100
-Subject: advapi32/tests: Improve RegDeleteTree tests.
-
----
- dlls/advapi32/tests/registry.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index ef5d989..183e538 100644
---- a/dlls/advapi32/tests/registry.c
-+++ b/dlls/advapi32/tests/registry.c
-@@ -41,7 +41,7 @@ static const char * sTestpath2 = "%FOO%\\subdir1";
- static const DWORD ptr_size = 8 * sizeof(void*);
- 
- static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD);
--static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR);
-+static LONG (WINAPI *pRegDeleteTreeA)(HKEY,const char *);
- static DWORD (WINAPI *pRegDeleteKeyExA)(HKEY,LPCSTR,REGSAM,DWORD);
- static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL);
- static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE);
-@@ -2083,6 +2083,7 @@ static void test_reg_delete_tree(void)
- {
-     CHAR buffer[MAX_PATH];
-     HKEY subkey, subkey2;
-+    DWORD dwsize, type;
-     LONG size, ret;
- 
-     if(!pRegDeleteTreeA) {
-@@ -2128,7 +2129,9 @@ static void test_reg_delete_tree(void)
-     ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-     ret = RegCloseKey(subkey2);
-     ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
--    ret = RegSetValueA(subkey, "value", REG_SZ, "data2", 5);
-+    ret = RegSetValueA(subkey, NULL, REG_SZ, "data", 4);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegSetValueExA(subkey, "value", 0, REG_SZ, (const BYTE *)"data2", 5);
-     ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-     ret = pRegDeleteTreeA(subkey, NULL);
-     ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-@@ -2143,8 +2146,8 @@ static void test_reg_delete_tree(void)
-     ok(ret == ERROR_SUCCESS,
-         "Default value of subkey is not present\n");
-     ok(!buffer[0], "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer);
--    size = MAX_PATH;
--    ok(RegQueryValueA(subkey, "value", buffer, &size),
-+    dwsize = MAX_PATH;
-+    ok(RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize),
-         "Value is still present\n");
- 
-     ret = pRegDeleteTreeA(hkey_main, "not-here");
--- 
-2.7.1
-

patches/advapi32-RegCopyTree/0002-advapi32-tests-Add-tests-for-RegCopyTree.patch

@@ -1,142 +0,0 @@
-From b41aaf3ea73161ee1680dd3dad34544484eaf05c Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 15 Feb 2016 03:40:36 +0100
-Subject: advapi32/tests: Add tests for RegCopyTree.
-
----
- dlls/advapi32/tests/registry.c | 98 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 98 insertions(+)
-
-diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index 183e538..d29e131 100644
---- a/dlls/advapi32/tests/registry.c
-+++ b/dlls/advapi32/tests/registry.c
-@@ -41,6 +41,7 @@ static const char * sTestpath2 = "%FOO%\\subdir1";
- static const DWORD ptr_size = 8 * sizeof(void*);
- 
- static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD);
-+static LONG (WINAPI *pRegCopyTreeA)(HKEY,const char *,HKEY);
- static LONG (WINAPI *pRegDeleteTreeA)(HKEY,const char *);
- static DWORD (WINAPI *pRegDeleteKeyExA)(HKEY,LPCSTR,REGSAM,DWORD);
- static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL);
-@@ -135,6 +136,7 @@ static void InitFunctionPtrs(void)
- 
-     /* This function was introduced with Windows 2003 SP1 */
-     ADVAPI32_GET_PROC(RegGetValueA);
-+    ADVAPI32_GET_PROC(RegCopyTreeA);
-     ADVAPI32_GET_PROC(RegDeleteTreeA);
-     ADVAPI32_GET_PROC(RegDeleteKeyExA);
-     ADVAPI32_GET_PROC(RegDeleteKeyValueA);
-@@ -2079,6 +2081,101 @@ static void test_string_termination(void)
-     RegCloseKey(subkey);
- }
- 
-+static void test_reg_copy_tree(void)
-+{
-+    HKEY src, dst, subkey;
-+    CHAR buffer[MAX_PATH];
-+    DWORD dwsize, type;
-+    LONG size, ret;
-+
-+    if (!pRegCopyTreeA)
-+    {
-+        skip("Skipping RegCopyTreeA tests, function not present\n");
-+        return;
-+    }
-+
-+    ret = RegCreateKeyA(hkey_main, "src", &src);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegCreateKeyA(hkey_main, "dst", &dst);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    /* Copy nonexistent subkey */
-+    ret = pRegCopyTreeA(src, "nonexistent_subkey", dst);
-+    ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret);
-+
-+    /*  Create test keys and values */
-+    ret = RegSetValueA(src, NULL, REG_SZ, "data", 4);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegSetValueExA(src, "value", 0, REG_SZ, (const BYTE *)"data2", 5);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    ret = RegCreateKeyA(src, "subkey2", &subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegSetValueA(subkey, NULL, REG_SZ, "data3", 5);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegSetValueExA(subkey, "value", 0, REG_SZ, (const BYTE *)"data4", 5);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegCloseKey(subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    ret = RegCreateKeyA(src, "subkey3", &subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegCloseKey(subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    /* Copy subkey */
-+    ret = pRegCopyTreeA(src, "subkey2", dst);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    size = MAX_PATH;
-+    ret = RegQueryValueA(dst, NULL, buffer, &size);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ok(!strcmp(buffer, "data3"), "Expected 'data3', got '%s'\n", buffer);
-+
-+    dwsize = MAX_PATH;
-+    ret = RegQueryValueExA(dst, "value", NULL, &type, (BYTE *)buffer, &dwsize);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type);
-+    ok(!strcmp(buffer, "data4"), "Expected 'data4', got '%s'\n", buffer);
-+
-+    /* Copy full tree */
-+    ret = pRegCopyTreeA(src, NULL, dst);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    size = MAX_PATH;
-+    ret = RegQueryValueA(dst, NULL, buffer, &size);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ok(!strcmp(buffer, "data"), "Expected 'data', got '%s'\n", buffer);
-+
-+    dwsize = MAX_PATH;
-+    ret = RegQueryValueExA(dst, "value", NULL, &type, (BYTE *)buffer, &dwsize);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type);
-+    ok(!strcmp(buffer, "data2"), "Expected 'data2', got '%s'\n", buffer);
-+
-+    ret = RegOpenKeyA(dst, "subkey2", &subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    size = MAX_PATH;
-+    ret = RegQueryValueA(subkey, NULL, buffer, &size);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ok(!strcmp(buffer, "data3"), "Expected 'data3', got '%s'\n", buffer);
-+    dwsize = MAX_PATH;
-+    ret = RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type);
-+    ok(!strcmp(buffer, "data4"), "Expected 'data4', got '%s'\n", buffer);
-+    ret = RegCloseKey(subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    ret = RegOpenKeyA(dst, "subkey3", &subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegCloseKey(subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    delete_key(src);
-+    delete_key(dst);
-+}
-+
- static void test_reg_delete_tree(void)
- {
-     CHAR buffer[MAX_PATH];
-@@ -3320,6 +3417,7 @@ START_TEST(registry)
-     test_reg_save_key();
-     test_reg_load_key();
-     test_reg_unload_key();
-+    test_reg_copy_tree();
-     test_reg_delete_tree();
-     test_rw_order();
-     test_deleted_key();
--- 
-2.7.1
-

patches/advapi32-RegCopyTree/0003-advapi32-Implement-RegCopyTreeA-W.patch

@@ -1,193 +0,0 @@
-From 8303376b344d5525f7124016fef073da747c6acd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 15 Feb 2016 06:27:10 +0100
-Subject: advapi32: Implement RegCopyTreeA/W.
-
----
- dlls/advapi32/advapi32.spec                        |   4 +-
- dlls/advapi32/registry.c                           | 114 +++++++++++++++++++++
- dlls/advapi32/tests/registry.c                     |   2 +-
- .../api-ms-win-core-registry-l1-1-0.spec           |   2 +-
- .../api-ms-win-downlevel-advapi32-l1-1-0.spec      |   2 +-
- 5 files changed, 119 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
-index 36f176b..e3c7c4b 100644
---- a/dlls/advapi32/advapi32.spec
-+++ b/dlls/advapi32/advapi32.spec
-@@ -575,8 +575,8 @@
- @ stdcall RegConnectRegistryW(wstr long ptr)
- # @ stub RegConnectRegistryExA
- # @ stub RegConnectRegistryExW
--# @ stub RegCopyTreeA
--# @ stub RegCopyTreeW
-+@ stdcall RegCopyTreeA(long str long)
-+@ stdcall RegCopyTreeW(long wstr long)
- @ stdcall RegCreateKeyA(long str ptr)
- @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr)
- @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr)
-diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
-index 3508407..faca66c 100644
---- a/dlls/advapi32/registry.c
-+++ b/dlls/advapi32/registry.c
-@@ -3104,6 +3104,120 @@ LSTATUS WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey)
-     return ret;
- }
- 
-+
-+static LONG reg_get_buffers( HKEY hkey, WCHAR **name_buf, DWORD *name_size,
-+                             BYTE **value_buf, DWORD *value_size )
-+{
-+    DWORD ret, max_subkey, max_name, max_value;
-+
-+    ret = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, &max_subkey,
-+                            NULL, NULL, &max_name, &max_value, NULL, NULL );
-+    if (ret)
-+        return ret;
-+
-+    /* allocate buffer for subkeys / names */
-+    max_name = max( max_subkey, max_name ) + 1;
-+    if (max_name > *name_size)
-+    {
-+        if (!(*name_buf = heap_alloc( max_name * sizeof(WCHAR) )))
-+            return ERROR_NOT_ENOUGH_MEMORY;
-+        *name_size = max_name;
-+    }
-+
-+    /* allocate buffer for values */
-+    if (max_value > *value_size)
-+    {
-+        if (!(*value_buf = heap_alloc( max_value )))
-+            return ERROR_NOT_ENOUGH_MEMORY;
-+        *value_size = max_value;
-+    }
-+
-+    return ERROR_SUCCESS;
-+}
-+
-+
-+/******************************************************************************
-+ * RegCopyTreeW [ADVAPI32.@]
-+ *
-+ */
-+LONG WINAPI RegCopyTreeW( HKEY hsrc, const WCHAR *subkey, HKEY hdst )
-+{
-+    WCHAR buf1[MAX_PATH], *name_buf = buf1;
-+    BYTE buf2[MAX_PATH], *value_buf = buf2;
-+    DWORD name_size, max_name = sizeof(buf1) / sizeof(WCHAR);
-+    DWORD value_size, max_value = sizeof(buf2);
-+    DWORD i, type;
-+    HKEY hkey;
-+    LONG ret;
-+
-+    TRACE( "(%p, %s, %p)\n", hsrc, debugstr_w(subkey), hdst );
-+
-+    if (subkey)
-+    {
-+        ret = RegOpenKeyExW( hsrc, subkey, 0, KEY_READ, &hsrc );
-+        if (ret) return ret;
-+    }
-+
-+    /* Allocate required buffers */
-+    ret = reg_get_buffers( hsrc, &name_buf, &max_name, &value_buf, &max_value );
-+    if (ret) goto cleanup;
-+
-+    /* Copy all the values */
-+    for (i = 0;; i++)
-+    {
-+        name_size = max_name;
-+        value_size = max_value;
-+        ret = RegEnumValueW( hsrc, i, name_buf, &name_size, NULL, &type, value_buf, &value_size );
-+        if (ret == ERROR_NO_MORE_ITEMS) break;
-+        if (ret) goto cleanup;
-+        ret = RegSetValueExW( hdst, name_buf, 0, type, value_buf, value_size );
-+        if (ret) goto cleanup;
-+    }
-+
-+    /* Recursively copy all the subkeys */
-+    for (i = 0;; i++)
-+    {
-+        name_size = max_name;
-+        ret = RegEnumKeyExW( hsrc, i, name_buf, &name_size, NULL, NULL, NULL, NULL );
-+        if (ret == ERROR_NO_MORE_ITEMS) break;
-+        if (ret) goto cleanup;
-+        ret = RegCreateKeyExW( hdst, name_buf, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL );
-+        if (ret) goto cleanup;
-+        ret = RegCopyTreeW( hsrc, name_buf, hkey );
-+        RegCloseKey( hkey );
-+        if (ret) goto cleanup;
-+    }
-+
-+    ret = ERROR_SUCCESS;
-+
-+cleanup:
-+    if (name_buf != buf1)
-+        heap_free( name_buf );
-+    if (value_buf != buf2)
-+        heap_free( value_buf );
-+    if (subkey)
-+        RegCloseKey( hsrc );
-+    return ret;
-+}
-+
-+
-+/******************************************************************************
-+ * RegCopyTreeA [ADVAPI32.@]
-+ *
-+ */
-+LONG WINAPI RegCopyTreeA( HKEY hsrc, const char *subkey, HKEY hdst )
-+{
-+    UNICODE_STRING subkeyW;
-+    LONG ret;
-+
-+    if (subkey) RtlCreateUnicodeStringFromAsciiz( &subkeyW, subkey );
-+    else subkeyW.Buffer = NULL;
-+    ret = RegCopyTreeW( hsrc, subkeyW.Buffer, hdst );
-+    RtlFreeUnicodeString( &subkeyW );
-+    return ret;
-+}
-+
-+
- /******************************************************************************
-  * RegDisableReflectionKey [ADVAPI32.@]
-  *
-diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index d29e131..658b356 100644
---- a/dlls/advapi32/tests/registry.c
-+++ b/dlls/advapi32/tests/registry.c
-@@ -2090,7 +2090,7 @@ static void test_reg_copy_tree(void)
- 
-     if (!pRegCopyTreeA)
-     {
--        skip("Skipping RegCopyTreeA tests, function not present\n");
-+        win_skip("Skipping RegCopyTreeA tests, function not present\n");
-         return;
-     }
- 
-diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
-index d83fbdd..91b1a94 100644
---- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
-@@ -1,5 +1,5 @@
- @ stdcall RegCloseKey(long) advapi32.RegCloseKey
--@ stub RegCopyTreeW
-+@ stdcall RegCopyTreeW(long wstr long) advapi32.RegCopyTreeW
- @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA
- @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW
- @ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA
-diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
-index 4105e59..e1b4663 100644
---- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
-+++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
-@@ -84,7 +84,7 @@
- @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) advapi32.PrivilegedServiceAuditAlarmW
- @ stub QuerySecurityAccessMask
- @ stdcall RegCloseKey(long) advapi32.RegCloseKey
--@ stub RegCopyTreeW
-+@ stdcall RegCopyTreeW(long wstr long) advapi32.RegCopyTreeW
- @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA
- @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW
- @ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA
--- 
-2.7.1
-

patches/advapi32-RegCopyTree/0004-advapi32-Clean-up-RegDeleteTree-implementation.patch

@@ -1,217 +0,0 @@
-From f9c5910f851677d6a8e7051043d254fb1538c0c3 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 15 Feb 2016 06:40:17 +0100
-Subject: advapi32: Clean up RegDeleteTree implementation.
-
----
- dlls/advapi32/registry.c | 156 ++++++++++++++++++++++-------------------------
- 1 file changed, 74 insertions(+), 82 deletions(-)
-
-diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
-index faca66c..eb23eb1 100644
---- a/dlls/advapi32/registry.c
-+++ b/dlls/advapi32/registry.c
-@@ -3016,126 +3016,118 @@ LSTATUS WINAPI RegDisablePredefinedCache(void)
-     return ERROR_SUCCESS;
- }
- 
-+
-+static LONG reg_get_buffers( HKEY hkey, WCHAR **name_buf, DWORD *name_size,
-+                             BYTE **value_buf, DWORD *value_size )
-+{
-+    DWORD ret, max_subkey, max_name, max_value;
-+
-+    ret = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, &max_subkey,
-+                            NULL, NULL, &max_name, &max_value, NULL, NULL );
-+    if (ret)
-+        return ret;
-+
-+    /* allocate buffer for subkeys / names */
-+    max_name = max( max_subkey, max_name ) + 1;
-+    if (max_name > *name_size)
-+    {
-+        if (!(*name_buf = heap_alloc( max_name * sizeof(WCHAR) )))
-+            return ERROR_NOT_ENOUGH_MEMORY;
-+        *name_size = max_name;
-+    }
-+
-+    /* allocate buffer for values */
-+    if (value_buf && max_value > *value_size)
-+    {
-+        if (!(*value_buf = heap_alloc( max_value )))
-+            return ERROR_NOT_ENOUGH_MEMORY;
-+        *value_size = max_value;
-+    }
-+
-+    return ERROR_SUCCESS;
-+}
-+
-+
- /******************************************************************************
-  * RegDeleteTreeW [ADVAPI32.@]
-  *
-  */
--LSTATUS WINAPI RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey)
-+LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey )
- {
-+    static const WCHAR emptyW[] = {0};
-+    WCHAR buf1[MAX_PATH], *name_buf = buf1;
-+    DWORD name_size, max_name = sizeof(buf1) / sizeof(WCHAR);
-     LONG ret;
--    DWORD dwMaxSubkeyLen, dwMaxValueLen;
--    DWORD dwMaxLen, dwSize;
--    WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf;
--    HKEY hSubKey = hKey;
- 
--    TRACE("(hkey=%p,%p %s)\n", hKey, lpszSubKey, debugstr_w(lpszSubKey));
-+    TRACE( "(%p, %s)\n", hkey, debugstr_w(subkey) );
- 
--    if(lpszSubKey)
-+    if (subkey)
-     {
--        ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
-+        ret = RegOpenKeyExW( hkey, subkey, 0, KEY_READ, &hkey );
-         if (ret) return ret;
-     }
- 
--    /* Get highest length for keys, values */
--    ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL,
--            &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL);
-+    /* Allocate required buffers */
-+    ret = reg_get_buffers( hkey, &name_buf, &max_name, NULL, NULL );
-     if (ret) goto cleanup;
- 
--    dwMaxSubkeyLen++;
--    dwMaxValueLen++;
--    dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen);
--    if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR))
-+    /* Recursively delete all the subkeys */
-+    for (;;)
-     {
--        /* Name too big: alloc a buffer for it */
--        if (!(lpszName = heap_alloc( dwMaxLen*sizeof(WCHAR))))
--        {
--            ret = ERROR_NOT_ENOUGH_MEMORY;
--            goto cleanup;
--        }
-+        name_size = max_name;
-+        ret = RegEnumKeyExW( hkey, 0, name_buf, &name_size, NULL, NULL, NULL, NULL );
-+        if (ret == ERROR_NO_MORE_ITEMS) break;
-+        if (ret) goto cleanup;
-+        ret = RegDeleteTreeW( hkey, name_buf );
-+        if (ret) goto cleanup;
-     }
- 
--
--    /* Recursively delete all the subkeys */
--    while (TRUE)
-+    /* Delete the key itself */
-+    if (subkey)
-     {
--        dwSize = dwMaxLen;
--        if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL,
--                          NULL, NULL, NULL)) break;
-+        ret = RegDeleteKeyW( hkey, emptyW );
-+        goto cleanup;
-+    }
- 
--        ret = RegDeleteTreeW(hSubKey, lpszName);
-+    /* Delete the values */
-+    for (;;)
-+    {
-+        name_size = max_name;
-+        ret = RegEnumValueW( hkey, 0, name_buf, &name_size, NULL, NULL, NULL, NULL );
-+        if (ret == ERROR_NO_MORE_ITEMS) break;
-+        if (ret) goto cleanup;
-+        ret = RegDeleteValueW( hkey, name_buf );
-         if (ret) goto cleanup;
-     }
- 
--    if (lpszSubKey)
--        ret = RegDeleteKeyW(hKey, lpszSubKey);
--    else
--        while (TRUE)
--        {
--            dwSize = dwMaxLen;
--            if (RegEnumValueW(hKey, 0, lpszName, &dwSize,
--                  NULL, NULL, NULL, NULL)) break;
--
--            ret = RegDeleteValueW(hKey, lpszName);
--            if (ret) goto cleanup;
--        }
-+    ret = ERROR_SUCCESS;
- 
- cleanup:
--    /* Free buffer if allocated */
--    if (lpszName != szNameBuf)
--        heap_free( lpszName);
--    if(lpszSubKey)
--        RegCloseKey(hSubKey);
-+    if (name_buf != buf1)
-+        heap_free( name_buf );
-+    if (subkey)
-+        RegCloseKey( hkey );
-     return ret;
- }
- 
-+
- /******************************************************************************
-  * RegDeleteTreeA [ADVAPI32.@]
-  *
-  */
--LSTATUS WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey)
-+LSTATUS WINAPI RegDeleteTreeA( HKEY hkey, const char *subkey )
- {
-+    UNICODE_STRING subkeyW;
-     LONG ret;
--    UNICODE_STRING lpszSubKeyW;
- 
--    if (lpszSubKey) RtlCreateUnicodeStringFromAsciiz( &lpszSubKeyW, lpszSubKey);
--    else lpszSubKeyW.Buffer = NULL;
--    ret = RegDeleteTreeW( hKey, lpszSubKeyW.Buffer);
--    RtlFreeUnicodeString( &lpszSubKeyW );
-+    if (subkey) RtlCreateUnicodeStringFromAsciiz( &subkeyW, subkey );
-+    else subkeyW.Buffer = NULL;
-+    ret = RegDeleteTreeW( hkey, subkeyW.Buffer );
-+    RtlFreeUnicodeString( &subkeyW );
-     return ret;
- }
- 
- 
--static LONG reg_get_buffers( HKEY hkey, WCHAR **name_buf, DWORD *name_size,
--                             BYTE **value_buf, DWORD *value_size )
--{
--    DWORD ret, max_subkey, max_name, max_value;
--
--    ret = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, &max_subkey,
--                            NULL, NULL, &max_name, &max_value, NULL, NULL );
--    if (ret)
--        return ret;
--
--    /* allocate buffer for subkeys / names */
--    max_name = max( max_subkey, max_name ) + 1;
--    if (max_name > *name_size)
--    {
--        if (!(*name_buf = heap_alloc( max_name * sizeof(WCHAR) )))
--            return ERROR_NOT_ENOUGH_MEMORY;
--        *name_size = max_name;
--    }
--
--    /* allocate buffer for values */
--    if (max_value > *value_size)
--    {
--        if (!(*value_buf = heap_alloc( max_value )))
--            return ERROR_NOT_ENOUGH_MEMORY;
--        *value_size = max_value;
--    }
--
--    return ERROR_SUCCESS;
--}
--
--
- /******************************************************************************
-  * RegCopyTreeW [ADVAPI32.@]
-  *
--- 
-2.7.1
-

patches/advapi32-RegCopyTree/definition

@@ -1 +0,0 @@
-Fixes: [39690] Implement advapi32.RegCopyTree{A,W}

patches/advapi32-RegCreateKeyTransacted/0001-advapi32-Add-stubs-for-RegCreateKeyTransacted-A-W-fu.patch

@@ -0,0 +1,64 @@
+From a5cf87f611909a601fe00cbdd5235add43652c54 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 14 Nov 2015 17:29:43 +0100
+Subject: advapi32: Add stubs for RegCreateKeyTransacted[A/W] functions.
+
+---
+ dlls/advapi32/advapi32.spec |  4 ++--
+ dlls/advapi32/registry.c    | 25 +++++++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
+index ff2b0de..36f176b 100644
+--- a/dlls/advapi32/advapi32.spec
++++ b/dlls/advapi32/advapi32.spec
+@@ -581,8 +581,8 @@
+ @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr)
+ @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr)
+ @ stdcall RegCreateKeyW(long wstr ptr)
+-# @ stub RegCreateKeyTransactedA
+-# @ stub RegCreateKeyTransactedW
++@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr)
++@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr)
+ @ stdcall RegDeleteKeyA(long str)
+ @ stdcall RegDeleteKeyExA(long str long long)
+ @ stdcall RegDeleteKeyExW(long wstr long long)
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index 798f93d..6b4c873 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -473,6 +473,31 @@ LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult )
+ }
+ 
+ 
++/******************************************************************************
++ * RegCreateKeyTransactedW   [ADVAPI32.@]
++ */
++LSTATUS WINAPI RegCreateKeyTransactedW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class,
++                                        DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
++                                        PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 )
++{
++    FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_w(name), reserved,
++           debugstr_w(class), options, access, sa, retkey, dispos, transaction, reserved2 );
++    return ERROR_CALL_NOT_IMPLEMENTED;
++}
++
++
++/******************************************************************************
++ * RegCreateKeyTransactedA   [ADVAPI32.@]
++ */
++LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class,
++                                        DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
++                                        PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 )
++{
++    FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_a(name), reserved,
++           debugstr_a(class), options, access, sa, retkey, dispos, transaction, reserved2 );
++    return ERROR_CALL_NOT_IMPLEMENTED;
++}
++
+ 
+ /******************************************************************************
+  * RegOpenKeyExW   [ADVAPI32.@]
+-- 
+2.6.2
+

patches/advapi32-RegCreateKeyTransacted/definition

@@ -0,0 +1 @@
+Fixes: Add stubs for advapi32.RegCreateKeyTransacted[A/W]

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

@@ -1,65 +0,0 @@
-From 2f51e46724cd93eedfa9024dc3f88bfdd2eb3172 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.
-
----
- configure.ac                                                      | 1 +
- dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in                    | 1 +
- .../api-ms-win-core-quirks-l1-1-0.spec                            | 8 ++++++++
- tools/make_specfiles                                              | 4 ++++
- 4 files changed, 14 insertions(+)
- create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in
- 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
---- 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)
- 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-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)
-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
---- /dev/null
-+++ b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-core-quirks-l1-1-0.dll
-diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-new file mode 100644
-index 0000000..54ce373
---- /dev/null
-+++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-@@ -0,0 +1,8 @@
-+@ stub QuirkGetData
-+@ stub QuirkGetData2
-+@ stdcall QuirkIsEnabled(ptr) kernelbase.QuirkIsEnabled
-+@ stub QuirkIsEnabled2
-+@ stub QuirkIsEnabled3
-+@ stub QuirkIsEnabledForPackage
-+@ stub QuirkIsEnabledForPackage2
-+@ stub QuirkIsEnabledForProcess
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 572c0b8..e62c2cd 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -225,6 +225,10 @@ my @dll_groups =
-   "kernelbase",
-  ],
-  [
-+  "kernelbase",
-+  "api-ms-win-core-quirks-l1-1-0",
-+ ],
-+ [
-   "ole32",
-   "api-ms-win-downlevel-ole32-l1-1-0",
-   "api-ms-win-core-com-l1-1-0",
--- 
-2.6.4
-

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,61 +0,0 @@
-From d8b9e665f8ec796e7232700e0cc9df5b6b945c77 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.
-
----
- configure.ac                                                      | 1 +
- dlls/api-ms-win-core-heap-l2-1-0/Makefile.in                      | 1 +
- dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec | 7 +++++++
- tools/make_specfiles                                              | 1 +
- 4 files changed, 10 insertions(+)
- create mode 100644 dlls/api-ms-win-core-heap-l2-1-0/Makefile.in
- 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
---- a/configure.ac
-+++ b/configure.ac
-@@ -2645,6 +2645,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)
-+WINE_CONFIG_DLL(api-ms-win-core-heap-l2-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0)
-diff --git a/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in
-new file mode 100644
-index 0000000..3caed9e
---- /dev/null
-+++ b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-core-heap-l2-1-0.dll
-diff --git a/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec
-new file mode 100644
-index 0000000..81308d2
---- /dev/null
-+++ b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec
-@@ -0,0 +1,7 @@
-+@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc
-+@ stdcall GlobalFree(long) kernel32.GlobalFree
-+@ stdcall LocalAlloc(long long) kernel32.LocalAlloc
-+@ stdcall LocalFree(long) kernel32.LocalFree
-+@ stdcall LocalLock(long) kernel32.LocalLock
-+@ 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
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -185,6 +185,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-1",
-   "api-ms-win-core-kernel32-legacy-l1-1-0",
--- 
-2.6.4
-

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

@@ -1,141 +0,0 @@
-From 9f681980f083dd1243453e266cd132185aedd435 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.
-
----
- configure.ac            |  1 +
- dlls/shcore/Makefile.in |  1 +
- dlls/shcore/shcore.spec | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
- tools/make_specfiles    |  5 +++
- 4 files changed, 90 insertions(+)
- create mode 100644 dlls/shcore/Makefile.in
- create mode 100644 dlls/shcore/shcore.spec
-
-diff --git a/configure.ac b/configure.ac
-index cf39973..24ce204 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3231,6 +3231,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])
-+WINE_CONFIG_DLL(shcore)
- WINE_CONFIG_DLL(shdoclc,,[po])
- WINE_CONFIG_DLL(shdocvw,,[clean,implib])
- WINE_CONFIG_TEST(dlls/shdocvw/tests)
-diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in
-new file mode 100644
-index 0000000..dd5f08f
---- /dev/null
-+++ b/dlls/shcore/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = shcore.dll
-diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec
-new file mode 100644
-index 0000000..12a4ef3
---- /dev/null
-+++ b/dlls/shcore/shcore.spec
-@@ -0,0 +1,83 @@
-+@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW
-+@ stub CreateRandomAccessStreamOnFile
-+@ stub CreateRandomAccessStreamOverStream
-+@ stub CreateStreamOverRandomAccessStream
-+@ stdcall -private DllCanUnloadNow() shell32.DllCanUnloadNow
-+@ stub DllGetActivationFactory
-+@ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject
-+@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID
-+@ stub GetDpiForMonitor
-+@ stub GetDpiForShellUIComponent
-+@ stub GetProcessDpiAwareness
-+@ stub GetProcessReference
-+@ stub GetScaleFactorForDevice
-+@ stub GetScaleFactorForMonitor
-+@ stub IStream_Copy
-+@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read
-+@ stub IStream_ReadStr
-+@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset
-+@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size
-+@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write
-+@ stub IStream_WriteStr
-+@ stdcall IUnknown_AtomicRelease(long) shlwapi.IUnknown_AtomicRelease
-+@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite
-+@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService
-+@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set
-+@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite
-+@ stdcall IsOS(long) shlwapi.IsOS
-+@ stub RegisterScaleChangeEvent
-+@ stub RegisterScaleChangeNotifications
-+@ stub RevokeScaleChangeNotifications
-+@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi
-+@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode
-+@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA
-+@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW
-+@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream
-+@ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA
-+@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx
-+@ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW
-+@ stdcall SHCreateThread(ptr ptr long ptr) shlwapi.SHCreateThread
-+@ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef
-+@ stub SHCreateThreadWithHandle
-+@ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA
-+@ stdcall SHDeleteEmptyKeyW(long ptr) shlwapi.SHDeleteEmptyKeyW
-+@ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA
-+@ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW
-+@ stdcall SHDeleteValueA(long  str  str) shlwapi.SHDeleteValueA
-+@ stdcall SHDeleteValueW(long wstr wstr) shlwapi.SHDeleteValueW
-+@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA
-+@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW
-+@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA
-+@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW
-+@ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef
-+@ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA
-+@ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW
-+@ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A
-+@ stdcall SHOpenRegStream2W(long wstr wstr long) shlwapi.SHOpenRegStream2W
-+@ stdcall SHOpenRegStreamA(long str str long) shlwapi.SHOpenRegStreamA
-+@ stdcall SHOpenRegStreamW(long wstr wstr long) shlwapi.SHOpenRegStreamW
-+@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA
-+@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW
-+@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA
-+@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW
-+@ stdcall SHRegDuplicateHKey(long) shlwapi.SHRegDuplicateHKey
-+@ stdcall SHRegGetIntW(ptr wstr long) shlwapi.SHRegGetIntW
-+@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA
-+@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW
-+@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA
-+@ stub SHRegGetValueFromHKCUHKLM
-+@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW
-+@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA
-+@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW
-+@ stdcall SHReleaseThreadRef() shlwapi.SHReleaseThreadRef
-+@ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef
-+@ stdcall SHSetValueA(long  str  str long ptr long) shlwapi.SHSetValueA
-+@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW
-+@ stdcall SHStrDupA(str ptr) shlwapi.SHStrDupA
-+@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW
-+@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi
-+@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode
-+@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID
-+@ stub SetProcessDpiAwareness
-+@ stub SetProcessReference
-+@ stub UnregisterScaleChangeEvent
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 759fd9e..c4c4e07 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -256,6 +256,11 @@ my @dll_groups =
-   "api-ms-win-core-url-l1-1-0",
-  ],
-  [
-+  "shell32",
-+  "shlwapi",
-+  "shcore",
-+ ],
-+ [
-   "user32",
-   "api-ms-win-downlevel-user32-l1-1-0",
-   "api-ms-win-ntuser-dc-access-l1-1-0",
--- 
-2.6.4
-

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

@@ -1,60 +0,0 @@
-From aa8264fadf5a344a0af523cf8bc0c9c0e0d472f2 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.
-
----
- configure.ac                                                          | 1 +
- dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in                    | 1 +
- .../api-ms-win-shcore-obsolete-l1-1-0.spec                            | 3 +++
- tools/make_specfiles                                                  | 4 ++++
- 4 files changed, 9 insertions(+)
- create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in
- 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 24ce204..e8129b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2730,6 +2730,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)
- 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(apphelp)
- WINE_CONFIG_TEST(dlls/apphelp/tests)
- WINE_CONFIG_DLL(appwiz.cpl,,[po])
-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
---- /dev/null
-+++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-shcore-obsolete-l1-1-0.dll
-diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec
-new file mode 100644
-index 0000000..edb8143
---- /dev/null
-+++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec
-@@ -0,0 +1,3 @@
-+@ stdcall CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW
-+@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA
-+@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index c4c4e07..0c07edb 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -261,6 +261,10 @@ my @dll_groups =
-   "shcore",
-  ],
-  [
-+  "shcore",
-+  "api-ms-win-shcore-obsolete-l1-1-0",
-+ ],
-+ [
-   "user32",
-   "api-ms-win-downlevel-user32-l1-1-0",
-   "api-ms-win-ntuser-dc-access-l1-1-0",
--- 
-2.6.4
-

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

@@ -1,94 +0,0 @@
-From 26c9cf2b9b71306ebb6c19c6b0838a8ca91f3613 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
- XamlBehaviorEnabled.
-
----
- configure.ac                                       |  1 +
- dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in        |  4 +++
- .../ext-ms-win-xaml-pal-l1-1-0.spec                |  6 ++++
- dlls/ext-ms-win-xaml-pal-l1-1-0/main.c             | 35 ++++++++++++++++++++++
- 4 files changed, 46 insertions(+)
- create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
- create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
- 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
---- a/configure.ac
-+++ b/configure.ac
-@@ -2929,6 +2929,7 @@ WINE_CONFIG_DLL(evr)
- 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-xaml-pal-l1-1-0)
- WINE_CONFIG_DLL(faultrep,,[implib])
- WINE_CONFIG_TEST(dlls/faultrep/tests)
- WINE_CONFIG_DLL(fltlib)
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..6382d85
---- /dev/null
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
-@@ -0,0 +1,4 @@
-+MODULE    = ext-ms-win-xaml-pal-l1-1-0.dll
-+
-+C_SRCS = \
-+	main.c
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
-new file mode 100644
-index 0000000..c167f5e
---- /dev/null
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
-@@ -0,0 +1,6 @@
-+@ stub CreatePhoneAppBarProxy
-+@ stub CreateWinTextBoxProxy
-+@ stub GetThemeServices
-+@ stdcall XamlBehaviorEnabled(ptr)
-+@ stub XamlPalInitialize
-+@ stub XamlPalUninitialize
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-new file mode 100644
-index 0000000..3e28275
---- /dev/null
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-@@ -0,0 +1,35 @@
-+/*
-+ * ext-ms-win-xaml-pal-l1-1-0
-+ *
-+ * Copyright 2016 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+
-+#include "windef.h"
-+#include "winbase.h"
-+#include "winuser.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(xaml);
-+
-+BOOL WINAPI XamlBehaviorEnabled(void *unknown)
-+{
-+    FIXME("(%p): stub\n", unknown);
-+    return TRUE;
-+}
--- 
-2.6.4
-

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

@@ -1,91 +0,0 @@
-From 16af0df00d70307dd90c7dd836de57376b185844 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
- UserContextExtInitialize.
-
----
- configure.ac                                       |  1 +
- .../Makefile.in                                    |  4 +++
- .../ext-ms-win-appmodel-usercontext-l1-1-0.spec    |  3 ++
- dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c | 35 ++++++++++++++++++++++
- 4 files changed, 43 insertions(+)
- create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
- create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
- 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
---- a/configure.ac
-+++ b/configure.ac
-@@ -2928,6 +2928,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-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
---- /dev/null
-+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
-@@ -0,0 +1,4 @@
-+MODULE    = ext-ms-win-appmodel-usercontext-l1-1-0.dll
-+
-+C_SRCS = \
-+	main.c
-diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
-new file mode 100644
-index 0000000..7642d15
---- /dev/null
-+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
-@@ -0,0 +1,3 @@
-+@ stub UserContextExtCleanup
-+@ stdcall UserContextExtInitialize()
-+@ stub UserContextExtSetToken
-diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
-new file mode 100644
-index 0000000..7a9e75f
---- /dev/null
-+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
-@@ -0,0 +1,35 @@
-+/*
-+ * ext-ms-win-appmodel-usercontext-l1-1-0
-+ *
-+ * Copyright 2016 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+
-+#include "windef.h"
-+#include "winbase.h"
-+#include "winuser.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(usercontext);
-+
-+HRESULT WINAPI UserContextExtInitialize(void)
-+{
-+    FIXME("(): stub\n");
-+    return S_OK;
-+}
--- 
-2.6.4
-

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

@@ -1,62 +0,0 @@
-From 4ec5001da925dfb1f9506539d93c4c2297c53e16 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
-
----
- configure.ac                                                      | 1 +
- dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in                  | 1 +
- .../api-ms-win-shcore-thread-l1-1-0.spec                          | 8 ++++++++
- tools/make_specfiles                                              | 1 +
- 4 files changed, 11 insertions(+)
- create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in
- 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 363b78c..37ff44d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2801,6 +2801,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-service-management-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(apphelp)
- WINE_CONFIG_TEST(dlls/apphelp/tests)
- WINE_CONFIG_DLL(appwiz.cpl,,[po])
-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
---- /dev/null
-+++ b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-shcore-thread-l1-1-0.dll
-diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec
-new file mode 100644
-index 0000000..1533005
---- /dev/null
-+++ b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec
-@@ -0,0 +1,8 @@
-+@ stub GetProcessReference
-+@ stdcall SHCreateThread(ptr ptr long ptr) shcore.SHCreateThread
-+@ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef
-+@ stub SHCreateThreadWithHandle
-+@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef
-+@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef
-+@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef
-+@ stub SetProcessReference
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 197ff73..fc2cf66 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -262,6 +262,7 @@ my @dll_groups =
-  [
-   "shcore",
-   "api-ms-win-shcore-obsolete-l1-1-0",
-+  "api-ms-win-shcore-thread-l1-1-0",
-  ],
-  [
-   "user32",
--- 
-2.6.4
-