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 9d897b73a877e5eaae26df87930c951ff8273c14

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-14 08:13:50 +11:00
parent e58651c321
commit 47d2040c12
42 changed files with 415 additions and 2005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
From 93267b9dc171775f908aa0f0dde65cc5a60c3b0b Mon Sep 17 00:00:00 2001
From 51a7344248cfbb0345fdf765f7a6b6af2ee4bb05 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.
Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
---
dlls/ddraw/ddraw.c | 2 ++
@@ -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 8a33ccd4c7..3330b9ce32 100644
index 74199b6..7179f51 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
@@ -1541,6 +1541,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 8a33ccd4c7..3330b9ce32 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 4f53ee1059..538ab656e3 100644
index 626b07b..a7e5bcd 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -10683,6 +10683,31 @@ done:
DestroyWindow(window);
@@ -11247,6 +11247,31 @@ static void test_enum_surfaces(void)
IDirectDraw_Release(ddraw);
}
+static void test_caps(void)
@@ -59,19 +59,19 @@ index 4f53ee1059..538ab656e3 100644
+
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -10770,4 +10795,5 @@ START_TEST(ddraw1)
test_surface_desc_size();
test_texture_load();
test_ck_operation();
DDDEVICEIDENTIFIER identifier;
@@ -11348,4 +11373,5 @@ START_TEST(ddraw1)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index be950d8034..b72fffb51e 100644
index 1ab1f9c..272f364 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -12021,6 +12021,31 @@ done:
DestroyWindow(window);
@@ -12646,6 +12646,31 @@ static void test_enum_surfaces(void)
IDirectDraw2_Release(ddraw);
}
+static void test_caps(void)
@@ -101,19 +101,19 @@ index be950d8034..b72fffb51e 100644
+
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -12116,4 +12141,5 @@ START_TEST(ddraw2)
test_display_mode_surface_pixel_format();
test_surface_desc_size();
test_ck_operation();
DDDEVICEIDENTIFIER identifier;
@@ -12756,4 +12781,5 @@ START_TEST(ddraw2)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 2f92a70f4c..1381b498de 100644
index 02b10b5..f114bc4 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -13551,6 +13551,31 @@ static void test_compute_sphere_visibility(void)
DestroyWindow(window);
@@ -14751,6 +14751,31 @@ static void test_enum_surfaces(void)
IDirectDraw4_Release(ddraw);
}
+static void test_caps(void)
@@ -143,19 +143,19 @@ index 2f92a70f4c..1381b498de 100644
+
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -13657,4 +13682,5 @@ START_TEST(ddraw4)
test_ck_operation();
test_vb_refcount();
test_compute_sphere_visibility();
DDDEVICEIDENTIFIER identifier;
@@ -14875,4 +14900,5 @@ START_TEST(ddraw4)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 29dd246d91..206c90ca3d 100644
index 767507f..44fdf2e 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -13251,6 +13251,31 @@ static void test_compute_sphere_visibility(void)
DestroyWindow(window);
@@ -14113,6 +14113,31 @@ static void test_enum_surfaces(void)
IDirectDraw7_Release(ddraw);
}
+static void test_caps(void)
@@ -185,13 +185,13 @@ index 29dd246d91..206c90ca3d 100644
+
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -13367,4 +13392,5 @@ START_TEST(ddraw7)
test_ck_operation();
test_vb_refcount();
test_compute_sphere_visibility();
DDDEVICEIDENTIFIER2 identifier;
@@ -14247,4 +14272,5 @@ START_TEST(ddraw7)
test_depth_readback();
test_clear();
test_enum_surfaces();
+ test_caps();
}
--
2.11.0
1.9.1