listview: fix alignment tests

Dimitrie O. Paun dpaun at rogers.com
Thu Jan 13 23:58:27 CST 2005


Bug was found by Francois' script.

ChangeLog
    Use the LVCFMT_{LEFT,RIGHT,CENTER} enumeration flags properly.

Index: ./dlls/comctl32/listview.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/listview.c,v
retrieving revision 1.400
diff -u -r1.400 listview.c
--- ./dlls/comctl32/listview.c	9 Jan 2005 16:42:54 -0000	1.400
+++ ./dlls/comctl32/listview.c	14 Jan 2005 05:17:37 -0000
@@ -253,7 +253,7 @@
   BOOL bRedraw;  		/* Turns on/off repaints & invalidations */
   BOOL bAutoarrange;		/* Autoarrange flag when NOT in LVS_AUTOARRANGE */
   BOOL bFocus;
-  BOOL bDoChangeNotify;                /* send change notification messages? */
+  BOOL bDoChangeNotify;         /* send change notification messages? */
   INT nFocusedItem;
   RECT rcFocus;
   DWORD dwStyle;		/* the cached window GWL_STYLE */
@@ -6294,11 +6294,11 @@
 	lphdi->mask |= HDI_FORMAT;
 
 	/* set text alignment (leftmost column must be left-aligned) */
-        if (nColumn == 0 || lpColumn->fmt & LVCFMT_LEFT)
+        if (nColumn == 0 || (lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_LEFT)
             lphdi->fmt |= HDF_LEFT;
-        else if (lpColumn->fmt & LVCFMT_RIGHT)
+        else if ((lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_RIGHT)
             lphdi->fmt |= HDF_RIGHT;
-        else if (lpColumn->fmt & LVCFMT_CENTER)
+        else if ((lpColumn->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_CENTER)
             lphdi->fmt |= HDF_CENTER;
 
         if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)

-- 
Dimi.



More information about the wine-patches mailing list