September 2006 - Wine-Commits

Mikołaj Zalewski : comctl32: toolbar: Fix the return code of TB_ADDBITMAP.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 2fa45673f821c90268f33845c3d2f750142c12a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2fa45673f821c90268f3384… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 20 17:52:24 2006 +0200 comctl32: toolbar: Fix the return code of TB_ADDBITMAP. --- dlls/comctl32/tests/toolbar.c | 20 ++++++++++---------- dlls/comctl32/toolbar.c | 13 ++++++++++++- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 7c8bade..46a8c65 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -173,22 +173,22 @@ static void test_add_bitmap(void) CHECK_IMAGELIST(13, 16, 15); /* adding the same bitmap will simply return the index of the already loaded block */ ret = SendMessageA(hToolbar, TB_ADDBITMAP, 8, (LPARAM)&bmp128); - todo_wine ok(ret == 0, "TB_ADDBITMAP - unexpected return %d\n", ret); - CHECK_IMAGELIST_TODO_COUNT(13, 16, 15); + ok(ret == 0, "TB_ADDBITMAP - unexpected return %d\n", ret); + CHECK_IMAGELIST(13, 16, 15); ret = SendMessageA(hToolbar, TB_ADDBITMAP, 5, (LPARAM)&bmp80); - todo_wine ok(ret == 8, "TB_ADDBITMAP - unexpected return %d\n", ret); - CHECK_IMAGELIST_TODO_COUNT(13, 16, 15); + ok(ret == 8, "TB_ADDBITMAP - unexpected return %d\n", ret); + CHECK_IMAGELIST(13, 16, 15); /* even if we increase the wParam */ ret = SendMessageA(hToolbar, TB_ADDBITMAP, 55, (LPARAM)&bmp80); - todo_wine ok(ret == 8, "TB_ADDBITMAP - unexpected return %d\n", ret); - CHECK_IMAGELIST_TODO_COUNT(13, 16, 15); + ok(ret == 8, "TB_ADDBITMAP - unexpected return %d\n", ret); + CHECK_IMAGELIST(13, 16, 15); /* when the wParam is smaller than the bitmaps count but non-zero, all the bitmaps will be added*/ rebuild_toolbar(&hToolbar); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 3, (LPARAM)&bmp128) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(8, 16, 15); ret = SendMessageA(hToolbar, TB_ADDBITMAP, 5, (LPARAM)&bmp80); - todo_wine ok(ret == 3, "TB_ADDBITMAP - unexpected return %d\n", ret); + ok(ret == 3, "TB_ADDBITMAP - unexpected return %d\n", ret); /* the returned value is misleading - id 8 is the id of the first icon from bmp80 */ CHECK_IMAGELIST(13, 16, 15); @@ -198,7 +198,7 @@ static void test_add_bitmap(void) ok(ret == 0, "TB_ADDBITMAP - unexpected return %d\n", ret); CHECK_IMAGELIST(8, 16, 15); ret = SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&bmp80); - todo_wine ok(ret == -143, "TB_ADDBITMAP - unexpected return %d\n", ret); + ok(ret == -143, "TB_ADDBITMAP - unexpected return %d\n", ret); CHECK_IMAGELIST(13, 16, 15); /* for zero only one bitmap will be added */ @@ -230,14 +230,14 @@ static void test_add_bitmap(void) ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&bmp128) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(6, 20, 20); ret = SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&bmp80); - todo_wine ok(ret == 1, "TB_ADDBITMAP - unexpected return %d\n", ret); + ok(ret == 1, "TB_ADDBITMAP - unexpected return %d\n", ret); CHECK_IMAGELIST(10, 20, 20); /* the icons can be resized - an UpdateWindow is needed as this probably happens during WM_PAINT */ ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(8, 8)) == TRUE, "TB_SETBITMAPSIZE failed\n"); UpdateWindow(hToolbar); CHECK_IMAGELIST_TODO_COUNT_SIZE(26, 8, 8); /* loading a standard bitmaps automatically resizes the icons */ - todo_wine ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&stdsmall) == 2, "TB_ADDBITMAP - unexpected return\n"); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&stdsmall) == 2, "TB_ADDBITMAP - unexpected return\n"); UpdateWindow(hToolbar); CHECK_IMAGELIST_TODO_COUNT_SIZE(28, 16, 15); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4222d15..f7c5aae 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2580,6 +2580,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa LPTBADDBITMAP lpAddBmp = (LPTBADDBITMAP)lParam; TBITMAP_INFO info; INT nIndex = 0, nCount; + INT iSumButtons, i; HBITMAP hbmLoad; HIMAGELIST himlDef; @@ -2652,6 +2653,16 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa info.nID = lpAddBmp->nID; TRACE("adding %d bitmaps!\n", info.nButtons); } + + /* check if the bitmap is already loaded and compute iSumButtons */ + iSumButtons = 0; + for (i = 0; i < infoPtr->nNumBitmapInfos; i++) + { + if (infoPtr->bitmaps[i].hInst == info.hInst && + infoPtr->bitmaps[i].nID == info.nID) + return iSumButtons; + iSumButtons += infoPtr->bitmaps[i].nButtons; + } if (!infoPtr->cimlDef) { /* create new default image list */ @@ -2733,7 +2744,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa InvalidateRect(hwnd, NULL, TRUE); - return nIndex; + return iSumButtons; }

1 0

Mikołaj Zalewski : comctl32: toolbar: Simplify the TOOLBAR_AddButton.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 12d3235edc1b81eaae61435aa7d9db49ba12f64a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12d3235edc1b81eaae61435… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 20 17:49:35 2006 +0200 comctl32: toolbar: Simplify the TOOLBAR_AddButton. --- dlls/comctl32/toolbar.c | 142 +++++++++++++++++------------------------------ 1 files changed, 50 insertions(+), 92 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b6b82cd..4222d15 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2578,7 +2578,8 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPTBADDBITMAP lpAddBmp = (LPTBADDBITMAP)lParam; - INT nIndex = 0, nButtons, nCount; + TBITMAP_INFO info; + INT nIndex = 0, nCount; HBITMAP hbmLoad; HIMAGELIST himlDef; @@ -2588,16 +2589,38 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa if (lpAddBmp->hInst == HINST_COMMCTRL) { - if ((lpAddBmp->nID & ~1) == IDB_STD_SMALL_COLOR) - nButtons = 15; - else if ((lpAddBmp->nID & ~1) == IDB_VIEW_SMALL_COLOR) - nButtons = 12; - else if ((lpAddBmp->nID & ~1) == IDB_HIST_SMALL_COLOR) - nButtons = 5; - else - return -1; + info.hInst = COMCTL32_hModule; + switch (lpAddBmp->nID) + { + case IDB_STD_SMALL_COLOR: + info.nButtons = 15; + info.nID = IDB_STD_SMALL; + break; + case IDB_STD_LARGE_COLOR: + info.nButtons = 15; + info.nID = IDB_STD_LARGE; + break; + case IDB_VIEW_SMALL_COLOR: + info.nButtons = 12; + info.nID = IDB_VIEW_SMALL; + break; + case IDB_VIEW_LARGE_COLOR: + info.nButtons = 12; + info.nID = IDB_VIEW_LARGE; + break; + case IDB_HIST_SMALL_COLOR: + info.nButtons = 5; + info.nID = IDB_HIST_SMALL; + break; + case IDB_HIST_LARGE_COLOR: + info.nButtons = 5; + info.nID = IDB_HIST_LARGE; + break; + default: + return -1; + } - TRACE ("adding %d internal bitmaps!\n", nButtons); + TRACE ("adding %d internal bitmaps!\n", info.nButtons); /* Windows resize all the buttons to the size of a newly added standard image */ if (lpAddBmp->nID & 1) @@ -2624,8 +2647,10 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa } else { - nButtons = (INT)wParam; - TRACE ("adding %d bitmaps!\n", nButtons); + info.nButtons = (INT)wParam; + info.hInst = lpAddBmp->hInst; + info.nID = lpAddBmp->nID; + TRACE("adding %d bitmaps!\n", info.nButtons); } if (!infoPtr->cimlDef) { @@ -2633,7 +2658,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa TRACE ("creating default image list!\n"); himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - ILC_COLORDDB | ILC_MASK, nButtons, 2); + ILC_COLORDDB | ILC_MASK, info.nButtons, 2); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0); infoPtr->himlInt = himlDef; } @@ -2649,7 +2674,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa nCount = ImageList_GetImageCount(himlDef); /* Add bitmaps to the default image list */ - if (lpAddBmp->hInst == NULL) + if (lpAddBmp->hInst == NULL) /* a handle was passed */ { BITMAP bmp; HBITMAP hOldBitmapBitmap, hOldBitmapLoad; @@ -2676,83 +2701,16 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa SelectObject (hdcBitmap, hOldBitmapBitmap); DeleteDC (hdcImage); DeleteDC (hdcBitmap); - - nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - } - else if (lpAddBmp->hInst == HINST_COMMCTRL) - { - /* Add system bitmaps */ - switch (lpAddBmp->nID) - { - case IDB_STD_SMALL_COLOR: - hbmLoad = CreateMappedBitmap (COMCTL32_hModule, - IDB_STD_SMALL, 0, NULL, 0); - nIndex = ImageList_AddMasked (himlDef, - hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - break; - - case IDB_STD_LARGE_COLOR: - hbmLoad = CreateMappedBitmap (COMCTL32_hModule, - IDB_STD_LARGE, 0, NULL, 0); - nIndex = ImageList_AddMasked (himlDef, - hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - break; - - case IDB_VIEW_SMALL_COLOR: - hbmLoad = CreateMappedBitmap (COMCTL32_hModule, - IDB_VIEW_SMALL, 0, NULL, 0); - nIndex = ImageList_AddMasked (himlDef, - hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - break; - - case IDB_VIEW_LARGE_COLOR: - hbmLoad = CreateMappedBitmap (COMCTL32_hModule, - IDB_VIEW_LARGE, 0, NULL, 0); - nIndex = ImageList_AddMasked (himlDef, - hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - break; - - case IDB_HIST_SMALL_COLOR: - hbmLoad = CreateMappedBitmap (COMCTL32_hModule, - IDB_HIST_SMALL, 0, NULL, 0); - nIndex = ImageList_AddMasked (himlDef, - hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - break; - - case IDB_HIST_LARGE_COLOR: - hbmLoad = CreateMappedBitmap (COMCTL32_hModule, - IDB_HIST_LARGE, 0, NULL, 0); - nIndex = ImageList_AddMasked (himlDef, - hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - break; - - default: - nIndex = ImageList_GetImageCount (himlDef); - ERR ("invalid imagelist!\n"); - break; - } } else - { - hbmLoad = CreateMappedBitmap(lpAddBmp->hInst, lpAddBmp->nID, 0, NULL, 0); - nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); - DeleteObject (hbmLoad); - } + hbmLoad = CreateMappedBitmap(info.hInst, info.nID, 0, NULL, 0); + + nIndex = ImageList_AddMasked(himlDef, hbmLoad, comctl32_color.clrBtnFace); + DeleteObject(hbmLoad); TRACE("Number of bitmap infos: %d\n", infoPtr->nNumBitmapInfos); - infoPtr->bitmaps = ReAlloc(infoPtr->bitmaps, (infoPtr->nNumBitmapInfos + 1) * sizeof(TBITMAP_INFO)); - infoPtr->bitmaps[infoPtr->nNumBitmapInfos].nButtons = nButtons; - infoPtr->bitmaps[infoPtr->nNumBitmapInfos].hInst = lpAddBmp->hInst; - infoPtr->bitmaps[infoPtr->nNumBitmapInfos].nID = lpAddBmp->nID; - + infoPtr->bitmaps[infoPtr->nNumBitmapInfos] = info; infoPtr->nNumBitmapInfos++; TRACE("Number of bitmap infos: %d\n", infoPtr->nNumBitmapInfos); @@ -2760,14 +2718,14 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa { INT imagecount = ImageList_GetImageCount(himlDef); INT added = imagecount - nCount; - if (nButtons == 0) /* wParam == 0 is special and means add only one image */ + if (info.nButtons == 0) /* wParam == 0 is special and means add only one image */ { ImageList_SetImageCount(himlDef, nCount + 1); - } else if (added < nButtons) { /* if not enough buttons, grow the list */ - ImageList_SetImageCount(himlDef, nCount + nButtons); - } else if (added > nButtons) { - TRACE("Added more images than wParam: Previous image number %i added %i while nButtons %i. Images in list %i\n", - nCount, added, nButtons, imagecount); + } else if (added < (INT)info.nButtons) { /* if not enough buttons, grow the list */ + ImageList_SetImageCount(himlDef, nCount + info.nButtons); + } else if (added > (INT)info.nButtons) { + TRACE("Added more images than wParam: Previous image number %i added %i while wParam %i. Images in list %i\n", + nCount, added, info.nButtons, imagecount); } infoPtr->nNumBitmaps += added;

1 0

Mikołaj Zalewski : comctl32: toolbar: Fix IDB_STD_VIEW_* icons count (with testcase).
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 9e390091db366826da0e87643e62d2e7f0d773aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e390091db366826da0e876… Author: Mikołaj Zalewski <mikolaj(a)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

1 0

Mikołaj Zalewski : comctl32: imagelist: SetImageCount can be used to decrease image count (with testcase).
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 89f537dd57bf98a24a6c80ac6c436927b1ac4da4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89f537dd57bf98a24a6c80a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 20 17:42:29 2006 +0200 comctl32: imagelist: SetImageCount can be used to decrease image count (with testcase). --- dlls/comctl32/imagelist.c | 5 +++-- dlls/comctl32/tests/imagelist.c | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index cc3078e..faf5371 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2546,11 +2546,12 @@ ImageList_SetImageCount (HIMAGELIST himl if (!is_valid(himl)) return FALSE; - if (himl->cCurImage >= iImageCount) - return FALSE; + if (iImageCount < 0) + return FALSE; if (himl->cMaxImage > iImageCount) { himl->cCurImage = iImageCount; + /* TODO: shrink the bitmap when cMaxImage-cCurImage>cGrow ? */ return TRUE; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0ecb03a..6278adc 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -327,6 +327,14 @@ static BOOL DoTest1(void) /* remove one extra */ ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n"); + /* check SetImageCount/GetImageCount */ + ok(ImageList_SetImageCount(himl, 3), "couldn't increase image count\n"); + ok(ImageList_GetImageCount(himl) == 3, "invalid image count after increase\n"); + ok(ImageList_SetImageCount(himl, 1), "couldn't decrease image count\n"); + ok(ImageList_GetImageCount(himl) == 1, "invalid image count after decrease to 1\n"); + ok(ImageList_SetImageCount(himl, 0), "couldn't decrease image count\n"); + ok(ImageList_GetImageCount(himl) == 0, "invalid image count after decrease to 0\n"); + /* destroy it */ ok(ImageList_Destroy(himl),"destroy imagelist failed\n");

1 0

Mikołaj Zalewski : comctl32: toolbar: Use correctly wParam in TB_ADDBITMAP.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: d457b37d822323ddd82d66d6315a7be4c8ce61a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d457b37d822323ddd82d66d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 20 17:44:36 2006 +0200 comctl32: toolbar: Use correctly wParam in TB_ADDBITMAP. --- dlls/comctl32/tests/toolbar.c | 16 ++++++++-------- dlls/comctl32/toolbar.c | 26 ++++++++++++-------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 699b4a7..bfcbd67 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -194,25 +194,25 @@ static void test_add_bitmap(void) /* the same for negative wParam */ rebuild_toolbar(&hToolbar); ret = SendMessageA(hToolbar, TB_ADDBITMAP, -143, (LPARAM)&bmp128); - todo_wine ok(ret == 0, "TB_ADDBITMAP - unexpected return %d\n", ret); - todo_wine CHECK_IMAGELIST(8, 16, 15); + ok(ret == 0, "TB_ADDBITMAP - unexpected return %d\n", ret); + CHECK_IMAGELIST(8, 16, 15); ret = SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&bmp80); todo_wine ok(ret == -143, "TB_ADDBITMAP - unexpected return %d\n", ret); - CHECK_IMAGELIST_TODO_COUNT(13, 16, 15); + CHECK_IMAGELIST(13, 16, 15); /* for zero only one bitmap will be added */ rebuild_toolbar(&hToolbar); ret = SendMessageA(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&bmp80); - todo_wine ok(ret == 0, "TB_ADDBITMAP - unexpected return %d\n", ret); - todo_wine CHECK_IMAGELIST(1, 16, 15); + ok(ret == 0, "TB_ADDBITMAP - unexpected return %d\n", ret); + CHECK_IMAGELIST(1, 16, 15); /* if wParam is larger than the amount of icons, the list is grown */ rebuild_toolbar(&hToolbar); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 100, (LPARAM)&bmp80) == 0, "TB_ADDBITMAP - unexpected return\n"); - CHECK_IMAGELIST_TODO_COUNT(100, 16, 15); + CHECK_IMAGELIST(100, 16, 15); ret = SendMessageA(hToolbar, TB_ADDBITMAP, 100, (LPARAM)&bmp128); - todo_wine ok(ret == 100, "TB_ADDBITMAP - unexpected return %d\n", ret); - CHECK_IMAGELIST_TODO_COUNT(200, 16, 15); + ok(ret == 100, "TB_ADDBITMAP - unexpected return %d\n", ret); + CHECK_IMAGELIST(200, 16, 15); /* adding built-in items - the wParam is ignored */ rebuild_toolbar(&hToolbar); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9a04ecf..840a08a 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2625,9 +2625,6 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa else { nButtons = (INT)wParam; - if (nButtons <= 0) - return -1; - TRACE ("adding %d bitmaps!\n", nButtons); } @@ -2761,18 +2758,19 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa if (nIndex != -1) { - INT imagecount = ImageList_GetImageCount(himlDef); - - if (infoPtr->nNumBitmaps + nButtons != imagecount) - { - WARN("Desired images do not match received images : Previous image number %i Previous images in list %i added %i expecting total %i, Images in list %i\n", - infoPtr->nNumBitmaps, nCount, imagecount - nCount, - infoPtr->nNumBitmaps+nButtons,imagecount); + INT imagecount = ImageList_GetImageCount(himlDef); + INT added = imagecount - nCount; + if (nButtons == 0) /* wParam == 0 is special and means add only one image */ + { + ImageList_SetImageCount(himlDef, nCount + 1); + } else if (added < nButtons) { /* if not enough buttons, grow the list */ + ImageList_SetImageCount(himlDef, nCount + nButtons); + } else if (added > nButtons) { + TRACE("Added more images than wParam: Previous image number %i added %i while nButtons %i. Images in list %i\n", + nCount, added, nButtons, imagecount); + } - infoPtr->nNumBitmaps = imagecount; - } - else - infoPtr->nNumBitmaps += nButtons; + infoPtr->nNumBitmaps += added; } InvalidateRect(hwnd, NULL, TRUE);

1 0

Mikołaj Zalewski : comctl32: toolbar: Add some tests for TB_ADDBITMAP.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 80664defa84517feab493b5da249f9c9f2a1556a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80664defa84517feab493b5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 20 17:41:30 2006 +0200 comctl32: toolbar: Add some tests for TB_ADDBITMAP. --- dlls/comctl32/tests/Makefile.in | 6 dlls/comctl32/tests/{propsheet.rc => resources.h} | 20 +- dlls/comctl32/tests/rsrc.rc | 154 ++++++++++++ dlls/comctl32/tests/toolbar.c | 271 ++++++++++++++++----- 4 files changed, 375 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=80664defa84517feab4…

1 0

James Hawkins : msi: Disable child features of parent features that are unselected because of the install level .
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 545d0e70cf200270956193f6606eb2a9cbb2933a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=545d0e70cf200270956193f… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:59:19 2006 -0700 msi: Disable child features of parent features that are unselected because of the install level. --- dlls/msi/action.c | 71 +++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/action.h | 7 +++++ dlls/msi/helpers.c | 7 +++++ dlls/msi/tests/package.c | 22 ++++++++++++++ 4 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a1729d3..037d509 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1163,6 +1163,19 @@ static UINT add_feature_component( MSIFE return ERROR_SUCCESS; } +static UINT add_feature_child( MSIFEATURE *parent, MSIFEATURE *child ) +{ + FeatureList *fl; + + fl = msi_alloc( sizeof(*fl) ); + if ( !fl ) + return ERROR_NOT_ENOUGH_MEMORY; + fl->feature = child; + list_add_tail( &parent->Children, &fl->entry ); + + return ERROR_SUCCESS; +} + static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) { _ilfs* ilfs= (_ilfs*)param; @@ -1185,6 +1198,19 @@ static UINT iterate_load_featurecomponen return ERROR_SUCCESS; } +static MSIFEATURE *find_feature_by_name( MSIPACKAGE *package, LPCWSTR name ) +{ + MSIFEATURE *feature; + + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if ( !lstrcmpW( feature->Feature, name ) ) + return feature; + } + + return NULL; +} + static UINT load_feature(MSIRECORD * row, LPVOID param) { MSIPACKAGE* package = (MSIPACKAGE*)param; @@ -1206,6 +1232,7 @@ static UINT load_feature(MSIRECORD * row if (!feature) return ERROR_NOT_ENOUGH_MEMORY; + list_init( &feature->Children ); list_init( &feature->Components ); feature->Feature = msi_dup_record_field( row, 1 ); @@ -1244,6 +1271,26 @@ static UINT load_feature(MSIRECORD * row return ERROR_SUCCESS; } +static UINT find_feature_children(MSIRECORD * row, LPVOID param) +{ + MSIPACKAGE* package = (MSIPACKAGE*)param; + MSIFEATURE *parent, *child; + + child = find_feature_by_name( package, MSI_RecordGetString( row, 1 ) ); + if (!child) + return ERROR_FUNCTION_FAILED; + + if (!child->Feature_Parent) + return ERROR_SUCCESS; + + parent = find_feature_by_name( package, child->Feature_Parent ); + if (!parent) + return ERROR_FUNCTION_FAILED; + + add_feature_child( parent, child ); + return ERROR_SUCCESS; +} + static UINT load_all_features( MSIPACKAGE *package ) { static const WCHAR query[] = { @@ -1261,7 +1308,12 @@ static UINT load_all_features( MSIPACKAG return r; r = MSI_IterateRecords( view, NULL, load_feature, package ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_IterateRecords( view, NULL, find_feature_children, package ); msiobj_release( &view->hdr ); + return r; } @@ -1542,7 +1594,7 @@ static void ACTION_UpdateInstallStates(M LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { ComponentList *cl; - INSTALLSTATE res = -10; + INSTALLSTATE res = INSTALLSTATE_ABSENT; LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { @@ -1554,7 +1606,7 @@ static void ACTION_UpdateInstallStates(M break; } - if (res == -10) + if (res == INSTALLSTATE_ABSENT) res = comp->Installed; else { @@ -1693,6 +1745,21 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa } } } + + /* disable child features of unselected parent features */ + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + FeatureList *fl; + + if (feature->Level > 0 && feature->Level <= install_level) + continue; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; + fl->feature->Action = INSTALLSTATE_UNKNOWN; + } + } } else { diff --git a/dlls/msi/action.h b/dlls/msi/action.h index 785c4e3..ae7de82 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -39,6 +39,7 @@ typedef struct tagMSIFEATURE INSTALLSTATE ActionRequest; INSTALLSTATE Action; + struct list Children; struct list Components; INT Cost; @@ -74,6 +75,12 @@ typedef struct tagComponentList MSICOMPONENT *component; } ComponentList; +typedef struct tagFeatureList +{ + struct list entry; + MSIFEATURE *feature; +} FeatureList; + typedef struct tagMSIFOLDER { struct list entry; diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 8c957a2..50fc992 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -404,6 +404,13 @@ static void free_feature( MSIFEATURE *fe { struct list *item, *cursor; + LIST_FOR_EACH_SAFE( item, cursor, &feature->Children ) + { + FeatureList *fl = LIST_ENTRY( item, FeatureList, entry ); + list_remove( &fl->entry ); + msi_free( fl ); + } + LIST_FOR_EACH_SAFE( item, cursor, &feature->Components ) { ComponentList *cl = LIST_ENTRY( item, ComponentList, entry ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4e9d40a..cd55f89 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2366,6 +2366,14 @@ static void test_featureparents(void) r = add_feature_entry( hdb, "'orion', '', '', '', 2, 1, '', 0" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + /* disabled because of install level */ + r = add_feature_entry( hdb, "'waters', '', '', '', 15, 101, '', 9" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + + /* child feature of disabled feature */ + r = add_feature_entry( hdb, "'bayer', 'waters', '', '', 14, 1, '', 9" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + /* msidbFeatureAttributesFavorLocal:msidbComponentAttributesLocalOnly */ r = add_component_entry( hdb, "'leo', '', 'TARGETDIR', 0, '', 'leo_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); @@ -2508,6 +2516,20 @@ static void test_featureparents(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "waters", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "bayer", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "leo", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);

1 0

James Hawkins : msi: Translate the INSTALLSTATE_UNKNOWN index into the INSTALLSTATE_ABSENT image index .
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 703d77dc58a032b08dc222de951474a7f28f8fac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=703d77dc58a032b08dc222d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:58:06 2006 -0700 msi: Translate the INSTALLSTATE_UNKNOWN index into the INSTALLSTATE_ABSENT image index. --- dlls/msi/dialog.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1f15f40..8ebeb09 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1651,13 +1651,17 @@ static void msi_seltree_sync_item_state( HWND hwnd, MSIFEATURE *feature, HTREEITEM hItem ) { TVITEMW tvi; + DWORD index = feature->Action; TRACE("Feature %s -> %d %d %d\n", debugstr_w(feature->Title), feature->Installed, feature->Action, feature->ActionRequest); + if (index == INSTALLSTATE_UNKNOWN) + index = INSTALLSTATE_ABSENT; + tvi.mask = TVIF_STATE; tvi.hItem = hItem; - tvi.state = INDEXTOSTATEIMAGEMASK( feature->Action ); + tvi.state = INDEXTOSTATEIMAGEMASK( index ); tvi.stateMask = TVIS_STATEIMAGEMASK; SendMessageW( hwnd, TVM_SETITEMW, 0, (LPARAM) &tvi );

1 0

James Hawkins : msi: Don't check a component' s install state if a component ID is not provided.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 32f570222be9e96b0e1730a4686163413451af95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32f570222be9e96b0e1730a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:57:03 2006 -0700 msi: Don't check a component's install state if a component ID is not provided. --- dlls/msi/action.c | 20 +++++++++++- dlls/msi/tests/package.c | 75 +++++++++++----------------------------------- 2 files changed, 36 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=32f570222be9e96b0e1…

1 0

James Hawkins : msi: Fix the results of a few tests to match Windows.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 6ac0f3ed29802487898623d256a6906786416556 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ac0f3ed29802487898623d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:55:55 2006 -0700 msi: Fix the results of a few tests to match Windows. --- dlls/msi/tests/package.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 566ae94..bc02061 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2603,30 +2603,21 @@ static void test_featureparents(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "zodiac", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "perseus", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "orion", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", action); state = 0xdeadbee;

1 0