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 4b1445940d47870895b7fa87b7d69d12abe701ef.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-03-11 21:56:22 +01:00
parent ce5620a1a4
commit 543b9eaae1
12 changed files with 115 additions and 343 deletions
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 dd12a2be3d035d72a3e08573849cdb457b9ec1e7 Mon Sep 17 00:00:00 2001
From c2d4f3fc4de77decbec1a31b07507e26baaf1c16 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 0c2c00f2af7..c26e2cd9b12 100644
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 4c15e0b3a09..af3c145122f 100644
index dfdf4ce1932..52cc3c84447 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -13386,6 +13386,31 @@ done:
@@ -13450,6 +13450,31 @@ static void test_vb_refcount(void)
DestroyWindow(window);
}
@@ -144,17 +144,17 @@ index 4c15e0b3a09..af3c145122f 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -13490,4 +13515,5 @@ START_TEST(ddraw4)
test_surface_desc_size();
@@ -13555,4 +13580,5 @@ START_TEST(ddraw4)
test_get_surface_from_dc();
test_ck_operation();
test_vb_refcount();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 4828aa46d6f..d5244625d96 100644
index 1378673b480..65d4bfca464 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -13077,6 +13077,31 @@ done:
@@ -13145,6 +13145,31 @@ static void test_vb_refcount(void)
DestroyWindow(window);
}
@@ -186,10 +186,10 @@ index 4828aa46d6f..d5244625d96 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -13191,4 +13216,5 @@ START_TEST(ddraw7)
test_surface_desc_size();
@@ -13260,4 +13285,5 @@ START_TEST(ddraw7)
test_get_surface_from_dc();
test_ck_operation();
test_vb_refcount();
+ test_caps();
}
--