Mikołaj Zalewski : comctl32: toolbar: Fix IDB_STD_VIEW_* icons count (with testcase).
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Sep 25 09:46:48 CDT 2006
Module: wine
Branch: master
Commit: 9e390091db366826da0e87643e62d2e7f0d773aa
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e390091db366826da0e87643e62d2e7f0d773aa
Author: Mikołaj Zalewski <mikolaj at zalewski.pl>
Date: Wed Sep 20 17:46:08 2006 +0200
comctl32: toolbar: Fix IDB_STD_VIEW_* icons count (with testcase).
---
dlls/comctl32/tests/toolbar.c | 31 +++++++++++++++++++++++++++++++
dlls/comctl32/toolbar.c | 2 +-
2 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c
index bfcbd67..7c8bade 100644
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -149,6 +149,7 @@ static void test_add_bitmap(void)
TBADDBITMAP bmp128;
TBADDBITMAP bmp80;
TBADDBITMAP stdsmall;
+ TBADDBITMAP addbmp;
INT ret;
/* empty 128x15 bitmap */
@@ -240,6 +241,36 @@ static void test_add_bitmap(void)
UpdateWindow(hToolbar);
CHECK_IMAGELIST_TODO_COUNT_SIZE(28, 16, 15);
+ /* check standard bitmaps */
+ addbmp.hInst = HINST_COMMCTRL;
+ addbmp.nID = IDB_STD_SMALL_COLOR;
+ rebuild_toolbar(&hToolbar);
+ ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n");
+ CHECK_IMAGELIST(15, 16, 15);
+ addbmp.nID = IDB_STD_LARGE_COLOR;
+ rebuild_toolbar(&hToolbar);
+ ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n");
+ CHECK_IMAGELIST(15, 24, 24);
+
+ addbmp.nID = IDB_VIEW_SMALL_COLOR;
+ rebuild_toolbar(&hToolbar);
+ ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n");
+ CHECK_IMAGELIST(12, 16, 15);
+ addbmp.nID = IDB_VIEW_LARGE_COLOR;
+ rebuild_toolbar(&hToolbar);
+ ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n");
+ CHECK_IMAGELIST(12, 24, 24);
+
+ addbmp.nID = IDB_HIST_SMALL_COLOR;
+ rebuild_toolbar(&hToolbar);
+ ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n");
+ CHECK_IMAGELIST(5, 16, 15);
+ addbmp.nID = IDB_HIST_LARGE_COLOR;
+ rebuild_toolbar(&hToolbar);
+ ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n");
+ CHECK_IMAGELIST(5, 24, 24);
+
+
DestroyWindow(hToolbar);
}
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 840a08a..b6b82cd 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -2591,7 +2591,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa
if ((lpAddBmp->nID & ~1) == IDB_STD_SMALL_COLOR)
nButtons = 15;
else if ((lpAddBmp->nID & ~1) == IDB_VIEW_SMALL_COLOR)
- nButtons = 13;
+ nButtons = 12;
else if ((lpAddBmp->nID & ~1) == IDB_HIST_SMALL_COLOR)
nButtons = 5;
else
More information about the wine-cvs
mailing list