mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch to fix cursor clip regression / broken raw input in multiple games.
This commit is contained in:
Sebastian Lackner
parent
fbe41916cb
commit
0121248145
@ -37,13 +37,14 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
===================================
|
||||
|
||||
**Bugfixes and features included in the next upcoming release [14]:**
|
||||
**Bugfixes and features included in the next upcoming release [15]:**
|
||||
|
||||
* Add stubs for D3DXCreateAnimationController interface
|
||||
* Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
|
||||
* Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
|
||||
* Child of Light expects FindConnectionPoint to succeed and increase the refcount ([Wine Bug #36408](https://bugs.winehq.org/show_bug.cgi?id=36408))
|
||||
* Do not append duplicate NULL characters when importing keys with regedit ([Wine Bug #37575](https://bugs.winehq.org/show_bug.cgi?id=37575))
|
||||
* Fix cursor clip regression / broken raw input in multiple games ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479))
|
||||
* Fix init of LONGLONG variable with a negative value in TGA decoder
|
||||
* Fix wrong colors in Wolfenstein (2009) ([Wine Bug #34692](https://bugs.winehq.org/show_bug.cgi?id=34692))
|
||||
* Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -12,6 +12,7 @@ wine-staging (1.7.35) UNRELEASED; urgency=low
|
||||
* Added patch to fix init of LONGLONG variable with a negative value in TGA decoder.
|
||||
* Added patch to implement stubs for D3DXCreateAnimationController interface.
|
||||
* Added patch to implement semi-stub for IDirectPlayVoiceClient::GetCompressionTypes.
|
||||
* Added patch to fix cursor clip regression / broken raw input in multiple games.
|
||||
* Removed patch to set last error on success in WSARecv (accepted upstream).
|
||||
* Removed patch to fix handling of subdirectory in FtpFindFirstFile (accepted upstream).
|
||||
* Removed patch to initialize irp.Tail.Overlay.OriginalFileObject with stub file object (accepted upstream).
|
||||
|
||||
@ -138,6 +138,7 @@ patch_enable_all ()
|
||||
enable_secur32_Schannel_ContextAttr="$1"
|
||||
enable_server_ACL_Compat="$1"
|
||||
enable_server_Address_Change_Notification="$1"
|
||||
enable_server_ClipCursor="$1"
|
||||
enable_server_CreateProcess_ACLs="$1"
|
||||
enable_server_Inherited_ACLs="$1"
|
||||
enable_server_Misc_ACL="$1"
|
||||
@ -440,6 +441,9 @@ patch_enable ()
|
||||
server-Address_Change_Notification)
|
||||
enable_server_Address_Change_Notification="$2"
|
||||
;;
|
||||
server-ClipCursor)
|
||||
enable_server_ClipCursor="$2"
|
||||
;;
|
||||
server-CreateProcess_ACLs)
|
||||
enable_server_CreateProcess_ACLs="$2"
|
||||
;;
|
||||
@ -2450,6 +2454,21 @@ if test "$enable_server_Address_Change_Notification" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-ClipCursor
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33479] Fix cursor clip regression / broken raw input in multiple games
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/user32/message.c, server/queue.c
|
||||
# |
|
||||
if test "$enable_server_ClipCursor" -eq 1; then
|
||||
patch_apply server-ClipCursor/0001-server-Only-send-WM_WINE_CLIPCURSOR-for-forced-clip-.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "server: Only send WM_WINE_CLIPCURSOR for forced clip resets.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-CreateProcess_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -0,0 +1,72 @@
|
||||
From 9fc973740aac7d4eac1995f30c9dbb8bbbdc1ce5 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 22 Jan 2015 16:34:58 +0100
|
||||
Subject: server: Only send WM_WINE_CLIPCURSOR for forced clip resets.
|
||||
|
||||
---
|
||||
dlls/user32/message.c | 6 ------
|
||||
server/queue.c | 10 +++++-----
|
||||
2 files changed, 5 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
|
||||
index eac4e4d..70d95a6 100644
|
||||
--- a/dlls/user32/message.c
|
||||
+++ b/dlls/user32/message.c
|
||||
@@ -1881,12 +1881,6 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
|
||||
return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam );
|
||||
}
|
||||
case WM_WINE_CLIPCURSOR:
|
||||
- if (wparam)
|
||||
- {
|
||||
- RECT rect;
|
||||
- GetClipCursor( &rect );
|
||||
- return USER_Driver->pClipCursor( &rect );
|
||||
- }
|
||||
return USER_Driver->pClipCursor( NULL );
|
||||
default:
|
||||
if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG)
|
||||
diff --git a/server/queue.c b/server/queue.c
|
||||
index 5f87203..fce2e42 100644
|
||||
--- a/server/queue.c
|
||||
+++ b/server/queue.c
|
||||
@@ -362,7 +362,7 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y )
|
||||
}
|
||||
|
||||
/* set the cursor clip rectangle */
|
||||
-static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect )
|
||||
+static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int send_clip_msg )
|
||||
{
|
||||
rectangle_t top_rect;
|
||||
int x, y;
|
||||
@@ -380,8 +380,8 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect
|
||||
}
|
||||
else desktop->cursor.clip = top_rect;
|
||||
|
||||
- if (desktop->cursor.clip_msg)
|
||||
- post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 );
|
||||
+ if (desktop->cursor.clip_msg && send_clip_msg)
|
||||
+ post_desktop_message( desktop, desktop->cursor.clip_msg, 0, 0 );
|
||||
|
||||
/* warp the mouse to be inside the clip rect */
|
||||
x = min( max( desktop->cursor.x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 );
|
||||
@@ -393,7 +393,7 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect
|
||||
static void set_foreground_input( struct desktop *desktop, struct thread_input *input )
|
||||
{
|
||||
if (desktop->foreground_input == input) return;
|
||||
- set_clip_rectangle( desktop, NULL );
|
||||
+ set_clip_rectangle( desktop, NULL, 1 );
|
||||
desktop->foreground_input = input;
|
||||
}
|
||||
|
||||
@@ -3024,7 +3024,7 @@ DECL_HANDLER(set_cursor)
|
||||
if (req->clip_msg && get_top_window_owner(desktop) == current->process)
|
||||
desktop->cursor.clip_msg = req->clip_msg;
|
||||
|
||||
- set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip );
|
||||
+ set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip, 0 );
|
||||
}
|
||||
|
||||
reply->new_x = input->desktop->cursor.x;
|
||||
--
|
||||
2.2.1
|
||||
|
||||
1
patches/server-ClipCursor/definition
Normal file
1
patches/server-ClipCursor/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [33479] Fix cursor clip regression / broken raw input in multiple games
|
||||
Loading…
Reference in New Issue
Block a user