From cb7a9792d7c37f7c0407fb9ae465a4a89409412f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 1 May 2021 21:52:24 -0500 Subject: [PATCH] comctl-Listview_DrawItem: Remove patch set. This was fixed upstream by c32720349cd4a6f4c32fdcff6a4cce054fbfe33e. --- ...serve-custom-colors-between-subitems.patch | 54 ------------------- patches/comctl32-Listview_DrawItem/definition | 1 - patches/patchinstall.sh | 16 ------ 3 files changed, 71 deletions(-) delete mode 100644 patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch delete mode 100644 patches/comctl32-Listview_DrawItem/definition diff --git a/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch b/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch deleted file mode 100644 index 3d8bf09b..00000000 --- a/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3497a2faa4ebab67b65bcf99d4ed56baa70ddf96 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 12 Jul 2014 23:58:19 +0200 -Subject: [PATCH] comctl32: Preserve custom colors between subitems. (v2) - ---- - dlls/comctl32/listview.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c -index dba16d13a4c..35cab333b7b 100644 ---- a/dlls/comctl32/listview.c -+++ b/dlls/comctl32/listview.c -@@ -1063,7 +1063,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, const NMLVCUS - textcolor = cd->clrText; - - /* apparently, for selected items, we have to override the returned values */ -- if (!SubItem) -+ if (!SubItem || (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - { - if (cd->nmcd.uItemState & CDIS_SELECTED) - { -@@ -4786,6 +4786,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT - while (iterator_next(subitems)) - { - DWORD subitemstage = CDRF_DODEFAULT; -+ NMLVCUSTOMDRAW temp_nmlvcd; - - /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */ - if (subitems->nItem) -@@ -4813,13 +4814,15 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT - if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) - subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - -- if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) -- prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); -- else if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) -- prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); -+ /* -+ * A selection should neither affect the colors in the post paint notification nor -+ * affect the colors of the next drawn subitem. Copy the structure to prevent this. -+ */ -+ temp_nmlvcd = nmlvcd; -+ prepaint_setup(infoPtr, hdc, &temp_nmlvcd, subitems->nItem); - - if (!(subitemstage & CDRF_SKIPDEFAULT)) -- LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); -+ LISTVIEW_DrawItemPart(infoPtr, &lvItem, &temp_nmlvcd, &pos); - - if (subitemstage & CDRF_NOTIFYPOSTPAINT) - subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd); --- -2.27.0 - diff --git a/patches/comctl32-Listview_DrawItem/definition b/patches/comctl32-Listview_DrawItem/definition deleted file mode 100644 index 267161b4..00000000 --- a/patches/comctl32-Listview_DrawItem/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [38941] Preserve custom colors between subitems for listview control diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c62e890a..f2acc42e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -90,7 +90,6 @@ patch_enable_all () enable_atl_AtlAxDialogBox="$1" enable_bcrypt_ECDHSecretAgreement="$1" enable_cmd_launch_association="$1" - enable_comctl32_Listview_DrawItem="$1" enable_comctl32_rebar_capture="$1" enable_comctl32_version_6="$1" enable_comdlg32_lpstrFileTitle="$1" @@ -324,9 +323,6 @@ patch_enable () cmd-launch-association) enable_cmd_launch_association="$2" ;; - comctl32-Listview_DrawItem) - enable_comctl32_Listview_DrawItem="$2" - ;; comctl32-rebar-capture) enable_comctl32_rebar_capture="$2" ;; @@ -1613,18 +1609,6 @@ if test "$enable_cmd_launch_association" -eq 1; then patch_apply cmd-launch-association/0002-cmd-ftype-failed-to-clear-file-associations.patch fi -# Patchset comctl32-Listview_DrawItem -# | -# | This patchset fixes the following Wine bugs: -# | * [#38941] Preserve custom colors between subitems for listview control -# | -# | Modified files: -# | * dlls/comctl32/listview.c -# | -if test "$enable_comctl32_Listview_DrawItem" -eq 1; then - patch_apply comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch -fi - # Patchset comctl32-rebar-capture # | # | This patchset fixes the following Wine bugs: