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 a373054b72f396a04ab4f191e1f6c2c9e0476aa0

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-04-21 11:59:41 +10:00
parent bff60a3afb
commit eb4096dc62
5 changed files with 21 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d510ead4493b1b0de9f1e53fa66bdb842f823929 Mon Sep 17 00:00:00 2001
From 5353d54df3ddf2f7bb62ea0214e040aa391b596f 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 33e18b8..2628b76 100644
index 33e18b8d6ab..2628b7654f4 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,10 +25,10 @@ index 33e18b8..2628b76 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 4c2e703..61af5a2 100644
index fb0858f253b..b7becc389cb 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -11371,6 +11371,31 @@ static void test_execute_data(void)
@@ -11415,6 +11415,31 @@ static void test_execute_data(void)
DestroyWindow(window);
}
@@ -57,20 +57,22 @@ index 4c2e703..61af5a2 100644
+ IDirectDraw_Release(ddraw);
+}
+
START_TEST(ddraw1)
static void test_viewport(void)
{
DDDEVICEIDENTIFIER identifier;
@@ -11473,4 +11498,5 @@ START_TEST(ddraw1)
static struct
@@ -11690,6 +11715,7 @@ START_TEST(ddraw1)
test_depth_readback();
test_clear();
test_enum_surfaces();
test_execute_data();
+ test_caps();
test_execute_data();
test_viewport();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 3bfb1b5..8db6c45 100644
index c2b438cf2ae..61857991f8f 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12633,6 +12633,31 @@ static void test_enum_surfaces(void)
@@ -12677,6 +12677,31 @@ static void test_enum_surfaces(void)
IDirectDraw2_Release(ddraw);
}
@@ -99,17 +101,18 @@ index 3bfb1b5..8db6c45 100644
+ IDirectDraw2_Release(ddraw);
+}
+
START_TEST(ddraw2)
static void test_viewport(void)
{
DDDEVICEIDENTIFIER identifier;
@@ -12743,4 +12768,5 @@ START_TEST(ddraw2)
static struct
@@ -12981,5 +13006,6 @@ START_TEST(ddraw2)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
test_viewport();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 9c4c5a3..6eebcb3 100644
index 9c4c5a3e5b2..6eebcb30311 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -14957,6 +14957,31 @@ static void test_viewport(void)
@@ -151,7 +154,7 @@ index 9c4c5a3..6eebcb3 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index b4910c1..bf1e1cf 100644
index b4910c196cd..bf1e1cf1207 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -14289,6 +14289,31 @@ static void test_viewport(void)
@@ -193,5 +196,5 @@ index b4910c1..bf1e1cf 100644
+ test_caps();
}
--
1.9.1
2.17.0