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 06c5a9ab55751b1c66ea0847aea4d4a45d8d343c.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-02-10 16:41:25 +01:00
parent 253835e7c3
commit 2b415aff4f
14 changed files with 811 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From ff83c3ee1b422915d690411cda05db19ceacbdf1 Mon Sep 17 00:00:00 2001
From 68c5c27b4867a08482774a506095736107631d38 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 ac4393dd3b3..49356b398c1 100644
index 0d473344c2c..a077ce0aaa9 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -1451,10 +1451,22 @@ static void test_create_device(void)
@@ -1517,10 +1517,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,10 +74,10 @@ index ac4393dd3b3..49356b398c1 100644
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D11Device *)0xdeadbeef;
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index aa266a5186e..986000d0278 100644
index feb1efcb94b..19bfcb5bc3c 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -11401,6 +11401,21 @@ static void test_render_target_device_mismatch(void)
@@ -11506,6 +11506,21 @@ static void test_format_unknown(void)
DestroyWindow(window);
}
@@ -99,19 +99,19 @@ index aa266a5186e..986000d0278 100644
START_TEST(device)
{
WNDCLASSA wc = {0};
@@ -11518,6 +11533,7 @@ START_TEST(device)
test_miptree_layout();
@@ -11624,6 +11639,7 @@ START_TEST(device)
test_get_render_target_data();
test_render_target_device_mismatch();
test_format_unknown();
+ test_desktop_window();
UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
}
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index d89a19330f7..b5faac56ade 100644
index 3dab687197e..72056adb7c9 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1469,12 +1469,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
@@ -1473,12 +1473,15 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change)
TRACE("(%p,%d)\n", hdc, format);