June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v2 0/5] MR266: iphlpapi/tests: Add win98+ API tests - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/266

June 21, 2022

[PATCH v2 2/5] iphlpapi/tests: Add tests for GetBestRoute.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/iphlpapi/tests/iphlpapi.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index af5450f3ab7..9890df70e0e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1481,9 +1481,32 @@ static void testGetBestInterface(void) bestIfIndex, apiReturn, NO_ERROR ); } +static void testGetBestRoute(void) +{ + DWORD apiReturn; + MIB_IPFORWARDROW bestRoute; + + apiReturn = GetBestRoute( INADDR_ANY, 0, &bestRoute ); + trace( "GetBestRoute([0.0.0.0], 0, [...]) = %lu\n", apiReturn ); + if (apiReturn == ERROR_NOT_SUPPORTED) + { + skip( "GetBestRoute is not supported\n" ); + return; + } + + apiReturn = GetBestRoute( INADDR_ANY, 0, NULL ); + ok( apiReturn == ERROR_INVALID_PARAMETER, + "GetBestRoute([0.0.0.0], 0, NULL) returned %lu, expected %d\n", + apiReturn, ERROR_INVALID_PARAMETER ); + + apiReturn = GetBestRoute( INADDR_LOOPBACK, 0, &bestRoute ); + ok( apiReturn == NO_ERROR, + "GetBestRoute([127.0.0.1], 0, NULL) returned %lu, expected %d\n", + apiReturn, NO_ERROR ); +} + /* still-to-be-tested 98-onward functions: -GetBestRoute IpReleaseAddress IpRenewAddress */ @@ -1493,6 +1516,7 @@ static DWORD CALLBACK testWin98Functions(void *p) testGetAdaptersInfo(); testGetNetworkParams(); testGetBestInterface(); + testGetBestRoute(); return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/266

June 21, 2022

[PATCH v2 1/5] iphlpapi/tests: Add tests for GetBestInterface.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/iphlpapi/tests/iphlpapi.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 214256c18b4..af5450f3ab7 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1457,9 +1457,32 @@ static void testGetNetworkParams(void) } } +static void testGetBestInterface(void) +{ + DWORD apiReturn; + DWORD bestIfIndex; + + apiReturn = GetBestInterface( INADDR_ANY, &bestIfIndex ); + trace( "GetBestInterface([0.0.0.0], {%lu}) = %lu\n", bestIfIndex, apiReturn ); + if (apiReturn == ERROR_NOT_SUPPORTED) + { + skip( "GetBestInterface is not supported\n" ); + return; + } + + apiReturn = GetBestInterface( INADDR_LOOPBACK, NULL ); + ok( apiReturn == ERROR_INVALID_PARAMETER, + "GetBestInterface([127.0.0.1], NULL) returned %lu, expected %d\n", + apiReturn, ERROR_INVALID_PARAMETER ); + + apiReturn = GetBestInterface( INADDR_LOOPBACK, &bestIfIndex ); + ok( apiReturn == NO_ERROR, + "GetBestInterface([127.0.0.1], {%lu}) returned %lu, expected %d\n", + bestIfIndex, apiReturn, NO_ERROR ); +} + /* still-to-be-tested 98-onward functions: -GetBestInterface GetBestRoute IpReleaseAddress IpRenewAddress @@ -1469,6 +1492,7 @@ static DWORD CALLBACK testWin98Functions(void *p) testGetInterfaceInfo(); testGetAdaptersInfo(); testGetNetworkParams(); + testGetBestInterface(); return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/266

June 21, 2022

[PATCH v2 0/5] MR266: iphlpapi/tests: Add win98+ API tests

by Jinoh Kang (＠iamahuman)

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: iphlpapi/tests: Add more tests for interface identifier conversion failure. iphlpapi/tests: Factor out interface identifier conversion with invalid parameters. iphlpapi/tests: Add tests for GetBestInterfaceEx. iphlpapi/tests: Add tests for GetBestRoute. iphlpapi/tests: Add tests for GetBestInterface. https://gitlab.winehq.org/wine/wine/-/merge_requests/266

June 21, 2022

Re: [PATCH v3 0/6] MR294: win32u: menu and def window proc conversion - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/294

June 21, 2022

Re: [PATCH v3 0/2] MR291: secur32: Implement SECPKG_ATTR_CIPHER_INFO. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/291

June 21, 2022

Re: [PATCH v3 0/2] MR292: nsiproxy: Small improvements - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/292

June 21, 2022

Re: [PATCH v2 0/1] MR290: iphlpapi/tests: Allow the route's age to differ by one second. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/290

June 21, 2022

[PATCH v2 3/3] comctl32/toolbar: Don't use pattern brushes to draw checked background.

by Zhiyi Zhang

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/toolbar.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 897405098c2..f66094a0b3a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2666,7 +2666,6 @@ static void test_visual(void) toolbar_dc = GetDC(toolbar); color = GetPixel(toolbar_dc, 5, 5); if (is_theme_active) - todo_wine ok(color != RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); else ok(color == RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index bea294958c5..02538eeb649 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1042,7 +1042,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))) OffsetRect(&rcText, 1, 1); - if (!(tbcd.nmcd.uItemState & CDIS_HOT) && + if (!theme && !(tbcd.nmcd.uItemState & CDIS_HOT) && ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE))) TOOLBAR_DrawPattern (&rc, &tbcd); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/288

June 21, 2022

[PATCH v2 2/3] comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background.

by Zhiyi Zhang

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 60 ++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 31c360304c6..897405098c2 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -62,6 +62,7 @@ static BOOL g_fExpectedHotItemOld; static BOOL g_fExpectedHotItemNew; static DWORD g_dwExpectedDispInfoMask; static BOOL g_ResetDispTextPtr; +static BOOL g_TestCheckedItemPrePaint; static const struct message ttgetdispinfo_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TBN_GETINFOTIPA }, @@ -348,6 +349,28 @@ static LRESULT parent_wnd_notify(LPARAM lParam) } return 0; } + case NM_CUSTOMDRAW: + { + NMTBCUSTOMDRAW *cd = (NMTBCUSTOMDRAW *)lParam; + + switch (cd->nmcd.dwDrawStage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW; + case CDDS_ITEMPREPAINT: + { + if (g_TestCheckedItemPrePaint) + { + cd->clrBtnHighlight = RGB(0xff, 0, 0); + cd->clrBtnFace = RGB(0xff, 0, 0); + return TBCDRF_NOBACKGROUND; + } + return CDRF_DODEFAULT; + } + } + + return 0; + } } return 0; } @@ -2617,34 +2640,49 @@ static void test_visual(void) HDC mem_dc1, mem_dc2, toolbar_dc; TBBUTTON tbbutton; int width, height; + COLORREF color; HTHEME theme; HWND toolbar; RECT rect; BOOL ret; - if (!is_theme_active) - { - skip("Theming is not active, skipping visual tests.\n"); - return; - } - - /* Test that toolbar shouldn't use outside theme handles */ toolbar = CreateWindowA(TOOLBARCLASSNAMEA, "", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hMainWnd, 0, 0, NULL); ok(!!toolbar, "Failed to create a toolbar window.\n"); - /* Toolbar needs data for it to show */ + /* Test that the comctl32 55AA pattern brush is not used to draw checked background when theming is on */ memset(&tbbutton, 0, sizeof(tbbutton)); - tbbutton.fsState = TBSTATE_ENABLED; - tbbutton.iString = (INT_PTR)"test"; + tbbutton.idCommand = 1000; + tbbutton.fsState = TBSTATE_ENABLED | TBSTATE_CHECKED; + tbbutton.iString = (INT_PTR)" "; SendMessageA(toolbar, TB_BUTTONSTRUCTSIZE, sizeof(tbbutton), 0); ret = SendMessageA(toolbar, TB_ADDBUTTONSA, 1, (LPARAM)&tbbutton); ok(ret, "TB_ADDBUTTONSA failed.\n"); flush_events(); + g_TestCheckedItemPrePaint = TRUE; + ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); + ok(ret, "RedrawWindow failed.\n"); + g_TestCheckedItemPrePaint = FALSE; + + toolbar_dc = GetDC(toolbar); + color = GetPixel(toolbar_dc, 5, 5); + if (is_theme_active) + todo_wine + ok(color != RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); + else + ok(color == RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); + if (!is_theme_active) + { + skip("Theming is not active, skipping the rest of visual tests.\n"); + ReleaseDC(toolbar, toolbar_dc); + DestroyWindow(toolbar); + return; + } + + /* Test that toolbar shouldn't use outside theme handles */ theme = pGetWindowTheme(toolbar); ok(!theme, "Expected theme not opened by window.\n"); - toolbar_dc = GetDC(toolbar); GetClientRect(toolbar, &rect); width = rect.right - rect.left; height = rect.bottom - rect.top; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/288

June 21, 2022