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

Browse Source
This commit is contained in:
Sebastian Lackner
2017-03-10 04:53:06 +01:00
parent 0ef6532241
commit 9a9fb0c9f8
8 changed files with 65 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 336cf41969e853ca0044261f00ed55ac6f668ff1 Mon Sep 17 00:00:00 2001
From dd12a2be3d035d72a3e08573849cdb457b9ec1e7 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 fb91722943e..4b9d9fbf876 100644
index 8a33ccd4c77..3330b9ce321 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,10 +25,10 @@ index fb91722943e..4b9d9fbf876 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 278b9c60069..e1a7a1a4d1c 100644
index da01bd2ef6d..b81f858ad46 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -10163,6 +10163,31 @@ static void test_texture_load(void)
@@ -10683,6 +10683,31 @@ done:
DestroyWindow(window);
}
@@ -60,18 +60,18 @@ index 278b9c60069..e1a7a1a4d1c 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -10249,4 +10274,5 @@ START_TEST(ddraw1)
test_display_mode_surface_pixel_format();
@@ -10770,4 +10795,5 @@ START_TEST(ddraw1)
test_surface_desc_size();
test_texture_load();
test_ck_operation();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index db09e5d8975..53279059105 100644
index 0c2c00f2af7..c26e2cd9b12 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -11487,6 +11487,31 @@ static void test_surface_desc_size(void)
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
@@ -12021,6 +12021,31 @@ done:
DestroyWindow(window);
}
+static void test_caps(void)
@@ -102,17 +102,17 @@ index db09e5d8975..53279059105 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -11581,4 +11606,5 @@ START_TEST(ddraw2)
test_transform_vertices();
@@ -12116,4 +12141,5 @@ START_TEST(ddraw2)
test_display_mode_surface_pixel_format();
test_surface_desc_size();
test_ck_operation();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 830da89bba2..7ba77be3406 100644
index 4c15e0b3a09..af3c145122f 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -12885,6 +12885,31 @@ static void test_get_surface_from_dc(void)
@@ -13386,6 +13386,31 @@ done:
DestroyWindow(window);
}
@@ -144,17 +144,17 @@ index 830da89bba2..7ba77be3406 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -12988,4 +13013,5 @@ START_TEST(ddraw4)
test_display_mode_surface_pixel_format();
@@ -13490,4 +13515,5 @@ START_TEST(ddraw4)
test_surface_desc_size();
test_get_surface_from_dc();
test_ck_operation();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index ba0e4a96e0f..be70456555e 100644
index 4828aa46d6f..d5244625d96 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -12576,6 +12576,31 @@ static void test_get_surface_from_dc(void)
@@ -13077,6 +13077,31 @@ done:
DestroyWindow(window);
}
@@ -186,10 +186,10 @@ index ba0e4a96e0f..be70456555e 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -12689,4 +12714,5 @@ START_TEST(ddraw7)
test_display_mode_surface_pixel_format();
@@ -13191,4 +13216,5 @@ START_TEST(ddraw7)
test_surface_desc_size();
test_get_surface_from_dc();
test_ck_operation();
+ test_caps();
}
--