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 69eafe63ad7e3525f3498ab6af9f4c149753407f.

Browse Source 
[server-Parent_Process]
Removed patch to avoid holding reference on parent process in
wineserver (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-04-25 17:23:42 +02:00
parent 1051d1524c
commit f837e9bbfd
5 changed files with 18 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 96e37506c2666ce99559281dd977122994f20b6d Mon Sep 17 00:00:00 2001
From be137f0fb6f21d40f3caaa4cce69c0e22d90d8da 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,7 +12,7 @@ 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 f9231d8..eeb941c 100644
index e9ca114..59f19ff 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
@@ -25,10 +25,10 @@ index f9231d8..eeb941c 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 7c2ec85..05427b2 100644
index 88d4f0c..07a8c10 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -8840,6 +8840,31 @@ static void test_getdc(void)
@@ -8977,6 +8977,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@@ -60,17 +60,17 @@ index 7c2ec85..05427b2 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -8918,4 +8943,5 @@ START_TEST(ddraw1)
@@ -9055,4 +9080,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 fd5dc9c..b1793ce 100644
index fdba786..44d23ad 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -9947,6 +9947,31 @@ static void test_getdc(void)
@@ -10153,6 +10153,31 @@ static void test_draw_primitive(void)
DestroyWindow(window);
}
@@ -102,17 +102,17 @@ index fd5dc9c..b1793ce 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -10032,4 +10057,5 @@ START_TEST(ddraw2)
test_overlay_rect();
@@ -10239,4 +10264,5 @@ START_TEST(ddraw2)
test_blt();
test_getdc();
test_draw_primitive();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 44f211e..1d06a62 100644
index cbcae06..67515a1 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -11225,6 +11225,31 @@ static void test_getdc(void)
@@ -11477,6 +11477,31 @@ static void test_draw_primitive(void)
DestroyWindow(window);
}
@@ -144,17 +144,17 @@ index 44f211e..1d06a62 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -11318,4 +11343,5 @@ START_TEST(ddraw4)
test_blt();
@@ -11571,4 +11596,5 @@ START_TEST(ddraw4)
test_color_clamping();
test_getdc();
test_draw_primitive();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 628d6d3..d0b0852 100644
index 5bfbe4d..23681f6 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11511,6 +11511,31 @@ static void test_getdc(void)
@@ -11762,6 +11762,31 @@ static void test_draw_primitive(void)
DestroyWindow(window);
}
@@ -186,10 +186,10 @@ index 628d6d3..d0b0852 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -11615,4 +11640,5 @@ START_TEST(ddraw7)
test_blt();
@@ -11867,4 +11892,5 @@ START_TEST(ddraw7)
test_color_clamping();
test_getdc();
test_draw_primitive();
+ test_caps();
}
--