Rebase against e5ce90ed1b88bba8389aabfcb9ad0b6f837f6a14.

This commit is contained in:
Sebastian Lackner
2015-08-27 18:04:25 +02:00
parent a81dee672e
commit 33e1ccc03c
4 changed files with 13 additions and 41 deletions

View File

@@ -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