[ros-diffs] [akhaldi] 55259: [COMCTL32] * Sync more of header.c with Wine 1.3.37. Fixes build.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Fri Jan 27 19:22:05 2012
New Revision: 55259

URL: http://svn.reactos.org/svn/reactos?rev=55259&view=rev
Log:
[COMCTL32]
* Sync more of header.c with Wine 1.3.37. Fixes build.

Modified:
    trunk/reactos/dll/win32/comctl32/header.c

Modified: trunk/reactos/dll/win32/comctl32/header.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.c?rev=55259&r1=55258&r2=55259&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Fri Jan 27 19:22:05 2012
@@ -39,7 +39,6 @@
 #include "winnls.h"
 #include "commctrl.h"
 #include "comctl32.h"
-#include "imagelist.h"
 #include "tmschema.h"
 #include "uxtheme.h"
 #include "wine/debug.h"
@@ -384,6 +383,7 @@
 	  /* cnt,txt,img,bmp */
 	UINT cx, tx, ix, bx,
 	     cw, tw, iw, bw;
+        INT img_cx, img_cy;
 	BITMAP bmp;
 
         HEADER_PrepareCallbackItems(infoPtr, iItem, HDI_TEXT|HDI_IMAGE);
@@ -400,8 +400,8 @@
 	    cw = textRect.right - textRect.left + 2 * infoPtr->iMargin;
 	}
 
-	if ((phdi->fmt & HDF_IMAGE) && (infoPtr->himl)) {
-	    iw = infoPtr->himl->cx + 2 * infoPtr->iMargin;
+	if ((phdi->fmt & HDF_IMAGE) && ImageList_GetIconSize( infoPtr->himl, &img_cx, &img_cy )) {
+	    iw = img_cx + 2 * infoPtr->iMargin;
 	    x = &ix;
 	    w = &iw;
 	}
@@ -474,8 +474,8 @@
 
 	    if (iw) {
 	        ImageList_DrawEx (infoPtr->himl, phdi->iImage, hClipDC, 
-	                          ix, r.top + ((INT)rh - infoPtr->himl->cy) / 2,
-	                          infoPtr->himl->cx, infoPtr->himl->cy, CLR_DEFAULT, CLR_DEFAULT, 0);
+	                          ix, r.top + ((INT)rh - img_cy) / 2,
+	                          img_cx, img_cy, CLR_DEFAULT, CLR_DEFAULT, 0);
 	    }
 
 	    DeleteObject(hClipRgn);
@@ -1539,9 +1539,6 @@
 
     Free(infoPtr->order);
 
-    if (infoPtr->himl)
-      ImageList_Destroy (infoPtr->himl);
-
     SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0);
     Free (infoPtr);