comdlg32: Set MAXTEXTROWS of the toolbar in the file dialog to zero.

This commit is contained in:
Rein Klazes 2009-07-28 12:19:20 +02:00 committed by Alexandre Julliard
parent d61889ab7c
commit 1f825a3631
2 changed files with 25 additions and 0 deletions

View File

@ -1383,6 +1383,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
/* FIXME: use TB_LOADIMAGES when implemented */
/* SendMessageW(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/
SendMessageW(fodInfos->DlgInfos.hwndTB, TB_SETMAXTEXTROWS, 0, 0);
SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba[0]);
SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 1, (LPARAM) &tba[1]);

View File

@ -29,6 +29,29 @@
/* ##### */
static void toolbarcheck( HWND hDlg)
{
/* test toolbar properties */
/* bug #10532 */
int maxtextrows;
HWND ctrl;
DWORD ret;
char classname[20];
for( ctrl = GetWindow( hDlg, GW_CHILD);
ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) {
GetClassName( ctrl, classname, 10);
classname[7] = '\0';
if( !strcmp( classname, "Toolbar")) break;
}
ok( ctrl != NULL, "could not get the toolbar control\n");
ret = SendMessage( ctrl, TB_ADDSTRING, 0, (LPARAM)"winetestwinetest\0\0");
ok( ret == 0, "addstring returned %d (expected 0)\n", ret);
maxtextrows = SendMessage( ctrl, TB_GETTEXTROWS, 0, 0);
ok( maxtextrows == 0, "Get(Max)TextRows returned %d (expected 0)\n", maxtextrows);
}
static UINT_PTR CALLBACK OFNHookProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
LPNMHDR nmh;
@ -49,6 +72,7 @@ static UINT_PTR CALLBACK OFNHookProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM
ok(ret > 0, "CMD_GETFOLDERIDLIST not implemented\n");
if (ret > 5)
ok(buf[0] == 0x66 && buf[1] == 0x66, "CMD_GETFOLDERIDLIST: The buffer was touched on failure\n");
toolbarcheck( GetParent(hDlg));
}
}