- Fix some traces.
- The TBM_GET*HOTLIST functions take imagelist ID in wParam.
- Implement TBM_GETSTRING{A,W}.
- Implement undocumented 0x462 message.
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 73d5cf3..defdfe3 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -392,8 +392,8 @@
if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
if (btnPtr->iBitmap == I_IMAGENONE) return FALSE;
- ERR("index %d is not valid, max %d\n",
- btnPtr->iBitmap, infoPtr->nNumBitmaps);
+ ERR("index %d,%d is not valid, max %d\n",
+ HIWORD(btnPtr->iBitmap), LOWORD(btnPtr->iBitmap), infoPtr->nNumBitmaps);
return FALSE;
}
@@ -3290,7 +3290,9 @@
static LRESULT
TOOLBAR_GetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- return (LRESULT)GETDISIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), 0);
+ TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
+ /* UNDOCUMENTED: wParam is actually the ID of the image list to return */
+ return (LRESULT)GETDISIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), wParam);
}
@@ -3308,7 +3310,9 @@
static LRESULT
TOOLBAR_GetHotImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- return (LRESULT)GETHOTIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), 0);
+ TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
+ /* UNDOCUMENTED: wParam is actually the ID of the image list to return */
+ return (LRESULT)GETHOTIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), wParam);
}
@@ -3330,7 +3334,9 @@
static LRESULT
TOOLBAR_GetDefImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- return (LRESULT) GETDEFIMAGELIST(TOOLBAR_GetInfoPtr(hwnd), 0);
+ TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
+ /* UNDOCUMENTED: wParam is actually the ID of the image list to return */
+ return (LRESULT) GETDEFIMAGELIST(TOOLBAR_GetInfoPtr(hwnd), wParam);
}
@@ -4305,6 +4311,12 @@
return (LRESULT)dwTemp;
}
+/* This function differs a bit from what MSDN says it does:
+ * 1. lParam contains extended style flags to OR with current style
+ * (MSDN isn't clear on the OR bit)
+ * 2. wParam appears to contain extended style flags to be reset
+ * (MSDN says that this parameter is reserved)
+ */
static LRESULT
TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
@@ -4312,6 +4324,7 @@
DWORD dwTemp;
dwTemp = infoPtr->dwExStyle;
+ infoPtr->dwExStyle &= ~wParam;
infoPtr->dwExStyle |= (DWORD)lParam;
TRACE("new style 0x%08lx\n", infoPtr->dwExStyle);
@@ -4653,6 +4666,57 @@
return iOldVersion;
}
+
+static LRESULT
+TOOLBAR_GetStringA (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+ TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
+ WORD iString = HIWORD(wParam);
+ WORD buffersize = LOWORD(wParam);
+ LPSTR str = (LPSTR)lParam;
+ LRESULT ret = -1;
+
+ TRACE("hwnd=%p, iString=%d, buffersize=%d, string=%p\n", hwnd, iString, buffersize, str);
+
+ if (iString < infoPtr->nNumStrings)
+ {
+ ret = WideCharToMultiByte(CP_ACP, 0, infoPtr->strings[iString], -1, str, buffersize, NULL, NULL);
+
+ TRACE("returning %s\n", debugstr_a(str));
+ }
+ else
+ ERR("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1);
+
+ return ret;
+}
+
+
+static LRESULT
+TOOLBAR_GetStringW (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+ TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
+ WORD iString = HIWORD(wParam);
+ WORD len = LOWORD(wParam)/sizeof(WCHAR) - 1;
+ LPWSTR str = (LPWSTR)lParam;
+ LRESULT ret = -1;
+
+ TRACE("hwnd=%p, iString=%d, buffersize=%d, string=%p\n", hwnd, iString, LOWORD(wParam), str);
+
+ if (iString < infoPtr->nNumStrings)
+ {
+ len = min(len, strlenW(infoPtr->strings[iString]));
+ ret = (len+1)*sizeof(WCHAR);
+ memcpy(str, infoPtr->strings[iString], ret);
+ str[len] = '\0';
+
+ TRACE("returning %s\n", debugstr_w(str));
+ }
+ else
+ ERR("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1);
+
+ return ret;
+}
+
static LRESULT TOOLBAR_Unkwn45D(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
FIXME("hwnd=%p wParam %08x lParam %08lx stub!\n", hwnd, wParam, lParam);
@@ -4713,12 +4777,23 @@
static LRESULT TOOLBAR_Unkwn460(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
+ FIXME("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
InvalidateRect(hwnd, NULL, TRUE);
return 0;
}
+/* UNDOCUMENTED MESSAGE: This returns the number of maximum number
+ * of image lists associated with the various states. */
+static LRESULT TOOLBAR_Unkwn462(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+ TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
+
+ TRACE("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
+
+ return max(infoPtr->cimlDef, max(infoPtr->cimlHot, infoPtr->cimlDis));
+}
+
static LRESULT
TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
@@ -4775,7 +4850,7 @@
static LRESULT TOOLBAR_Unkwn464(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
+ FIXME("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
InvalidateRect(hwnd, NULL, TRUE);
return 1;
@@ -4789,6 +4864,8 @@
DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
LOGFONTA logFont;
+ TRACE("hwnd = %p\n", hwnd);
+
/* initialize info structure */
infoPtr->nButtonHeight = 22;
infoPtr->nButtonWidth = 24;
@@ -5867,6 +5944,12 @@
case TB_GETSTATE:
return TOOLBAR_GetState (hwnd, wParam, lParam);
+ case TB_GETSTRINGA:
+ return TOOLBAR_GetStringA (hwnd, wParam, lParam);
+
+ case TB_GETSTRINGW:
+ return TOOLBAR_GetStringW (hwnd, wParam, lParam);
+
case TB_GETSTYLE:
return TOOLBAR_GetStyle (hwnd, wParam, lParam);
@@ -6015,6 +6098,9 @@
case TB_UNKWN460:
return TOOLBAR_Unkwn460(hwnd, wParam, lParam);
+ case TB_UNKWN462:
+ return TOOLBAR_Unkwn462(hwnd, wParam, lParam);
+
case TB_UNKWN463:
return TOOLBAR_Unkwn463 (hwnd, wParam, lParam);
diff --git a/include/commctrl.h b/include/commctrl.h
index 293a27d..3ed5509 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1119,6 +1119,7 @@
#define TB_UNKWN45D (WM_USER+93)
#define TB_UNKWN45E (WM_USER+94)
#define TB_UNKWN460 (WM_USER+96)
+#define TB_UNKWN462 (WM_USER+98)
#define TB_UNKWN463 (WM_USER+99)
#define TB_UNKWN464 (WM_USER+100)
