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

Added patch to remove dead code from SCROLL_TrackScrollBar.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-01-04 22:30:27 +01:00
parent b05a1e266f
commit bf54f728cc
5 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/patchinstall.sh
View File

@@ -278,6 +278,7 @@ patch_enable_all ()
enable_shlwapi_AssocGetPerceivedType="$1"
enable_shlwapi_SHMapHandle="$1"
enable_shlwapi_UrlCombine="$1"
enable_user32_Dead_Code="$1"
enable_user32_DeferWindowPos="$1"
enable_user32_Dialog_Paint_Event="$1"
enable_user32_DrawTextExW="$1"
@@ -947,6 +948,9 @@ patch_enable ()
shlwapi-UrlCombine)
enable_shlwapi_UrlCombine="$2"
;;
user32-Dead_Code)
enable_user32_Dead_Code="$2"
;;
user32-DeferWindowPos)
enable_user32_DeferWindowPos="$2"
;;
@@ -5505,6 +5509,21 @@ if test "$enable_shlwapi_UrlCombine" -eq 1; then
) >> "$patchlist"
fi
# Patchset user32-Dead_Code
# |
# | This patchset fixes the following Wine bugs:
# | * [#39558] Remove dead code from SCROLL_TrackScrollBar
# |
# | Modified files:
# | * dlls/user32/scroll.c
# |
if test "$enable_user32_Dead_Code" -eq 1; then
patch_apply user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch
(
echo '+ { "Jarkko Korpi", "user32: Remove dead code from SCROLL_TrackScrollBar.", 1 },';
) >> "$patchlist"
fi
# Patchset user32-DeferWindowPos
# |
# | This patchset fixes the following Wine bugs:

35
patches/user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch Normal file
View File

@@ -0,0 +1,35 @@
From 7fa97568c8aadc5b2d27dace09946efe403f0367 Mon Sep 17 00:00:00 2001
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
Date: Mon, 14 Dec 2015 10:49:25 +0200
Subject: user32: Remove dead code from SCROLL_TrackScrollBar.
---
dlls/user32/scroll.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c
index be205ef..b28ee44 100644
--- a/dlls/user32/scroll.c
+++ b/dlls/user32/scroll.c
@@ -1096,7 +1096,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt )
{
MSG msg;
- INT xoffset = 0, yoffset = 0;
if (scrollbar != SB_CTL)
{
@@ -1117,8 +1116,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt )
msg.message == WM_MOUSEMOVE ||
(msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER))
{
- pt.x = (short)LOWORD(msg.lParam) + xoffset;
- pt.y = (short)HIWORD(msg.lParam) + yoffset;
+ pt.x = (short)LOWORD(msg.lParam);
+ pt.y = (short)HIWORD(msg.lParam);
SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt );
}
else
--
2.6.4

1
patches/user32-Dead_Code/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: [39558] Remove dead code from SCROLL_TrackScrollBar