diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 558bfa1fff4..9121266306a 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -5155,16 +5155,13 @@ TOOLBAR_GetStringW (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPWSTR str)
     return ret;
 }
 
-/* UNDOCUMENTED MESSAGE: This appears to set some kind of size. Perhaps it
- * is the maximum size of the toolbar? */
-static LRESULT TOOLBAR_Unkwn45D(HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT TOOLBAR_SetBoundingSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
     SIZE * pSize = (SIZE*)lParam;
     FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy);
     return 0;
 }
 
-
 /* This is an extended version of the TB_SETHOTITEM message. It allows the
  * caller to specify a reason why the hot item changed (rather than just the
  * HICF_OTHER that TB_SETHOTITEM sends). */
@@ -6734,8 +6731,8 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	case TB_SETUNICODEFORMAT:
 	    return TOOLBAR_SetUnicodeFormat (infoPtr, wParam);
 
-	case TB_UNKWN45D:
-	    return TOOLBAR_Unkwn45D(hwnd, wParam, lParam);
+	case TB_SETBOUNDINGSIZE:
+	    return TOOLBAR_SetBoundingSize(hwnd, wParam, lParam);
 
 	case TB_SETHOTITEM2:
 	    return TOOLBAR_SetHotItem2 (infoPtr, wParam, lParam);
diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c
index c0acd82907c..4f8e56f1ca5 100644
--- a/dlls/user32/spy.c
+++ b/dlls/user32/spy.c
@@ -1559,8 +1559,9 @@ static const USER_MSG toolbar_array[] = {
           USM(TB_MAPACCELERATORW       ,0),
           USM(TB_GETSTRINGW            ,0),
           USM(TB_GETSTRINGA            ,0),
-          USM(TB_UNKWN45D              ,8),
+          USM(TB_SETBOUNDINGSIZE       ,8),
           USM(TB_SETHOTITEM2           ,0),
+          USM(TB_HASACCELERATOR        ,0),
           USM(TB_SETLISTGAP            ,0),
           USM(TB_GETIMAGELISTCOUNT     ,0),
           USM(TB_GETIDEALSIZE          ,8),
diff --git a/include/commctrl.h b/include/commctrl.h
index 5029e7797d6..aa33cabdab2 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1213,14 +1213,15 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r',
 #define TB_GETSTRINGW            (WM_USER+91)
 #define TB_GETSTRINGA            (WM_USER+92)
 #define TB_GETSTRING             WINELIB_NAME_AW(TB_GETSTRING)
-
-/* undocumented messages in Toolbar */
-#ifdef __WINESRC__
-#define TB_UNKWN45D              (WM_USER+93)
+#define TB_SETBOUNDINGSIZE       (WM_USER+93)
 #define TB_SETHOTITEM2           (WM_USER+94)
+#define TB_HASACCELERATOR        (WM_USER+95)
 #define TB_SETLISTGAP            (WM_USER+96)
 #define TB_GETIMAGELISTCOUNT     (WM_USER+98)
 #define TB_GETIDEALSIZE          (WM_USER+99)
+
+/* undocumented messages in Toolbar */
+#ifdef __WINESRC__
 #define TB_UNKWN464              (WM_USER+100)
 #endif