wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 1c201a96c57a68caaf6c976d7f3732738c9d9ac8.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-04-11 20:57:58 +02:00
parent cb89c75141
commit 8064151dce
4 changed files with 27 additions and 64 deletions
Show Stats 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 868ce47167682925bef4e2e7662064ac45d0abc8 Mon Sep 17 00:00:00 2001
From 96e37506c2666ce99559281dd977122994f20b6d 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 f9231d8..eeb941c 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 02eb9c9..e48307b 100644
index 7c2ec85..05427b2 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -8573,6 +8573,31 @@ static void test_blt(void)
@@ -8840,6 +8840,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@ -60,17 +60,17 @@ index 02eb9c9..e48307b 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -8650,4 +8675,5 @@ START_TEST(ddraw1)
test_offscreen_overlay();
@@ -8918,4 +8943,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 ee3508f..719b8ef 100644
index fd5dc9c..b1793ce 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -9680,6 +9680,31 @@ static void test_blt(void)
@@ -9947,6 +9947,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@ -102,17 +102,17 @@ index ee3508f..719b8ef 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -9764,4 +9789,5 @@ START_TEST(ddraw2)
test_offscreen_overlay();
@@ -10032,4 +10057,5 @@ START_TEST(ddraw2)
test_overlay_rect();
test_blt();
test_getdc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 1bb2969..1b8367c 100644
index 44f211e..1d06a62 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -10956,6 +10956,31 @@ static void test_color_clamping(void)
@@ -11225,6 +11225,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@ -144,17 +144,17 @@ index 1bb2969..1b8367c 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -11048,4 +11073,5 @@ START_TEST(ddraw4)
test_overlay_rect();
@@ -11318,4 +11343,5 @@ START_TEST(ddraw4)
test_blt();
test_color_clamping();
test_getdc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 29de0aa..0d2f00d 100644
index 628d6d3..d0b0852 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11240,6 +11240,31 @@ static void test_color_clamping(void)
@@ -11511,6 +11511,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@ -186,10 +186,10 @@ index 29de0aa..0d2f00d 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -11343,4 +11368,5 @@ START_TEST(ddraw7)
test_overlay_rect();
@@ -11615,4 +11640,5 @@ START_TEST(ddraw7)
test_blt();
test_color_clamping();
test_getdc();
+ test_caps();
}
--

28
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "ad7cb436571ec66ae7a5687568fca2f5318c7e76"
echo "1c201a96c57a68caaf6c976d7f3732738c9d9ac8"
}
# Show version information
@ -319,7 +319,6 @@ patch_enable_all ()
enable_user_exe16_CONTAINING_RECORD="$1"
enable_user_exe16_DlgDirList="$1"
enable_user32_DeferWindowPos="$1"
enable_user32_Dialog_Owner="$1"
enable_user32_Dialog_Paint_Event="$1"
enable_user32_DrawTextExW="$1"
enable_user32_GetSystemMetrics="$1"
@ -1130,9 +1129,6 @@ patch_enable ()
user32-DeferWindowPos)
enable_user32_DeferWindowPos="$2"
;;
user32-Dialog_Owner)
enable_user32_Dialog_Owner="$2"
;;
user32-Dialog_Paint_Event)
enable_user32_Dialog_Paint_Event="$2"
;;
@ -6595,28 +6591,6 @@ if test "$enable_user32_DeferWindowPos" -eq 1; then
) >> "$patchlist"
fi
# Patchset user32-Dialog_Owner
# |
# | This patchset fixes the following Wine bugs:
# | * [#40282] Enable the correct dialog owner in DIALOG_DoDialogBox
# |
# | Modified files:
# | * dlls/user.exe16/dialog.c, dlls/user.exe16/user_private.h, dlls/user32/controls.h, dlls/user32/dialog.c,
# | dlls/user32/tests/win.c
# |
if test "$enable_user32_Dialog_Owner" -eq 1; then
patch_apply user32-Dialog_Owner/0001-user32-tests-Add-some-tests-for-dialog-owner-disable.patch
patch_apply user32-Dialog_Owner/0002-user32-Enable-the-specified-dialog-owner.patch
patch_apply user32-Dialog_Owner/0003-user32-Enable-correct-dialog-owner.patch
patch_apply user32-Dialog_Owner/0004-user32-Unconditionally-enable-dialog-owner.patch
(
echo '+ { "Dmitry Timoshkov", "user32/tests: Add some tests for dialog owner disabled state.", 3 },';
echo '+ { "Dmitry Timoshkov", "user32: Enable the specified dialog owner.", 1 },';
echo '+ { "Dmitry Timoshkov", "user32: Enable correct dialog owner.", 1 },';
echo '+ { "Dmitry Timoshkov", "user32: Unconditionally enable dialog owner.", 1 },';
) >> "$patchlist"
fi
# Patchset user32-Dialog_Paint_Event
# |
# | This patchset fixes the following Wine bugs:

26
patches/user32-DeferWindowPos/0001-user32-Fix-error-handling-in-Begin-End-DeferWindowPo.patch
View File

@ -1,30 +1,18 @@
From e205d3ce0d27afe10ecd82657b39790a4cf4e087 Mon Sep 17 00:00:00 2001
From 171fae0615017e437a374cb543bbd98cfe7b88d4 Mon Sep 17 00:00:00 2001
From: Rodrigo Rivas <rodrigorivascosta@gmail.com>
Date: Tue, 25 Aug 2015 15:08:43 +0200
Subject: user32: Fix error handling in {Begin,End,}DeferWindowPos() to match
Windows behavior (resend)
---
dlls/user32/winpos.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
dlls/user32/winpos.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index f92a3dc..7cb3a4f 100644
index 4915aad..b9f549e 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -2349,6 +2349,11 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter,
hwnd = WIN_GetFullHandle( hwnd );
if (is_desktop_window( hwnd )) return 0;
+ if (!IsWindow( hwnd ))
+ {
+ SetLastError( ERROR_INVALID_WINDOW_HANDLE );
+ return 0;
+ }
if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0;
if (pDWP == OBJ_OTHER_PROCESS)
@@ -2418,7 +2423,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
@@ -2422,7 +2422,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
{
DWP *pDWP;
WINDOWPOS *winpos;
@ -32,7 +20,7 @@ index f92a3dc..7cb3a4f 100644
int i;
TRACE("%p\n", hdwp);
@@ -2430,20 +2434,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
@@ -2434,20 +2433,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
return FALSE;
}
@ -58,5 +46,5 @@ index f92a3dc..7cb3a4f 100644
--
2.5.0
2.7.1

3
patches/user32-Dialog_Owner/definition
View File

@ -1 +1,2 @@
Fixes: [40282] Enable the correct dialog owner in DIALOG_DoDialogBox
# Fixes: [40282] Enable the correct dialog owner in DIALOG_DoDialogBox
Disabled: true