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 ba9f3dc198dfc81bb40159077b73b797006bb73c

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-08-15 08:07:39 +10:00
parent 39cafb1db1
commit e7bff1bb4f
102 changed files with 208 additions and 10382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 07d42b7a75491947866e6edb9d7746ca35274238 Mon Sep 17 00:00:00 2001
From 25c2a52b1109022a01b8f59a22b8a04566af0d3c 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 ed90478..47f079f 100644
index ed904785dd..47f079fb97 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 ed90478..47f079f 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index c767d3a..70d4b8f 100644
index d4fe1f294a..29d9d3afb7 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -11411,6 +11411,31 @@ static void test_execute_data(void)
@@ -11538,6 +11538,31 @@ static void test_execute_data(void)
DestroyWindow(window);
}
@@ -60,7 +60,7 @@ index c767d3a..70d4b8f 100644
static void test_viewport(void)
{
static struct
@@ -11686,6 +11711,7 @@ START_TEST(ddraw1)
@@ -11815,6 +11840,7 @@ START_TEST(ddraw1)
test_depth_readback();
test_clear();
test_enum_surfaces();
@@ -69,10 +69,10 @@ index c767d3a..70d4b8f 100644
test_viewport();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 794f90b..9c6055e 100644
index 941d46bf42..752b39568d 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12673,6 +12673,31 @@ static void test_enum_surfaces(void)
@@ -12800,6 +12800,31 @@ static void test_enum_surfaces(void)
IDirectDraw2_Release(ddraw);
}
@@ -104,7 +104,7 @@ index 794f90b..9c6055e 100644
static void test_viewport(void)
{
static struct
@@ -12977,5 +13002,6 @@ START_TEST(ddraw2)
@@ -13106,5 +13131,6 @@ START_TEST(ddraw2)
test_depth_readback();
test_clear();
test_enum_surfaces();
@@ -112,10 +112,10 @@ index 794f90b..9c6055e 100644
test_viewport();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 172d99d..c036a6d 100644
index e81472d4f2..4e083ec503 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -14953,6 +14953,31 @@ static void test_viewport(void)
@@ -15089,6 +15089,31 @@ static void test_viewport(void)
DestroyWindow(window);
}
@@ -147,17 +147,17 @@ index 172d99d..c036a6d 100644
START_TEST(ddraw4)
{
DDDEVICEIDENTIFIER identifier;
@@ -15078,4 +15103,5 @@ START_TEST(ddraw4)
@@ -15215,4 +15240,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
index 7cbf408..095212b 100644
index 70318a8492..f3dde436d3 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -14417,6 +14417,31 @@ static void test_color_vertex(void)
@@ -15035,6 +15035,31 @@ static void test_color_vertex(void)
DestroyWindow(window);
}
@@ -189,13 +189,13 @@ index 7cbf408..095212b 100644
START_TEST(ddraw7)
{
DDDEVICEIDENTIFIER2 identifier;
@@ -14552,5 +14577,6 @@ START_TEST(ddraw7)
test_clear();
@@ -15172,5 +15197,6 @@ START_TEST(ddraw7)
test_enum_surfaces();
test_viewport();
test_device_load();
+ test_caps();
test_color_vertex();
}
--
1.9.1
2.18.0