Mikołaj Zalewski : comctl32: header: Make sure no message is sent between PrepareCallbackItems/ FreeCallbackItems.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 4b25b346ee4127ca39df1c17b0ce91827708a340
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=4b25b346ee4127ca39df1c17...

Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl>
Date:   Thu May 18 21:22:55 2006 +0200

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

---

 dlls/comctl32/header.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 9e37759..fcd2839 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -247,7 +247,6 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT
     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
 	     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
 	    if (oldBkMode != TRANSPARENT)
 	        SetBkMode(hdc, oldBkMode);
         }
+        HEADER_FreeCallbackItems(phdi);
     }/*Ownerdrawn*/
 
-    HEADER_FreeCallbackItems(phdi);
     return phdi->rect.right;
 }