[ros-diffs] [akhaldi] 75878: [COMCTL32] Addendum to r75862. CORE-13762

Author: akhaldi
Date: Sun Sep 17 22:54:01 2017
New Revision: 75878

URL: http://svn.reactos.org/svn/reactos?rev=75878&view=rev
Log:
[COMCTL32] Addendum to r75862. CORE-13762

Modified:
    trunk/reactos/dll/win32/comctl32/idc_copy.cur
    trunk/reactos/dll/win32/comctl32/idc_divider.cur
    trunk/reactos/dll/win32/comctl32/idc_divideropen.cur
    trunk/reactos/dll/win32/comctl32/idc_movebutton.cur
    trunk/reactos/dll/win32/comctl32/listview.c
    trunk/reactos/dll/win32/comctl32/toolbar.c

Modified: trunk/reactos/dll/win32/comctl32/idc_copy.cur
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_copy...
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/dll/win32/comctl32/idc_divider.cur
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_divi...
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/dll/win32/comctl32/idc_divideropen.cur
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_divi...
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/dll/win32/comctl32/idc_movebutton.cur
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_move...
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/dll/win32/comctl32/listview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listview...
==============================================================================
--- trunk/reactos/dll/win32/comctl32/listview.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/listview.c	[iso-8859-1] Sun Sep 17 22:54:01 2017
@@ -2221,9 +2221,8 @@
    SelectObject(hdc, hOldFont);
     }
     else
-    {
-	LISTVIEW_DrawFocusRect(infoPtr, hdc);
-    }
+        LISTVIEW_InvalidateItem(infoPtr, infoPtr->nFocusedItem);
+
 done:
     ReleaseDC(infoPtr->hwndSelf, hdc);
 }

Modified: trunk/reactos/dll/win32/comctl32/toolbar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar....
==============================================================================
--- trunk/reactos/dll/win32/comctl32/toolbar.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/toolbar.c	[iso-8859-1] Sun Sep 17 22:54:01 2017
@@ -1867,14 +1867,22 @@
    if( bWrap )
    {
        if ( !(btnPtr->fsStyle & BTNS_SEP) )
+#ifdef __REACTOS__
            y += cy + infoPtr->szSpacing.cy;
+#else
+	        y += cy;
+#endif
        else
        {
                if ( !(infoPtr->dwStyle & CCS_VERT))
                     y += cy + ( (btnPtr->cx > 0 ) ?
                                 btnPtr->cx : SEPARATOR_WIDTH) * 2 /3;
    	else
+#ifdef __REACTOS__
    	    y += cy + infoPtr->szSpacing.cy;
+#else
+		    y += cy;
+#endif

/* nSepRows is used to calculate the extra height following  */
    	/* the last row.					     */
@@ -1888,7 +1896,11 @@
    	nRows++;
    }
    else
+#ifdef __REACTOS__
        x += cx + infoPtr->szSpacing.cx;
+#else
+	    x += cx;
+#endif
     }

/* infoPtr->nRows is the number of rows on the toolbar */
@@ -4485,7 +4497,7 @@
     short width = (short)LOWORD(lParam);
     short height = (short)HIWORD(lParam);

-    TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", infoPtr->hwndSelf, wParam, lParam);
+    TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height);

if (wParam != 0)
         FIXME("wParam is %ld. Perhaps image list index?\n", wParam);