From 6a67b9ef6b67c98572bf4185dc494fa7b6ff2360 Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Mon, 31 Jul 2017 13:10:46 +0000
Subject: [PATCH] [COMCTL32] -Fix some failed tests for TB_GETMETRICS. Add
 support for button spacing.

svn path=/trunk/; revision=75463
---
 reactos/dll/win32/comctl32/toolbar.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c
index 2c7d8bd749e..63d54fdd956 100644
--- a/reactos/dll/win32/comctl32/toolbar.c
+++ b/reactos/dll/win32/comctl32/toolbar.c
@@ -1867,14 +1867,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr)
 	if( bWrap )
 	{
 	    if ( !(btnPtr->fsStyle & BTNS_SEP) )
-	        y += cy;
+	        y += cy + infoPtr->szSpacing.cy;
 	    else
 	    {
                if ( !(infoPtr->dwStyle & CCS_VERT))
                     y += cy + ( (btnPtr->cx > 0 ) ?
                                 btnPtr->cx : SEPARATOR_WIDTH) * 2 /3;
 		else
-		    y += cy;
+		    y += cy + infoPtr->szSpacing.cy;
 
 		/* nSepRows is used to calculate the extra height following  */
 		/* the last row.					     */
@@ -1888,7 +1888,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr)
 		nRows++;
 	}
 	else
-	    x += cx;
+	    x += cx + infoPtr->szSpacing.cx;
     }
 
     /* infoPtr->nRows is the number of rows on the toolbar */
@@ -3660,10 +3660,8 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize)
 static LRESULT
 TOOLBAR_GetMetrics(const TOOLBAR_INFO *infoPtr, TBMETRICS *pMetrics)
 {
-    if (pMetrics == NULL)
-        return FALSE;
-
-    /* TODO: check if cbSize is a valid value */
+    if (pMetrics == NULL || pMetrics->cbSize != sizeof(TBMETRICS))
+        return 0;
 
     if (pMetrics->dwMask & TBMF_PAD)
     {
@@ -3683,7 +3681,7 @@ TOOLBAR_GetMetrics(const TOOLBAR_INFO *infoPtr, TBMETRICS *pMetrics)
         pMetrics->cyButtonSpacing = infoPtr->szSpacing.cy;
     }
 
-    return TRUE;
+    return 0;
 }
 #endif
 
@@ -6250,8 +6248,8 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs)
     infoPtr->szPadding.cx = DEFPAD_CX;
     infoPtr->szPadding.cy = DEFPAD_CY;
 #ifdef __REACTOS__
-    infoPtr->szSpacing.cx = DEFSPACE_CX;
-    infoPtr->szSpacing.cy = DEFSPACE_CY;
+    infoPtr->szSpacing.cx = 0;
+    infoPtr->szSpacing.cy = 0;
     memset(&infoPtr->themeMargins, 0 , sizeof(infoPtr->themeMargins));
 #endif
     infoPtr->iListGap = DEFLISTGAP;