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 c5023aea7e97213159b754a168b7abddc89664bb

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-04-19 10:08:22 +10:00
parent 3e2b8a53bb
commit 5b388bb912
7 changed files with 13 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch
View File

@@ -1,4 +1,4 @@
From 89e0f1fded64240d2f59fd800232e9e9f8dd90d2 Mon Sep 17 00:00:00 2001
From d510ead4493b1b0de9f1e53fa66bdb842f823929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 4 Mar 2016 22:22:42 +0100
Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@@ -25,10 +25,10 @@ index 33e18b8..2628b76 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index c63ddee..b9eec25 100644
index 4c2e703..61af5a2 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -11373,6 +11373,31 @@ static void test_execute_data(void)
@@ -11371,6 +11371,31 @@ static void test_execute_data(void)
DestroyWindow(window);
}
@@ -60,17 +60,17 @@ index c63ddee..b9eec25 100644
START_TEST(ddraw1)
{
DDDEVICEIDENTIFIER identifier;
@@ -11475,4 +11500,5 @@ START_TEST(ddraw1)
@@ -11473,4 +11498,5 @@ START_TEST(ddraw1)
test_clear();
test_enum_surfaces();
test_execute_data();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 1ab1f9c..272f364 100644
index 3bfb1b5..8db6c45 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12646,6 +12646,31 @@ static void test_enum_surfaces(void)
@@ -12633,6 +12633,31 @@ static void test_enum_surfaces(void)
IDirectDraw2_Release(ddraw);
}
@@ -102,18 +102,18 @@ index 1ab1f9c..272f364 100644
START_TEST(ddraw2)
{
DDDEVICEIDENTIFIER identifier;
@@ -12756,4 +12781,5 @@ START_TEST(ddraw2)
@@ -12743,4 +12768,5 @@ START_TEST(ddraw2)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 550d73a..f3c020c 100644
index 9c4c5a3..6eebcb3 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -14751,6 +14751,31 @@ static void test_enum_surfaces(void)
IDirectDraw4_Release(ddraw);
@@ -14957,6 +14957,31 @@ static void test_viewport(void)
DestroyWindow(window);
}
+static void test_caps(void)
@@ -144,10 +144,10 @@ index 550d73a..f3c020c 100644
START_TEST(ddraw4)
{
DDDEVICEIDENTIFIER identifier;
@@ -14875,4 +14900,5 @@ START_TEST(ddraw4)
test_depth_readback();
@@ -15082,4 +15107,5 @@ START_TEST(ddraw4)
test_clear();
test_enum_surfaces();
test_viewport();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c