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 b510dccecbfe80c26b030b78b903b38350d41012.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-01-18 16:52:22 +01:00
parent b19d0ea3ca
commit 966293c5d3
3 changed files with 24 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 746aa2c81af98e890e4db720783de7fce4bc84d3 Mon Sep 17 00:00:00 2001
From bbe000942fadd116e85bd64abd6633fa1d9df382 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: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@@ -12,10 +12,10 @@ Subject: 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 1fa88751efe..5c138a5d726 100644
index 8bf38ee930f..01a9a904ef5 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1533,6 +1533,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -1536,6 +1536,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
@@ -25,11 +25,11 @@ index 1fa88751efe..5c138a5d726 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 5b153a62a21..762c1074e79 100644
index 5acbee61e00..bb873da220f 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -9793,6 +9793,31 @@ static void test_display_mode_surface_pixel_format(void)
DestroyWindow(window);
@@ -9953,6 +9953,31 @@ static void test_surface_desc_size(void)
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
}
+static void test_caps(void)
@@ -60,18 +60,18 @@ index 5b153a62a21..762c1074e79 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -9877,4 +9902,5 @@ START_TEST(ddraw1)
test_getdc();
@@ -10038,4 +10063,5 @@ START_TEST(ddraw1)
test_transform_vertices();
test_display_mode_surface_pixel_format();
test_surface_desc_size();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 422960012af..714d3f0e1a8 100644
index dc8801c3e12..9afd5e8e681 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -11247,6 +11247,31 @@ static void test_display_mode_surface_pixel_format(void)
DestroyWindow(window);
@@ -11444,6 +11444,31 @@ static void test_surface_desc_size(void)
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
}
+static void test_caps(void)
@@ -102,18 +102,18 @@ index 422960012af..714d3f0e1a8 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -11340,4 +11365,5 @@ START_TEST(ddraw2)
test_edge_antialiasing_blending();
@@ -11538,4 +11563,5 @@ START_TEST(ddraw2)
test_transform_vertices();
test_display_mode_surface_pixel_format();
test_surface_desc_size();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index e091a6dac5d..70dd79d7a13 100644
index f2b3e0cf63b..fbefe8425b3 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -12532,6 +12532,31 @@ static void test_display_mode_surface_pixel_format(void)
DestroyWindow(window);
@@ -12729,6 +12729,31 @@ static void test_surface_desc_size(void)
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
}
+static void test_caps(void)
@@ -144,18 +144,18 @@ index e091a6dac5d..70dd79d7a13 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -12633,4 +12658,5 @@ START_TEST(ddraw4)
test_edge_antialiasing_blending();
@@ -12831,4 +12856,5 @@ START_TEST(ddraw4)
test_transform_vertices();
test_display_mode_surface_pixel_format();
test_surface_desc_size();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 0b1bdaef6d2..536163e9a5e 100644
index 7b88824920e..7957f1733d5 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -12211,6 +12211,31 @@ static void test_display_mode_surface_pixel_format(void)
DestroyWindow(window);
@@ -12424,6 +12424,31 @@ static void test_surface_desc_size(void)
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
}
+static void test_caps(void)
@@ -186,10 +186,10 @@ index 0b1bdaef6d2..536163e9a5e 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -12322,4 +12347,5 @@ START_TEST(ddraw7)
test_draw_primitive();
@@ -12536,4 +12561,5 @@ START_TEST(ddraw7)
test_edge_antialiasing_blending();
test_display_mode_surface_pixel_format();
test_surface_desc_size();
+ test_caps();
}
--