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 dd2624a24fba400bf59b9396e496d16c43d399d9

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-04-10 08:59:38 +10:00
parent 35999cf261
commit a596208a7f
8 changed files with 12 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 877a0c022af59c3b863edf358242829565ed7cbb Mon Sep 17 00:00:00 2001
From 89e0f1fded64240d2f59fd800232e9e9f8dd90d2 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.
@@ -12,7 +12,7 @@ Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
5 files changed, 106 insertions(+)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 33e18b8d6a..2628b7654f 100644
index 33e18b8..2628b76 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1542,6 +1542,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -25,11 +25,11 @@ index 33e18b8d6a..2628b7654f 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 626b07bace..a7e5bcd6e7 100644
index c63ddee..b9eec25 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -11247,6 +11247,31 @@ static void test_enum_surfaces(void)
IDirectDraw_Release(ddraw);
@@ -11373,6 +11373,31 @@ static void test_execute_data(void)
DestroyWindow(window);
}
+static void test_caps(void)
@@ -60,14 +60,14 @@ index 626b07bace..a7e5bcd6e7 100644
START_TEST(ddraw1)
{
DDDEVICEIDENTIFIER identifier;
@@ -11348,4 +11373,5 @@ START_TEST(ddraw1)
test_depth_readback();
@@ -11475,4 +11500,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 1ab1f9c591..272f364b7f 100644
index 1ab1f9c..272f364 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12646,6 +12646,31 @@ static void test_enum_surfaces(void)
@@ -109,7 +109,7 @@ index 1ab1f9c591..272f364b7f 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 550d73a1bd..f3c020c89c 100644
index 550d73a..f3c020c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -14751,6 +14751,31 @@ static void test_enum_surfaces(void)
@@ -151,7 +151,7 @@ index 550d73a1bd..f3c020c89c 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index b4910c196c..bf1e1cf120 100644
index b4910c1..bf1e1cf 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -14289,6 +14289,31 @@ static void test_viewport(void)
@@ -193,5 +193,5 @@ index b4910c196c..bf1e1cf120 100644
+ test_caps();
}
--
2.16.2
1.9.1