Skip to content

W
wine-winehq
Commit 4b25b346 authored by Mikołaj Zalewski's avatar Mikołaj Zalewski Committed by Alexandre Julliard
Browse files
Options

comctl32: header: Make sure no message is sent between PrepareCallbackItems/FreeCallbackItems.

parent c932852b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/comctl32/header.c
View file @ 4b25b346
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment