Rebase against e395d4e766ef60030ee05947ffc9fac0c3fbe84b.

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

@@ -1,4 +1,4 @@
-From 03dba5677d0edab4f0a11b343f662e8bdd2a84b8 Mon Sep 17 00:00:00 2001
+From a408faad22694f7dd6b9e24b3f47ac60fc6f4c4f 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,11 +16,11 @@ 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 d1a8d37..8a089a2 100644
+index 5bf7121..0c2df95 100644
 --- a/dlls/d3d9/tests/device.c
 +++ b/dlls/d3d9/tests/device.c
-@@ -10313,6 +10313,21 @@ static void test_swapchain_parameters(void)
-     DestroyWindow(window);
+@@ -10769,6 +10769,21 @@ static void test_check_device_format(void)
+     IDirect3D9_Release(d3d);
  }
  
 +static void test_desktop_window(void)
@@ -41,19 +41,19 @@ index d1a8d37..8a089a2 100644
  START_TEST(device)
  {
      WNDCLASSA wc = {0};
-@@ -10424,6 +10439,7 @@ START_TEST(device)
-     test_lost_device();
+@@ -10883,6 +10898,7 @@ START_TEST(device)
      test_resource_priority();
      test_swapchain_parameters();
+     test_check_device_format();
 +    test_desktop_window();
  
      UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
  }
 diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
-index 7b8ba82..72445fb 100644
+index 3d0bd24..845b022 100644
 --- a/dlls/winex11.drv/opengl.c
 +++ b/dlls/winex11.drv/opengl.c
-@@ -1436,12 +1436,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
+@@ -1434,12 +1434,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
  
      TRACE("(%p,%d)\n", hdc, format);
  
@@ -71,5 +71,5 @@ index 7b8ba82..72445fb 100644
      if (!fmt)
      {
 -- 
-2.5.0
+2.7.0