From 4b25b346ee4127ca39df1c17b0ce91827708a340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Zalewski?= <mikolaj@zalewski.pl> Date: Thu, 18 May 2006 21:22:55 +0200 Subject: [PATCH] comctl32: header: Make sure no message is sent between PrepareCallbackItems/FreeCallbackItems. --- dlls/comctl32/header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 9e3775959df..fcd2839b382 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -247,7 +247,6 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack) if (r.right - r.left == 0) return phdi->rect.right; - HEADER_PrepareCallbackItems(hwnd, iItem, HDI_TEXT|HDI_IMAGE); if (theme != NULL) { int state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); @@ -319,6 +318,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack) cw, tw, iw, bw; BITMAP bmp; + HEADER_PrepareCallbackItems(hwnd, iItem, HDI_TEXT|HDI_IMAGE); cw = tw = iw = bw = 0; rw = r.right - r.left; rh = r.bottom - r.top; @@ -434,9 +434,9 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack) if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); } + HEADER_FreeCallbackItems(phdi); }/*Ownerdrawn*/ - HEADER_FreeCallbackItems(phdi); return phdi->rect.right; } -- GitLab