commit 4718b6d09da43db88fc8ff92a23e3031b25036ad
author Eric Kohl <ekohl@rz-online.de> Wed Dec 13 01:52:23 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Dec 13 01:52:23 2000 +0000
tree 5052d266baa68cdea67f722819808a7fe8d9a042
parent 7c55d77067e21a2132c521a141bd31e4ff4c4888

Fixed crash of WinZip 8.0 due to invalid image list handle.

dlls/comctl32/header.c

diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 2b0e02f..fd04115 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -144,6 +144,8 @@
     RECT r;
     INT  oldBkMode;
 
+    TRACE("DrawItem(iItem %d bHotTrack %d)\n", iItem, bHotTrack);
+
     if (!infoPtr->bRectsValid)
     	HEADER_SetItemBounds(hwnd);
     
@@ -275,7 +277,7 @@
 	    DeleteDC (hdcBitmap);
 	}
 
-	if (phdi->fmt & HDF_IMAGE) {
+	if ((phdi->fmt & HDF_IMAGE) && (infoPtr->himl)) {
 	  r.left +=3;
 	  /* FIXME: (r.bottom- (infoPtr->himl->cy))/2 should horicontal center the image
 	     It looks like it doesn't work as expected*/
@@ -1025,13 +1027,14 @@
 
 
 static LRESULT
-HEADER_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
+HEADER_SetImageList (HWND hwnd, HIMAGELIST himl)
 {
     HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
     HIMAGELIST himlOld;
 
+    TRACE("(himl 0x%x)\n", (int)himl);
     himlOld = infoPtr->himl;
-    infoPtr->himl = (HIMAGELIST)lParam;
+    infoPtr->himl = himl;
 
     /* FIXME: Refresh needed??? */
 
@@ -1395,7 +1398,9 @@
 	    HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
             ReleaseDC (hwnd, hdc);
 			if (HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem, HDI_WIDTH))
+	    {
 		infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
+	    }
 	    else {
 		nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
 		if (nWidth < 0)
@@ -1667,7 +1672,7 @@
 /*	case HDM_SETHOTDIVIDER: */
 
 	case HDM_SETIMAGELIST:
-	    return HEADER_SetImageList (hwnd, wParam, lParam);
+	    return HEADER_SetImageList (hwnd, (HIMAGELIST)lParam);
 
 	case HDM_SETITEMA:
 	    return HEADER_SetItemA (hwnd, wParam, lParam);