You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 225c43b8124aaeb4c2e307379ab98036db1a38b3.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 806018e4f6faf91ea74fd3bf287643e9e825b36b Mon Sep 17 00:00:00 2001
|
||||
From 85594497f9133133454a8008a93c7695a3e6ea83 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 e50edb4..bac9b8a 100644
|
||||
|
||||
if(DriverCaps)
|
||||
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
|
||||
index bfc6bfe..76e2236 100644
|
||||
index e8194b3..26556e9 100644
|
||||
--- a/dlls/ddraw/tests/ddraw1.c
|
||||
+++ b/dlls/ddraw/tests/ddraw1.c
|
||||
@@ -9071,6 +9071,31 @@ static void test_getdc(void)
|
||||
@@ -9503,6 +9503,31 @@ static void test_transform_vertices(void)
|
||||
DestroyWindow(window);
|
||||
}
|
||||
|
||||
@@ -60,10 +60,10 @@ index bfc6bfe..76e2236 100644
|
||||
START_TEST(ddraw1)
|
||||
{
|
||||
IDirectDraw *ddraw;
|
||||
@@ -9153,4 +9178,5 @@ START_TEST(ddraw1)
|
||||
test_overlay_rect();
|
||||
@@ -9586,4 +9611,5 @@ START_TEST(ddraw1)
|
||||
test_blt();
|
||||
test_getdc();
|
||||
test_transform_vertices();
|
||||
+ test_caps();
|
||||
}
|
||||
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
|
||||
|
Reference in New Issue
Block a user