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

Jinoh Kang : iphlpapi/tests: Add tests for GetBestRoute.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: ac9842bc9a196b78d89030823018958ce6057551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac9842bc9a196b78d8903082… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Jan 16 00:30:43 2022 +0900 iphlpapi/tests: Add tests for GetBestRoute. 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; }

1 0

Paul Gofman : iphlpapi: Sort by adapter index first in GetIpNetTable().
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: bfd7b9bcf88299014a3d993b71de0cf9d8d0586f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd7b9bcf88299014a3d993b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 20 18:57:51 2022 -0500 iphlpapi: Sort by adapter index first in GetIpNetTable(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 3 +++ dlls/iphlpapi/tests/iphlpapi.c | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5d904d875fe..fc8ee3d2040 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2282,6 +2282,9 @@ err: static int ipnetrow_cmp( const void *a, const void *b ) { const MIB_IPNETROW *rowA = a, *rowB = b; + + if (rowA->dwIndex != rowB->dwIndex) return DWORD_cmp( rowA->dwIndex, rowB->dwIndex ); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 09d02b02f08..84d5143ba8e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -371,6 +371,7 @@ static void testGetIpNetTable(void) { DWORD apiReturn; ULONG dwSize = 0; + unsigned int i; apiReturn = GetIpNetTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { @@ -390,11 +391,23 @@ static void testGetIpNetTable(void) PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); memset(buf, 0xcc, dwSize); - apiReturn = GetIpNetTable(buf, &dwSize, FALSE); + apiReturn = GetIpNetTable(buf, &dwSize, TRUE); ok((apiReturn == NO_ERROR && buf->dwNumEntries) || (apiReturn == ERROR_NO_DATA && !buf->dwNumEntries), "got apiReturn %lu, dwSize %lu, buf->dwNumEntries %lu.\n", apiReturn, dwSize, buf->dwNumEntries); + if (apiReturn == NO_ERROR) + { + for (i = 0; i < buf->dwNumEntries - 1; ++i) + { + ok( buf->table[i].dwIndex <= buf->table[i + 1].dwIndex, + "Entries are not sorted by index, i %u.\n", i ); + if (buf->table[i].dwIndex == buf->table[i + 1].dwIndex) + ok(ntohl(buf->table[i].dwAddr) <= ntohl(buf->table[i + 1].dwAddr), + "Entries are not sorted by address, i %u.\n", i ); + } + } + if (apiReturn == NO_ERROR && winetest_debug > 1) { DWORD i, j;

1 0

Jacek Caban : user32: Reimplement GetMenuStringW on top of NtUserThunkedMenuItemInfo.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 0868ca1578d8dd9a4f8386ddbe8aaffd8b34c40f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0868ca1578d8dd9a4f8386dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:19:44 2022 +0200 user32: Reimplement GetMenuStringW on top of NtUserThunkedMenuItemInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 29a266d2312..434353e8892 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -498,39 +498,20 @@ INT WINAPI GetMenuStringA( HMENU menu, UINT item, char *str, INT count, UINT fla /******************************************************************* * GetMenuStringW (USER32.@) */ -INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, - LPWSTR str, INT nMaxSiz, UINT wFlags ) +INT WINAPI GetMenuStringW( HMENU menu, UINT item, WCHAR *str, INT count, UINT flags ) { - POPUPMENU *menu; - MENUITEM *item; - UINT pos; - INT ret; - - TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); - if (str && nMaxSiz) str[0] = '\0'; - - if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) - { - SetLastError( ERROR_MENU_ITEM_NOT_FOUND); - return 0; - } - item = &menu->items[pos]; + MENUITEMINFOW info; + int ret; - if (!str || !nMaxSiz) - ret = item->text ? lstrlenW(item->text) : 0; - else if (!item->text) - { - str[0] = 0; - ret = 0; - } - else - { - lstrcpynW( str, item->text, nMaxSiz ); - ret = lstrlenW(str); - } - release_menu_ptr(menu); + TRACE( "menu=%p item=%04x ptr=%p len=%d flags=%04x\n", menu, item, str, count, flags ); - TRACE("returning %s\n", debugstr_w(str)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING; + info.dwTypeData = str; + info.cch = count; + ret = NtUserThunkedMenuItemInfo( menu, item, flags, NtUserGetMenuItemInfoW, &info, NULL ); + if (ret) ret = info.cch; + TRACE( "returning %s %d\n", debugstr_w( str ), ret ); return ret; }

1 0

Jacek Caban : user32: Reimplement GetMenuStringA on top of NtUserThunkedMenuItemInfo.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 992d69b9d128e9c519306e36fd103ea4bd1b76bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=992d69b9d128e9c519306e36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:18:52 2022 +0200 user32: Reimplement GetMenuStringA on top of NtUserThunkedMenuItemInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 45 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index df260b063d9..29a266d2312 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -476,42 +476,21 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, /******************************************************************* * GetMenuStringA (USER32.@) */ -INT WINAPI GetMenuStringA( - HMENU hMenu, /* [in] menuhandle */ - UINT wItemID, /* [in] menu item (dep. on wFlags) */ - LPSTR str, /* [out] outbuffer. If NULL, func returns entry length*/ - INT nMaxSiz, /* [in] length of buffer. if 0, func returns entry len*/ - UINT wFlags /* [in] MF_ flags */ -) +INT WINAPI GetMenuStringA( HMENU menu, UINT item, char *str, INT count, UINT flags ) { - POPUPMENU *menu; - MENUITEM *item; - UINT pos; - INT ret; - - TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); - if (str && nMaxSiz) str[0] = '\0'; - - if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) - { - SetLastError( ERROR_MENU_ITEM_NOT_FOUND); - return 0; - } - item = &menu->items[pos]; + MENUITEMINFOA info; + int ret; - if (!item->text) - ret = 0; - else if (!str || !nMaxSiz) - ret = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); - else - { - if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) - str[nMaxSiz-1] = 0; - ret = strlen(str); - } - release_menu_ptr(menu); + TRACE( "menu=%p item=%04x ptr=%p len=%d flags=%04x\n", menu, item, str, count, flags ); - TRACE("returning %s\n", debugstr_a(str)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING; + info.dwTypeData = str; + info.cch = count; + ret = NtUserThunkedMenuItemInfo( menu, item, flags, NtUserGetMenuItemInfoA, + (MENUITEMINFOW *)&info, NULL ); + if (ret) ret = info.cch; + TRACE( "returning %s %d\n", debugstr_a( str ), ret ); return ret; }

1 0

Huw Davies : iphlpapi/tests: Allow the route's age to differ by one second.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 1c83efac779248646da51795611651b2191f382c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c83efac779248646da51795… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 21 08:23:35 2022 +0100 iphlpapi/tests: Allow the route's age to differ by one second. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 29256eb2774..214256c18b4 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -350,7 +350,8 @@ static void testGetIpForwardTable(void) else ok( buf->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT, "got %ld\n", buf->table[i].dwForwardType ); ok( row->dwForwardProto == row2->Protocol, "got %ld vs %d\n", row->dwForwardProto, row2->Protocol ); - ok( row->dwForwardAge == row2->Age, "got %ld vs %ld\n", row->dwForwardAge, row2->Age ); + ok( row->dwForwardAge == row2->Age || row->dwForwardAge + 1 == row2->Age, + "got %ld vs %ld\n", row->dwForwardAge, row2->Age ); ok( row->dwForwardNextHopAS == 0, "got %08lx\n", row->dwForwardNextHopAS ); /* FIXME: need to add the interface's metric from GetIpInterfaceTable() */ ok( row->dwForwardMetric1 >= row2->Metric, "got %ld vs %ld\n", row->dwForwardMetric1, row2->Metric );

1 0

Zhiyi Zhang : comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 7f491491f85edbeeeb58572609b2eb7e7bd4ea1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f491491f85edbeeeb585726… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 30 15:08:14 2022 +0800 comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background. 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;

1 0

Zhiyi Zhang : uxtheme: Support parsing more clock states.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: f1aa061d8f475271ea5c9f039cd8d9eb25d56f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1aa061d8f475271ea5c9f03… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:39:49 2022 +0800 uxtheme: Support parsing more clock states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 2 ++ include/vssym32.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 7a0a64cc470..8597be2b40e 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -431,6 +431,8 @@ static const MSSTYLES_CLASS_MAP classButton[] = { static const MSSTYLES_CLASS_MAP classClock[] = { {CLP_TIME, 0, L"TIME"}, {CLP_TIME, CLS_NORMAL, L"NORMAL"}, + {CLP_TIME, CLS_HOT, L"HOT"}, + {CLP_TIME, CLS_PRESSED, L"PRESSED"}, {0, 0, L""} }; diff --git a/include/vssym32.h b/include/vssym32.h index 8685fb7f7f0..8bc161a213c 100644 --- a/include/vssym32.h +++ b/include/vssym32.h @@ -522,6 +522,8 @@ enum CLOCKPARTS { enum CLOCKSTATES { CLS_NORMAL = 1, + CLS_HOT = 2, + CLS_PRESSED = 3, }; /* TRAYNOTIFY class */

1 0

Zhiyi Zhang : uxtheme: Support parsing more button parts and states.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 22adfc67b4dcbacf1c0991a15c056db0e5b639b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22adfc67b4dcbacf1c0991a1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:31:55 2022 +0800 uxtheme: Support parsing more button parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/vsstyle.h | 9 +++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 07fafbe0bde..7a0a64cc470 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -341,6 +341,7 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_PUSHBUTTON, PBS_PRESSED, L"PRESSED"}, {BP_PUSHBUTTON, PBS_DISABLED, L"DISABLED"}, {BP_PUSHBUTTON, PBS_DEFAULTED, L"DEFAULTED"}, + {BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, L"DEFAULTED_ANIMATING"}, {BP_RADIOBUTTON, 0, L"RADIOBUTTON"}, {BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, {BP_RADIOBUTTON, RBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, @@ -363,6 +364,14 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_CHECKBOX, CBS_MIXEDHOT, L"MIXEDHOT"}, {BP_CHECKBOX, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, {BP_CHECKBOX, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX, CBS_IMPLICITNORMAL, L"IMPLICITNORMAL"}, + {BP_CHECKBOX, CBS_IMPLICITHOT, L"IMPLICITHOT"}, + {BP_CHECKBOX, CBS_IMPLICITPRESSED, L"IMPLICITPRESSED"}, + {BP_CHECKBOX, CBS_IMPLICITDISABLED, L"IMPLICITDISABLED"}, + {BP_CHECKBOX, CBS_EXCLUDEDNORMAL, L"EXCLUDEDNORMAL"}, + {BP_CHECKBOX, CBS_EXCLUDEDHOT, L"EXCLUDEDHOT"}, + {BP_CHECKBOX, CBS_EXCLUDEDPRESSED, L"EXCLUDEDPRESSED"}, + {BP_CHECKBOX, CBS_EXCLUDEDDISABLED, L"EXCLUDEDDISABLED"}, {BP_GROUPBOX, 0, L"GROUPBOX"}, {BP_GROUPBOX, GBS_NORMAL, L"NORMAL"}, {BP_GROUPBOX, GBS_DISABLED, L"DISABLED"}, @@ -380,6 +389,42 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_COMMANDLINKGLYPH, CMDLGS_PRESSED, L"PRESSED"}, {BP_COMMANDLINKGLYPH, CMDLGS_DISABLED, L"DISABLED"}, {BP_COMMANDLINKGLYPH, CMDLGS_DEFAULTED, L"DEFAULTED"}, + {BP_RADIOBUTTON_HCDISABLED, 0, L"RADIOBUTTON_HCDISABLED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, 0, L"CHECKBOX_HCDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDNORMAL, L"MIXEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDHOT, L"MIXEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITNORMAL, L"IMPLICITNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITHOT, L"IMPLICITHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITPRESSED, L"IMPLICITPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITDISABLED, L"IMPLICITDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDNORMAL, L"EXCLUDEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDHOT, L"EXCLUDEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDPRESSED, L"EXCLUDEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDDISABLED, L"EXCLUDEDDISABLED"}, + {BP_GROUPBOX_HCDISABLED, 0, L"GROUPBOX_HCDISABLED"}, + {BP_GROUPBOX_HCDISABLED, GBS_NORMAL, L"NORMAL"}, + {BP_GROUPBOX_HCDISABLED, GBS_DISABLED, L"DISABLED"}, + {BP_PUSHBUTTONDROPDOWN, 0, L"PUSHBUTTONDROPDOWN"}, + {BP_PUSHBUTTONDROPDOWN, PBDDS_NORMAL, L"NORMAL"}, + {BP_PUSHBUTTONDROPDOWN, PBDDS_DISABLED, L"DISABLED"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index d6ea9071f64..f5af8492aef 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -72,6 +72,10 @@ enum BUTTONPARTS { BP_USERBUTTON = 5, BP_COMMANDLINK = 6, BP_COMMANDLINKGLYPH = 7, + BP_RADIOBUTTON_HCDISABLED = 8, + BP_CHECKBOX_HCDISABLED = 9, + BP_GROUPBOX_HCDISABLED = 10, + BP_PUSHBUTTONDROPDOWN = 11, }; #define BUTTONSTYLEPARTS BUTTONPARTS; @@ -141,6 +145,11 @@ enum COMMANDLINKGLYPHSTATES { CMDLGS_DEFAULTED = 5, }; +enum PUSHBUTTONDROPDOWNSTATES { + PBDDS_NORMAL = 1, + PBDDS_DISABLED = 2, +}; + /* COMBOBOXSTYLE class */ #if defined(_MSC_VER) || defined(__MINGW32__) #define VSCLASS_COMBOBOXSTYLE L"COMBOBOXSTYLE"

1 0

Jacek Caban : win32u: Move GetMenuItemID implementation from user32.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 9f267c225893f665ffb0d8c8636166a2b42a4789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f267c225893f665ffb0d8c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:52:55 2022 +0200 win32u: Move GetMenuItemID implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 12 ++---------- dlls/win32u/menu.c | 6 ++++++ include/ntuser.h | 1 + 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 434353e8892..76144706771 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -537,17 +537,9 @@ INT WINAPI GetMenuItemCount( HMENU menu ) /********************************************************************** * GetMenuItemID (USER32.@) */ -UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) +UINT WINAPI GetMenuItemID( HMENU menu, INT pos ) { - POPUPMENU *menu; - UINT id, pos; - - if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) - return -1; - - id = menu->items[pos].fType & MF_POPUP ? -1 : menu->items[pos].wID; - release_menu_ptr(menu); - return id; + return NtUserThunkedMenuItemInfo( menu, pos, MF_BYPOSITION, NtUserGetMenuItemID, NULL, NULL ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index bee04f36dbf..eab97e58d39 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1121,6 +1121,12 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT switch (method) { + case NtUserGetMenuItemID: + if (!(menu = find_menu_item( handle, pos, flags, &i ))) return -1; + ret = menu->items[i].fType & MF_POPUP ? -1 : menu->items[i].wID; + release_menu_ptr( menu ); + break; + case NtUserGetMenuItemInfoA: return get_menu_item_info( handle, pos, flags, info, TRUE ); diff --git a/include/ntuser.h b/include/ntuser.h index d92332f13b9..41b328376a9 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -224,6 +224,7 @@ enum NtUserSetMenuItemInfo, NtUserInsertMenuItem, /* Wine extensions */ + NtUserGetMenuItemID, NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW, NtUserGetMenuState,

1 0

Huw Davies : nsiproxy: Pass a ptr to receive the ICMP handle.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: f5627617ee0e0ad6fa7021865fdd7fc61cd2179c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5627617ee0e0ad6fa702186… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 10:36:03 2022 +0100 nsiproxy: Pass a ptr to receive the ICMP handle. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 4 +++- dlls/nsiproxy.sys/icmp_echo.c | 6 +++--- dlls/nsiproxy.sys/nsiproxy_private.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index aa030fa459c..7aba1f0c36f 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -366,6 +366,7 @@ static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; struct icmp_send_echo_params params; + icmp_handle handle; NTSTATUS status; TRACE( "\n" ); @@ -376,6 +377,7 @@ static void handle_queued_send_echo( IRP *irp ) params.ttl = in->ttl; params.tos = in->tos; params.dst = &in->dst; + params.handle = &handle; status = nsiproxy_call( icmp_send_echo, &params ); TRACE( "icmp_send_echo rets %08lx\n", status ); @@ -389,7 +391,7 @@ static void handle_queued_send_echo( IRP *irp ) } else { - irp_set_icmp_handle( irp, params.handle ); + irp_set_icmp_handle( irp, handle ); RtlQueueWorkItem( listen_thread_proc, irp, WT_EXECUTELONGFUNCTION ); } } diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index dda19915fe7..e92fa4394c1 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -659,9 +659,9 @@ NTSTATUS icmp_send_echo( void *args ) return STATUS_SUCCESS; } - params->handle = handle_alloc( data ); - if (!params->handle) icmp_data_free( data ); - return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; + *params->handle = handle_alloc( data ); + if (!*params->handle) icmp_data_free( data ); + return *params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; } static int get_timeout( LARGE_INTEGER start, UINT timeout ) diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index a62a0eebda8..241106fe228 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -45,7 +45,7 @@ struct icmp_send_echo_params void *request, *reply; UINT request_size, reply_len; BYTE bits, ttl, tos; - icmp_handle handle; + icmp_handle *handle; }; /* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */

1 0