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 882980c17a9a033fa8e49a4c116af9583698d218.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-08-10 22:22:18 +02:00
parent b727968b45
commit a6c6b83eb7
12 changed files with 106 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From be137f0fb6f21d40f3caaa4cce69c0e22d90d8da Mon Sep 17 00:00:00 2001
From 806018e4f6faf91ea74fd3bf287643e9e825b36b 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.
@@ -12,10 +12,10 @@ Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
5 files changed, 106 insertions(+)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index e9ca114..59f19ff 100644
index e50edb4..bac9b8a 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1532,6 +1532,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -1533,6 +1533,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
@@ -25,10 +25,10 @@ index e9ca114..59f19ff 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 88d4f0c..07a8c10 100644
index bfc6bfe..76e2236 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -8977,6 +8977,31 @@ static void test_getdc(void)
@@ -9071,6 +9071,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@@ -60,17 +60,17 @@ index 88d4f0c..07a8c10 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -9055,4 +9080,5 @@ START_TEST(ddraw1)
@@ -9153,4 +9178,5 @@ START_TEST(ddraw1)
test_overlay_rect();
test_blt();
test_getdc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index fdba786..44d23ad 100644
index 171f669..79f4c97 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -10153,6 +10153,31 @@ static void test_draw_primitive(void)
@@ -10453,6 +10453,31 @@ static void test_edge_antialiasing_blending(void)
DestroyWindow(window);
}
@@ -102,17 +102,17 @@ index fdba786..44d23ad 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -10239,4 +10264,5 @@ START_TEST(ddraw2)
test_blt();
@@ -10544,4 +10569,5 @@ START_TEST(ddraw2)
test_getdc();
test_draw_primitive();
test_edge_antialiasing_blending();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index cbcae06..67515a1 100644
index 988a82f..c1e0457 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -11477,6 +11477,31 @@ static void test_draw_primitive(void)
@@ -11785,6 +11785,31 @@ static void test_edge_antialiasing_blending(void)
DestroyWindow(window);
}
@@ -144,17 +144,17 @@ index cbcae06..67515a1 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -11571,4 +11596,5 @@ START_TEST(ddraw4)
test_color_clamping();
@@ -11884,4 +11909,5 @@ START_TEST(ddraw4)
test_getdc();
test_draw_primitive();
test_edge_antialiasing_blending();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 5bfbe4d..23681f6 100644
index 56f8107..7c8467a 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11762,6 +11762,31 @@ static void test_draw_primitive(void)
@@ -12104,6 +12104,31 @@ static void test_edge_antialiasing_blending(void)
DestroyWindow(window);
}
@@ -186,12 +186,12 @@ index 5bfbe4d..23681f6 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -11867,4 +11892,5 @@ START_TEST(ddraw7)
test_color_clamping();
@@ -12214,4 +12239,5 @@ START_TEST(ddraw7)
test_getdc();
test_draw_primitive();
test_edge_antialiasing_blending();
+ test_caps();
}
--
2.7.1
2.9.0