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 510c8e39838e4ceef1a66b42e7e58484bf4ac143.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-03-23 18:04:51 +01:00
parent 70b46ff603
commit 711cfa9cf4
3 changed files with 26 additions and 26 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 481804163415517f2dd6f8e7f8d739791b17aba5 Mon Sep 17 00:00:00 2001
From 86b9dd3e7fc3ac50ce08779978c2b0958fb3f751 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 1e1a2ff..c2f0b78 100644
index 02eb9c9..e48307b 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -8497,6 +8497,31 @@ done:
@@ -8573,6 +8573,31 @@ static void test_blt(void)
DestroyWindow(window);
}
@@ -60,17 +60,17 @@ index 1e1a2ff..c2f0b78 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -8573,4 +8598,5 @@ START_TEST(ddraw1)
test_yv12_overlay();
@@ -8650,4 +8675,5 @@ START_TEST(ddraw1)
test_offscreen_overlay();
test_overlay_rect();
test_blt();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 75bdc84..03ca99c 100644
index ee3508f..719b8ef 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -9604,6 +9604,31 @@ done:
@@ -9680,6 +9680,31 @@ static void test_blt(void)
DestroyWindow(window);
}
@@ -102,17 +102,17 @@ index 75bdc84..03ca99c 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -9687,4 +9712,5 @@ START_TEST(ddraw2)
test_yv12_overlay();
@@ -9764,4 +9789,5 @@ START_TEST(ddraw2)
test_offscreen_overlay();
test_overlay_rect();
test_blt();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index a092787..2e6564a 100644
index 6f863b1..a48e3b7 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -10775,6 +10775,31 @@ done:
@@ -10858,6 +10858,31 @@ static void test_blt(void)
DestroyWindow(window);
}
@@ -144,17 +144,17 @@ index a092787..2e6564a 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -10865,4 +10890,5 @@ START_TEST(ddraw4)
test_yv12_overlay();
@@ -10949,4 +10974,5 @@ START_TEST(ddraw4)
test_offscreen_overlay();
test_overlay_rect();
test_blt();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 1509be7..46330e5 100644
index 72ec446..68115b7 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11066,6 +11066,31 @@ done:
@@ -11149,6 +11149,31 @@ static void test_blt(void)
DestroyWindow(window);
}
@@ -186,10 +186,10 @@ index 1509be7..46330e5 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -11167,4 +11192,5 @@ START_TEST(ddraw7)
test_yv12_overlay();
@@ -11251,4 +11276,5 @@ START_TEST(ddraw7)
test_offscreen_overlay();
test_overlay_rect();
test_blt();
+ test_caps();
}
--