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 2cc730b4ad148382093d67f15d40134aee05d058.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-03-15 16:16:43 +01:00
parent efdf5d2bc2
commit 06da0acbdc
5 changed files with 63 additions and 62 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 c2d4f3fc4de77decbec1a31b07507e26baaf1c16 Mon Sep 17 00:00:00 2001
From 93267b9dc171775f908aa0f0dde65cc5a60c3b0b 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 8a33ccd4c77..3330b9ce321 100644
index 8a33ccd4c7..3330b9ce32 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
@@ -25,7 +25,7 @@ index 8a33ccd4c77..3330b9ce321 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index da01bd2ef6d..b81f858ad46 100644
index 4f53ee1059..538ab656e3 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -10683,6 +10683,31 @@ done:
@@ -67,7 +67,7 @@ index da01bd2ef6d..b81f858ad46 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 0c2c00f2af7..c26e2cd9b12 100644
index be950d8034..b72fffb51e 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12021,6 +12021,31 @@ done:
@@ -109,10 +109,10 @@ index 0c2c00f2af7..c26e2cd9b12 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index dfdf4ce1932..52cc3c84447 100644
index 2f92a70f4c..1381b498de 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -13450,6 +13450,31 @@ static void test_vb_refcount(void)
@@ -13551,6 +13551,31 @@ static void test_compute_sphere_visibility(void)
DestroyWindow(window);
}
@@ -144,17 +144,17 @@ index dfdf4ce1932..52cc3c84447 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -13555,4 +13580,5 @@ START_TEST(ddraw4)
test_get_surface_from_dc();
@@ -13657,4 +13682,5 @@ START_TEST(ddraw4)
test_ck_operation();
test_vb_refcount();
test_compute_sphere_visibility();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 1378673b480..65d4bfca464 100644
index 29dd246d91..206c90ca3d 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -13145,6 +13145,31 @@ static void test_vb_refcount(void)
@@ -13251,6 +13251,31 @@ static void test_compute_sphere_visibility(void)
DestroyWindow(window);
}
@@ -186,10 +186,10 @@ index 1378673b480..65d4bfca464 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -13260,4 +13285,5 @@ START_TEST(ddraw7)
test_get_surface_from_dc();
@@ -13367,4 +13392,5 @@ START_TEST(ddraw7)
test_ck_operation();
test_vb_refcount();
test_compute_sphere_visibility();
+ test_caps();
}
--