Rebase against e5ce90ed1b88bba8389aabfcb9ad0b6f837f6a14.

patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch

@@ -1,4 +1,4 @@
-From 15ae58e5e7a33fa53a1dcb66e916d747db8a09d2 Mon Sep 17 00:00:00 2001
+From fe4c1e1f10f8edc76c5dad994ed2e5202f9c2821 Mon Sep 17 00:00:00 2001
 From: Martin Storsjo <martin@martin.st>
 Date: Mon, 3 Aug 2015 22:26:01 +0300
 Subject: ucrtbase: Hook up some functions with new names to existing
@@ -7,11 +7,11 @@ Subject: ucrtbase: Hook up some functions with new names to existing
 These are some functions that on a first glance seem to have a
 matching signature even though the name has changed.
 ---
- dlls/ucrtbase/ucrtbase.spec | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ dlls/ucrtbase/ucrtbase.spec | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
-index d6516d7..a7a7718 100644
+index bb56408..cee094d 100644
 --- a/dlls/ucrtbase/ucrtbase.spec
 +++ b/dlls/ucrtbase/ucrtbase.spec
 @@ -211,7 +211,7 @@
@@ -23,15 +23,6 @@ index d6516d7..a7a7718 100644
  @ cdecl _cexit() MSVCRT__cexit
  @ cdecl _cgets(ptr)
  @ stub _cgets_s
-@@ -241,7 +241,7 @@
- @ cdecl _creat(str long) MSVCRT__creat
- @ cdecl _create_locale(long str) MSVCRT__create_locale
- @ stub _crt_at_quick_exit
--@ stub _crt_atexit
-+@ cdecl _crt_atexit(ptr) MSVCRT_atexit
- @ stub _crt_debugger_hook
- @ cdecl _ctime32(ptr) MSVCRT__ctime32
- @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s
 @@ -333,7 +333,7 @@
  @ cdecl _fputwchar(long) MSVCRT__fputwchar
  @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
@@ -50,25 +41,6 @@ index d6516d7..a7a7718 100644
  @ cdecl _mbbtombc(long)
  @ stub _mbbtombc_l
  @ cdecl _mbbtype(long long)
-@@ -1881,15 +1881,15 @@
- @ stdcall -arch=i386 _seh_longjmp_unwind(ptr)
- @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable
- @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior
--@ stub _set_app_type
-+@ cdecl _set_app_type(long) MSVCRT___set_app_type
- @ cdecl _set_controlfp(long long)
- @ cdecl _set_doserrno(long)
- @ cdecl _set_errno(long)
- @ cdecl _set_error_mode(long)
- @ cdecl _set_fmode(long) MSVCRT__set_fmode
- @ cdecl _set_invalid_parameter_handler(ptr)
--@ stub _set_new_handler
--@ stub _set_new_mode
-+@ cdecl _set_new_handler(ptr) MSVCRT_set_new_handler
-+@ cdecl _set_new_mode(long) MSVCRT__set_new_mode
- @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
- @ cdecl _set_purecall_handler(ptr)
- @ stub _set_se_translator
 -- 
 2.5.0
 

patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch

@@ -1,4 +1,4 @@
-From aced729294b868190d7c133a17e357f56e2c29d6 Mon Sep 17 00:00:00 2001
+From 03dba5677d0edab4f0a11b343f662e8bdd2a84b8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 3 Jun 2015 22:57:21 +0200
 Subject: winex11.drv: Allow changing the opengl pixel format on the desktop
@@ -16,10 +16,10 @@ it seems to be a suitable workaround as it fixes multiple applications.
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
-index cb4a6e8..7872b32 100644
+index d1a8d37..8a089a2 100644
 --- a/dlls/d3d9/tests/device.c
 +++ b/dlls/d3d9/tests/device.c
-@@ -10152,6 +10152,21 @@ static void test_resource_priority(void)
+@@ -10313,6 +10313,21 @@ static void test_swapchain_parameters(void)
      DestroyWindow(window);
  }
  
@@ -41,10 +41,10 @@ index cb4a6e8..7872b32 100644
  START_TEST(device)
  {
      WNDCLASSA wc = {0};
-@@ -10262,6 +10277,7 @@ START_TEST(device)
-     test_writeonly_resource();
+@@ -10424,6 +10439,7 @@ START_TEST(device)
      test_lost_device();
      test_resource_priority();
+     test_swapchain_parameters();
 +    test_desktop_window();
  
      UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
@@ -71,5 +71,5 @@ index 7b8ba82..72445fb 100644
      if (!fmt)
      {
 -- 
-2.4.2
+2.5.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "dcc6868057605296a7dacd89211e0673396abe45"
+	echo "e5ce90ed1b88bba8389aabfcb9ad0b6f837f6a14"
 }
 
 # Show version information

patches/wined3d-CSMT_Main/9999-IfDefined.patch

@@ -232,7 +232,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
  static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device,
          struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops)
  {
-@@ -883,8 +1006,13 @@
+@@ -876,8 +999,13 @@
      wined3d_texture_set_swapchain(swapchain->front_buffer, swapchain);
      if (!(device->wined3d->flags & WINED3D_NO3D))
      {
@@ -246,7 +246,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
      }
  
      /* MSDN says we're only allowed a single fullscreen swapchain per device,
-@@ -910,9 +1038,66 @@
+@@ -903,9 +1031,66 @@
  
      if (!(device->wined3d->flags & WINED3D_NO3D))
      {