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 1c201a96c57a68caaf6c976d7f3732738c9d9ac8.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-04-11 20:57:58 +02:00
parent cb89c75141
commit 8064151dce
4 changed files with 27 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 868ce47167682925bef4e2e7662064ac45d0abc8 Mon Sep 17 00:00:00 2001
From 96e37506c2666ce99559281dd977122994f20b6d 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.
@@ -25,10 +25,10 @@ index f9231d8..eeb941c 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 02eb9c9..e48307b 100644
index 7c2ec85..05427b2 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -8573,6 +8573,31 @@ static void test_blt(void)
@@ -8840,6 +8840,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@@ -60,17 +60,17 @@ index 02eb9c9..e48307b 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -8650,4 +8675,5 @@ START_TEST(ddraw1)
test_offscreen_overlay();
@@ -8918,4 +8943,5 @@ START_TEST(ddraw1)
test_overlay_rect();
test_blt();
test_getdc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index ee3508f..719b8ef 100644
index fd5dc9c..b1793ce 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -9680,6 +9680,31 @@ static void test_blt(void)
@@ -9947,6 +9947,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@@ -102,17 +102,17 @@ index ee3508f..719b8ef 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -9764,4 +9789,5 @@ START_TEST(ddraw2)
test_offscreen_overlay();
@@ -10032,4 +10057,5 @@ START_TEST(ddraw2)
test_overlay_rect();
test_blt();
test_getdc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 1bb2969..1b8367c 100644
index 44f211e..1d06a62 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -10956,6 +10956,31 @@ static void test_color_clamping(void)
@@ -11225,6 +11225,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@@ -144,17 +144,17 @@ index 1bb2969..1b8367c 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -11048,4 +11073,5 @@ START_TEST(ddraw4)
test_overlay_rect();
@@ -11318,4 +11343,5 @@ START_TEST(ddraw4)
test_blt();
test_color_clamping();
test_getdc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 29de0aa..0d2f00d 100644
index 628d6d3..d0b0852 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11240,6 +11240,31 @@ static void test_color_clamping(void)
@@ -11511,6 +11511,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@@ -186,10 +186,10 @@ index 29de0aa..0d2f00d 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -11343,4 +11368,5 @@ START_TEST(ddraw7)
test_overlay_rect();
@@ -11615,4 +11640,5 @@ START_TEST(ddraw7)
test_blt();
test_color_clamping();
test_getdc();
+ test_caps();
}
--