wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-03-30 13:01:06 +11:00
parent ec58b6f6b1
commit 4e3fb17588
7 changed files with 39 additions and 120 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 51a7344248cfbb0345fdf765f7a6b6af2ee4bb05 Mon Sep 17 00:00:00 2001
From 877a0c022af59c3b863edf358242829565ed7cbb 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,10 +12,10 @@ 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 74199b6..7179f51 100644
index 33e18b8d6a..2628b7654f 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1541,6 +1541,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -1542,6 +1542,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
@@ -25,7 +25,7 @@ index 74199b6..7179f51 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 626b07b..a7e5bcd 100644
index 626b07bace..a7e5bcd6e7 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -11247,6 +11247,31 @@ static void test_enum_surfaces(void)
@@ -67,7 +67,7 @@ index 626b07b..a7e5bcd 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 1ab1f9c..272f364 100644
index 1ab1f9c591..272f364b7f 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 1ab1f9c..272f364 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 02b10b5..f114bc4 100644
index 550d73a1bd..f3c020c89c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -14751,6 +14751,31 @@ static void test_enum_surfaces(void)
@@ -151,11 +151,11 @@ index 02b10b5..f114bc4 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 767507f..44fdf2e 100644
index b4910c196c..bf1e1cf120 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -14113,6 +14113,31 @@ static void test_enum_surfaces(void)
IDirectDraw7_Release(ddraw);
@@ -14289,6 +14289,31 @@ static void test_viewport(void)
DestroyWindow(window);
}
+static void test_caps(void)
@@ -186,12 +186,12 @@ index 767507f..44fdf2e 100644
START_TEST(ddraw7)
{
DDDEVICEIDENTIFIER2 identifier;
@@ -14247,4 +14272,5 @@ START_TEST(ddraw7)
test_depth_readback();
@@ -14424,4 +14449,5 @@ START_TEST(ddraw7)
test_clear();
test_enum_surfaces();
test_viewport();
+ test_caps();
}
--
1.9.1
2.16.2