wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 442e60b7e4c010e6622d524f47a2dd0d26ba19d4.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-04-01 19:16:26 +02:00
parent 29b8c10db6
commit 1b9726a88e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 86b9dd3e7fc3ac50ce08779978c2b0958fb3f751 Mon Sep 17 00:00:00 2001
From 868ce47167682925bef4e2e7662064ac45d0abc8 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.
@ -109,10 +109,10 @@ index ee3508f..719b8ef 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 6f863b1..a48e3b7 100644
index 1bb2969..1b8367c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -10858,6 +10858,31 @@ static void test_blt(void)
@@ -10956,6 +10956,31 @@ static void test_color_clamping(void)
DestroyWindow(window);
}
@ -144,17 +144,17 @@ index 6f863b1..a48e3b7 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -10949,4 +10974,5 @@ START_TEST(ddraw4)
test_offscreen_overlay();
@@ -11048,4 +11073,5 @@ START_TEST(ddraw4)
test_overlay_rect();
test_blt();
test_color_clamping();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 72ec446..68115b7 100644
index 29de0aa..0d2f00d 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11149,6 +11149,31 @@ static void test_blt(void)
@@ -11240,6 +11240,31 @@ static void test_color_clamping(void)
DestroyWindow(window);
}
@ -186,10 +186,10 @@ index 72ec446..68115b7 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -11251,4 +11276,5 @@ START_TEST(ddraw7)
test_offscreen_overlay();
@@ -11343,4 +11368,5 @@ START_TEST(ddraw7)
test_overlay_rect();
test_blt();
test_color_clamping();
+ test_caps();
}
--

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "f820c0942854c14fcd063c83225af03e73286334"
echo "442e60b7e4c010e6622d524f47a2dd0d26ba19d4"
}
# Show version information