Daniel Jelinski : comctl32/listview: Fix subitem drawing.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8257ab9a766c20324aadbe2eaca55ddeaf879a9e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8257ab9a766c20324aadbe2eaca55ddeaf879a9e

Author: Daniel Jelinski <djelinski1 at gmail.com>
Date:   Sat Jan  5 22:46:12 2013 +0100

comctl32/listview: Fix subitem drawing.

lpColumnInfo->fmt & LVCFMT_IMAGE is supposed to mean that header item has
an image. It is not supposed to mean that all items in that column
should reserve space for an icon if they don't have any.

---

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

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index a67b637..d670a9b 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -2363,7 +2363,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW
 	    Icon.top    = Box.top;
 	    Icon.right  = Icon.left;
 	    if (infoPtr->himlSmall &&
-                (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) ||
+                (!lpColumnInfo || lpLVItem->iSubItem == 0 ||
                  ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK)))
 		Icon.right += infoPtr->iconSize.cx;
 	    Icon.bottom = Icon.top + infoPtr->iconSize.cy;