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 2d9e894d285937716a4541c7fab9152fdf0b495f.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-08-03 13:41:34 +02:00
parent 5f7efc6b30
commit e28edf1951
5 changed files with 41 additions and 56 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 68c5c27b4867a08482774a506095736107631d38 Mon Sep 17 00:00:00 2001
From 6ef722e8ff0af86432f13d5082369afdead6645c 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 0d473344c2c..a077ce0aaa9 100644
index 9ce72ca853e..f8de8d59dbb 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -1517,10 +1517,22 @@ static void test_create_device(void)
@@ -1596,10 +1596,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 0d473344c2c..a077ce0aaa9 100644
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D11Device *)0xdeadbeef;
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index feb1efcb94b..19bfcb5bc3c 100644
index 50752f86ad6..27ae47d9fed 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -11506,6 +11506,21 @@ static void test_format_unknown(void)
DestroyWindow(window);
@@ -11575,6 +11575,21 @@ static void test_destroyed_window(void)
ok(!refcount, "Device has %u references left.\n", refcount);
}
+static void test_desktop_window(void)
@@ -99,19 +99,19 @@ index feb1efcb94b..19bfcb5bc3c 100644
START_TEST(device)
{
WNDCLASSA wc = {0};
@@ -11624,6 +11639,7 @@ START_TEST(device)
test_get_render_target_data();
@@ -11694,6 +11709,7 @@ START_TEST(device)
test_render_target_device_mismatch();
test_format_unknown();
test_destroyed_window();
+ test_desktop_window();
UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
}
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 3dab687197e..72056adb7c9 100644
index f18e01f4dfc..1f4208adea4 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1473,12 +1473,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
@@ -1484,12 +1484,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
TRACE("(%p,%d)\n", hdc, format);
@@ -129,5 +129,5 @@ index 3dab687197e..72056adb7c9 100644
if (!fmt)
{
--
2.11.0
2.13.1