wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against fdac39f697e049ead215b164bfe6953269ffa7be.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-09-20 18:29:20 +02:00
parent 8859da7cbd
commit 3b068197d3
10 changed files with 149 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 6ef722e8ff0af86432f13d5082369afdead6645c Mon Sep 17 00:00:00 2001
From 4094c085cdc00864407b844720170fd619ce8c8c 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
@@ -43,10 +43,10 @@ index e1d6d4c97c2..bf6a9a138dd 100644
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D10Device1 *)0xdeadbeef;
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 9ce72ca853e..f8de8d59dbb 100644
index f39e1ad43be..7bc4e982634 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -1596,10 +1596,22 @@ static void test_create_device(void)
@@ -1592,10 +1592,22 @@ static void test_create_device(void)
hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION,
&swapchain_desc, &swapchain, &device, &feature_level, &immediate_context);
todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr);
@@ -74,11 +74,11 @@ index 9ce72ca853e..f8de8d59dbb 100644
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D11Device *)0xdeadbeef;
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 50752f86ad6..27ae47d9fed 100644
index fb30636d0dd..63792e1ee05 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -11575,6 +11575,21 @@ static void test_destroyed_window(void)
ok(!refcount, "Device has %u references left.\n", refcount);
@@ -11830,6 +11830,21 @@ todo_wine
DestroyWindow(window);
}
+static void test_desktop_window(void)
@@ -99,19 +99,19 @@ index 50752f86ad6..27ae47d9fed 100644
START_TEST(device)
{
WNDCLASSA wc = {0};
@@ -11694,6 +11709,7 @@ START_TEST(device)
test_render_target_device_mismatch();
@@ -11950,6 +11965,7 @@ START_TEST(device)
test_format_unknown();
test_destroyed_window();
test_lockable_backbuffer();
+ test_desktop_window();
UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
}
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index f18e01f4dfc..1f4208adea4 100644
index 5eb70a86928..c03905d221d 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1484,12 +1484,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
@@ -1480,12 +1480,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
TRACE("(%p,%d)\n", hdc, format);
@@ -129,5 +129,5 @@ index f18e01f4dfc..1f4208adea4 100644
if (!fmt)
{
--
2.13.1
2.14.1