Added comctrl-rebar-capture patchset

This commit is contained in:
Alistair Leslie-Hughes 2019-02-28 16:24:33 +11:00
parent 06ad40cfd0
commit e108b600b5
3 changed files with 55 additions and 0 deletions

View File

@ -0,0 +1,35 @@
From 37c7da9a71e327dfe86c0c550cabc50968abd04d Mon Sep 17 00:00:00 2001
From: Andrew Shadura <bugzilla@tut.by>
Date: Fri, 1 Feb 2019 08:38:10 +1100
Subject: [PATCH] comctl32: Fixed rebar behaviour when there's capture and no
drag
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=14750
---
dlls/comctl32/rebar.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index aaa1047..29fc854 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -3119,7 +3119,15 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam)
int yPtMove = (infoPtr->dwStyle & CCS_VERT ? ptMove.x : ptMove.y);
if (GetCapture() != infoPtr->hwndSelf)
- ERR("We are dragging but haven't got capture?!?\n");
+ {
+ if (infoPtr->fStatus & BEGIN_DRAG_ISSUED)
+ {
+ REBAR_Notify_NMREBAR (infoPtr, infoPtr->iGrabbedBand, RBN_ENDDRAG);
+ infoPtr->fStatus &= ~BEGIN_DRAG_ISSUED;
+ }
+ infoPtr->iGrabbedBand = -1;
+ return 0;
+ }
band = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand);
--
1.9.1

View File

@ -0,0 +1 @@
Fixes: [14750] comctl32: Fixed rebar behaviour when there's capture and no drag.

View File

@ -98,6 +98,7 @@ patch_enable_all ()
enable_avifile_dll16_AVIStreamGetFrame="$1"
enable_bcrypt_BCryptSecretAgreement="$1"
enable_comctl32_Listview_DrawItem="$1"
enable_comctrl_rebar_capture="$1"
enable_comdlg32_lpstrFileTitle="$1"
enable_configure_Absolute_RPATH="$1"
enable_crypt32_CMS_Certificates="$1"
@ -446,6 +447,9 @@ patch_enable ()
comctl32-Listview_DrawItem)
enable_comctl32_Listview_DrawItem="$2"
;;
comctrl-rebar-capture)
enable_comctrl_rebar_capture="$2"
;;
comdlg32-lpstrFileTitle)
enable_comdlg32_lpstrFileTitle="$2"
;;
@ -2479,6 +2483,21 @@ if test "$enable_comctl32_Listview_DrawItem" -eq 1; then
) >> "$patchlist"
fi
# Patchset comctrl-rebar-capture
# |
# | This patchset fixes the following Wine bugs:
# | * [#14750] comctl32: Fixed rebar behaviour when there's capture and no drag.
# |
# | Modified files:
# | * dlls/comctl32/rebar.c
# |
if test "$enable_comctrl_rebar_capture" -eq 1; then
patch_apply comctrl-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch
(
printf '%s\n' '+ { "Andrew Shadura", "comctl32: Fixed rebar behaviour when there'\''s capture and no drag.", 1 },';
) >> "$patchlist"
fi
# Patchset comdlg32-lpstrFileTitle
# |
# | This patchset fixes the following Wine bugs: