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 b29cdbd5f23548d9631e5c98ec923b6d2d16a3f8

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-09-12 08:28:34 +10:00
parent 6e0d8f18d9
commit 8f0e72776f
4 changed files with 21 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 25c2a52b1109022a01b8f59a22b8a04566af0d3c Mon Sep 17 00:00:00 2001
From 82d0d3038097d3410feb4e405e4b9f8cd9ced21d 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 ed904785dd..47f079fb97 100644
index 37e44e8..a740995 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
@@ -1544,6 +1544,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
@@ -25,10 +25,10 @@ index ed904785dd..47f079fb97 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index d4fe1f294a..29d9d3afb7 100644
index ee4fa5b..c7b992e 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -11538,6 +11538,31 @@ static void test_execute_data(void)
@@ -11539,6 +11539,31 @@ static void test_execute_data(void)
DestroyWindow(window);
}
@@ -60,19 +60,19 @@ index d4fe1f294a..29d9d3afb7 100644
static void test_viewport(void)
{
static struct
@@ -11815,6 +11840,7 @@ START_TEST(ddraw1)
@@ -11973,6 +11998,7 @@ START_TEST(ddraw1)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
test_execute_data();
test_viewport();
}
test_find_device();
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 941d46bf42..752b39568d 100644
index 9394705..bc213db 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12800,6 +12800,31 @@ static void test_enum_surfaces(void)
@@ -12801,6 +12801,31 @@ static void test_enum_surfaces(void)
IDirectDraw2_Release(ddraw);
}
@@ -104,19 +104,20 @@ index 941d46bf42..752b39568d 100644
static void test_viewport(void)
{
static struct
@@ -13106,5 +13131,6 @@ START_TEST(ddraw2)
@@ -13264,6 +13289,7 @@ START_TEST(ddraw2)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
test_viewport();
test_find_device();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index e81472d4f2..4e083ec503 100644
index 6a3630a..1c9acf8 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -15089,6 +15089,31 @@ static void test_viewport(void)
DestroyWindow(window);
@@ -15247,6 +15247,31 @@ static void test_find_device(void)
IDirectDraw4_Release(ddraw);
}
+static void test_caps(void)
@@ -147,14 +148,16 @@ index e81472d4f2..4e083ec503 100644
START_TEST(ddraw4)
{
DDDEVICEIDENTIFIER identifier;
@@ -15215,4 +15240,5 @@ START_TEST(ddraw4)
@@ -15372,6 +15397,7 @@ START_TEST(ddraw4)
test_depth_readback();
test_clear();
test_enum_surfaces();
test_viewport();
+ test_caps();
test_viewport();
test_find_device();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 70318a8492..f3dde436d3 100644
index 70318a8..f3dde43 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -15035,6 +15035,31 @@ static void test_color_vertex(void)
@@ -197,5 +200,5 @@ index 70318a8492..f3dde436d3 100644
test_color_vertex();
}
--
2.18.0
1.9.1