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 9c72376c8cc03a4ea86dddaa6d18a93a1a33fc73.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-02-11 04:47:25 +01:00
parent 89830856c3
commit 230c30c8e3
8 changed files with 70 additions and 160 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 bc8e93593c9115eb741e1900d8d37ae05c1ba24b Mon Sep 17 00:00:00 2001
From 336cf41969e853ca0044261f00ed55ac6f668ff1 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,7 +12,7 @@ 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 f55ab0a4186..c1ee8be5014 100644
index fb91722943e..4b9d9fbf876 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1554,6 +1554,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -109,11 +109,11 @@ index db09e5d8975..53279059105 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 0693dbcbc84..c3e36fdba17 100644
index 830da89bba2..7ba77be3406 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -12772,6 +12772,31 @@ static void test_surface_desc_size(void)
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
@@ -12885,6 +12885,31 @@ static void test_get_surface_from_dc(void)
DestroyWindow(window);
}
+static void test_caps(void)
@@ -144,18 +144,18 @@ index 0693dbcbc84..c3e36fdba17 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -12874,4 +12899,5 @@ START_TEST(ddraw4)
test_transform_vertices();
@@ -12988,4 +13013,5 @@ START_TEST(ddraw4)
test_display_mode_surface_pixel_format();
test_surface_desc_size();
test_get_surface_from_dc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 7d6b4e9e311..93ef06a864c 100644
index ba0e4a96e0f..be70456555e 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -12463,6 +12463,31 @@ static void test_surface_desc_size(void)
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
@@ -12576,6 +12576,31 @@ static void test_get_surface_from_dc(void)
DestroyWindow(window);
}
+static void test_caps(void)
@@ -186,10 +186,10 @@ index 7d6b4e9e311..93ef06a864c 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -12575,4 +12600,5 @@ START_TEST(ddraw7)
test_edge_antialiasing_blending();
@@ -12689,4 +12714,5 @@ START_TEST(ddraw7)
test_display_mode_surface_pixel_format();
test_surface_desc_size();
test_get_surface_from_dc();
+ test_caps();
}
--