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 7baaab5b53011c3a593e1ff32538c9ca706db212.

Browse Source 
FIXME: Use CS resource map/unmap mechanism instead of separate opcodes.
This commit is contained in:
Sebastian Lackner
2016-09-03 06:06:06 +02:00
parent d28e0d12bb
commit ad962f7d64
109 changed files with 699 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 85594497f9133133454a8008a93c7695a3e6ea83 Mon Sep 17 00:00:00 2001
From 445d3b9a3148598de7ff907429076d1551c419ec 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 e8194b3..26556e9 100644
index 1271022..de6697e 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -9503,6 +9503,31 @@ static void test_transform_vertices(void)
@@ -9612,6 +9612,31 @@ static void test_transform_vertices(void)
DestroyWindow(window);
}
@@ -60,17 +60,17 @@ index e8194b3..26556e9 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -9586,4 +9611,5 @@ START_TEST(ddraw1)
@@ -9695,4 +9720,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
index 171f669..79f4c97 100644
index bf012e4..b55eed8 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -10453,6 +10453,31 @@ static void test_edge_antialiasing_blending(void)
@@ -10949,6 +10949,31 @@ static void test_transform_vertices(void)
DestroyWindow(window);
}
@@ -102,17 +102,17 @@ index 171f669..79f4c97 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -10544,4 +10569,5 @@ START_TEST(ddraw2)
test_getdc();
@@ -11041,4 +11066,5 @@ START_TEST(ddraw2)
test_draw_primitive();
test_edge_antialiasing_blending();
test_transform_vertices();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 988a82f..c1e0457 100644
index 9ac7a63..7b4bd3c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -11785,6 +11785,31 @@ static void test_edge_antialiasing_blending(void)
@@ -12246,6 +12246,31 @@ static void test_transform_vertices(void)
DestroyWindow(window);
}
@@ -144,14 +144,14 @@ index 988a82f..c1e0457 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -11884,4 +11909,5 @@ START_TEST(ddraw4)
test_getdc();
@@ -12346,4 +12371,5 @@ START_TEST(ddraw4)
test_draw_primitive();
test_edge_antialiasing_blending();
test_transform_vertices();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 56f8107..7c8467a 100644
index d6dffc8..eafa93b 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -12104,6 +12104,31 @@ static void test_edge_antialiasing_blending(void)