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

Re: [PATCH 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Hugh McMaster (＠hmc)

Hugh McMaster (@hmc) commented about programs/reg/add.c: > *(DWORD *)*data_bytes = val; > break; > } > + case REG_QWORD: > + { > + LPWSTR rest; > + UINT64 val; I'd really prefer `WCHAR *` for new code. You can also just use `QWORD` for `UINT64`, although the latter is probably more readable at a glance. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306#note_2644

June 24, 2022

Re: [PATCH 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Hugh McMaster (＠hmc)

Hugh McMaster (@hmc) commented about programs/reg/tests/add.c: > + size = sizeof(qword); > + err = RegQueryValueExA(hkey, "qword6", NULL, &type, (BYTE *)&qword, &size); > + ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %ld\n", err); > + ok(type == REG_QWORD, "got wrong type %ld, expected %d\n", type, REG_DWORD); > + ok(size == sizeof(qword), "got wrong size %ld, expected %d\n", size, (int)sizeof(DWORD)); > + ok(qword == 123, "got wrong data %I64d, expected 123\n", qword); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword7 /t reg_qword /d 0xabcdefg /f", &r); > + ok(r == REG_EXIT_FAILURE, "got exit code %ld, expected 1\n", r); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword8 /t REG_qword /d 0xdeadbeef /f", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %ld, expected 0\n", r); > + qword = 0xdeadbeef; > + verify_reg(hkey, "qword8", REG_QWORD, &qword, sizeof(qword), 0); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_QWORD /v qword9 /f /d -1", &r); Same comment as above - please check the set value. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306#note_2643

June 24, 2022

Re: [PATCH 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Hugh McMaster (＠hmc)

Hugh McMaster (@hmc) commented about programs/reg/tests/add.c: > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword4 /t REG_QWORD /d 123xyz /f", &r); > + ok(r == REG_EXIT_FAILURE, "Unexpected exit code %lu.\n", r); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword5 /t reg_qword /d 12345678 /f", &r); > + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); > + qword = 12345678; > + verify_reg(hkey, "qword5", REG_QWORD, &qword, sizeof(qword), 0); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword6 /t REG_QWORD /D 0123 /f", &r); > + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); > + size = sizeof(qword); > + err = RegQueryValueExA(hkey, "qword6", NULL, &type, (BYTE *)&qword, &size); > + ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %ld\n", err); > + ok(type == REG_QWORD, "got wrong type %ld, expected %d\n", type, REG_DWORD); > + ok(size == sizeof(qword), "got wrong size %ld, expected %d\n", size, (int)sizeof(DWORD)); > + ok(qword == 123, "got wrong data %I64d, expected 123\n", qword); This was all code to handle a failure in XP. Can you check it's still needed? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306#note_2642

June 24, 2022

Re: [PATCH 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Hugh McMaster (＠hmc)

Hugh McMaster (@hmc) commented about programs/reg/tests/add.c: > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_QWORD /f /d 0x123456789abcdef", &r); > + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); > + qword = 0x123456789abcdef; > + if (r == REG_EXIT_SUCCESS) > + verify_reg(hkey, "", REG_QWORD, &qword, sizeof(qword), 0); > + else > + win_skip("broken reg.exe detected\n"); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_QWORD /f", &r); > + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword0 /t REG_QWORD /f /d", &r); > + ok(r == REG_EXIT_FAILURE, "Unexpected exit code %lu.\n", r); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword1 /t REG_QWORD /f", &r); Same here. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306#note_2641

June 24, 2022

Re: [PATCH 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Hugh McMaster (＠hmc)

Hugh McMaster (@hmc) commented about programs/reg/tests/add.c: > + DWORD r, type, size; > + UINT64 qword; > + HKEY hkey; > + LONG err; > + > + add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_QWORD /f /d 0x123456789abcdef", &r); > + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); > + qword = 0x123456789abcdef; > + if (r == REG_EXIT_SUCCESS) > + verify_reg(hkey, "", REG_QWORD, &qword, sizeof(qword), 0); > + else > + win_skip("broken reg.exe detected\n"); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_QWORD /f", &r); I know these are copy/paste tests, but since this one passes, can you please check the value? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306#note_2640

June 24, 2022

Re: [PATCH 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Hugh McMaster (＠hmc)

Hugh McMaster (@hmc) commented about programs/reg/tests/add.c: > +static void test_reg_qword(void) > +{ > + DWORD r, type, size; > + UINT64 qword; > + HKEY hkey; > + LONG err; > + > + add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); > + > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_QWORD /f /d 0x123456789abcdef", &r); > + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); > + qword = 0x123456789abcdef; > + if (r == REG_EXIT_SUCCESS) > + verify_reg(hkey, "", REG_QWORD, &qword, sizeof(qword), 0); > + else > + win_skip("broken reg.exe detected\n"); Do you know which Windows systems still require this workaround? From memory, it was XP. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306#note_2639

June 24, 2022

Re: [PATCH v2 0/3] MR310: mf: Fix several reference leaks.

by Rémi Bernon

v2: Move some todo_wine around to fix the spurious successes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2638

June 24, 2022

Re: [PATCH v2 0/4] MR271: win32u: Move rawinput APIs. - approved

by Rémi Bernon

This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/271

June 24, 2022

[PATCH 3/3] user32: Use NtUserThunkedMenuItemInfo for GetSubMenu implementation.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 104 ++------------------------------------------- dlls/win32u/menu.c | 41 +++++++++--------- include/ntuser.h | 1 + 3 files changed, 26 insertions(+), 120 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 043af437356..6fb381ea617 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -115,32 +115,6 @@ static POPUPMENU *MENU_GetMenu(HMENU hMenu) return menu; } -static POPUPMENU *grab_menu_ptr(HMENU hMenu) -{ - POPUPMENU *menu = get_user_handle_ptr( hMenu, NTUSER_OBJ_MENU ); - - if (menu == OBJ_OTHER_PROCESS) - { - WARN("other process menu %p?\n", hMenu); - return NULL; - } - - if (menu) - menu->refcount++; - else - WARN("invalid menu handle=%p\n", hMenu); - return menu; -} - -static void release_menu_ptr(POPUPMENU *menu) -{ - if (menu) - { - menu->refcount--; - release_user_handle_ptr(menu); - } -} - /*********************************************************************** * MENU_CopySysPopup * @@ -232,66 +206,6 @@ HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) } -static POPUPMENU *find_menu_item(HMENU hmenu, UINT id, UINT flags, UINT *pos) -{ - UINT fallback_pos = ~0u, i; - POPUPMENU *menu; - - menu = grab_menu_ptr(hmenu); - if (!menu) - return NULL; - - if (flags & MF_BYPOSITION) - { - if (id >= menu->nItems) - { - release_menu_ptr(menu); - return NULL; - } - - if (pos) *pos = id; - return menu; - } - else - { - MENUITEM *item = menu->items; - for (i = 0; i < menu->nItems; i++, item++) - { - if (item->fType & MF_POPUP) - { - POPUPMENU *submenu = find_menu_item(item->hSubMenu, id, flags, pos); - - if (submenu) - { - release_menu_ptr(menu); - return submenu; - } - else if (item->wID == id) - { - /* fallback to this item if nothing else found */ - fallback_pos = i; - } - } - else if (item->wID == id) - { - if (pos) *pos = i; - return menu; - } - } - } - - if (fallback_pos != ~0u) - *pos = fallback_pos; - else - { - release_menu_ptr(menu); - menu = NULL; - } - - return menu; -} - - /********************************************************************** * MENU_ParseResource * @@ -755,22 +669,10 @@ HMENU WINAPI GetMenu( HWND hWnd ) /********************************************************************** * GetSubMenu (USER32.@) */ -HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) +HMENU WINAPI GetSubMenu( HMENU menu, INT pos ) { - POPUPMENU *menu; - HMENU submenu; - UINT pos; - - if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) - return 0; - - if (menu->items[pos].fType & MF_POPUP) - submenu = menu->items[pos].hSubMenu; - else - submenu = 0; - - release_menu_ptr(menu); - return submenu; + UINT ret = NtUserThunkedMenuItemInfo( menu, pos, MF_BYPOSITION, NtUserGetSubMenu, NULL, NULL ); + return UlongToHandle( ret ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 4ba5b42ec9d..598576437c6 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1151,6 +1151,25 @@ static BOOL check_menu_radio_item( HMENU handle, UINT first, UINT last, UINT che return done; } +/* see GetSubMenu */ +static HMENU get_sub_menu( HMENU handle, INT pos ) +{ + POPUPMENU *menu; + HMENU submenu; + UINT i; + + if (!(menu = find_menu_item( handle, pos, MF_BYPOSITION, &i ))) + return 0; + + if (menu->items[i].fType & MF_POPUP) + submenu = menu->items[i].hSubMenu; + else + submenu = 0; + + release_menu_ptr(menu); + return submenu; +} + /********************************************************************** * NtUserThunkedMenuItemInfo (win32u.@) */ @@ -1178,6 +1197,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT case NtUserGetMenuItemInfoW: return get_menu_item_info( handle, pos, flags, info, FALSE ); + case NtUserGetSubMenu: + return HandleToUlong( get_sub_menu( handle, pos )); + case NtUserInsertMenuItem: if (!info || info->cbSize != sizeof(*info)) { @@ -1314,25 +1336,6 @@ BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ) return TRUE; } -/* see GetSubMenu */ -static HMENU get_sub_menu( HMENU handle, INT pos ) -{ - POPUPMENU *menu; - HMENU submenu; - UINT i; - - if (!(menu = find_menu_item( handle, pos, MF_BYPOSITION, &i ))) - return 0; - - if (menu->items[i].fType & MF_POPUP) - submenu = menu->items[i].hSubMenu; - else - submenu = 0; - - release_menu_ptr(menu); - return submenu; -} - /********************************************************************** * NtUserMenuItemFromPoint (win32u.@) */ diff --git a/include/ntuser.h b/include/ntuser.h index e15345bb7d6..bf4e9f4b13a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -229,6 +229,7 @@ enum NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW, NtUserGetMenuState, + NtUserGetSubMenu, }; struct send_message_timeout_params -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/311

June 24, 2022

[PATCH 2/3] win32u: Move CheckMenuRadioItem implementation from user32.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 49 +++++----------------------------------------- dlls/win32u/menu.c | 45 ++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 342ee08a89b..043af437356 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1098,51 +1098,12 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, /********************************************************************** * CheckMenuRadioItem (USER32.@) */ - -BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, - UINT check, UINT flags) +BOOL WINAPI CheckMenuRadioItem( HMENU menu, UINT first, UINT last, UINT check, UINT flags ) { - POPUPMENU *first_menu = NULL, *check_menu; - UINT i, check_pos; - BOOL done = FALSE; - - for (i = first; i <= last; i++) - { - MENUITEM *item; - - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - - if (!first_menu) - first_menu = grab_menu_ptr(check_menu->obj.handle); - - if (first_menu != check_menu) - { - release_menu_ptr(check_menu); - continue; - } - - item = &check_menu->items[check_pos]; - if (item->fType != MFT_SEPARATOR) - { - if (i == check) - { - item->fType |= MFT_RADIOCHECK; - item->fState |= MFS_CHECKED; - done = TRUE; - } - else - { - /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ - item->fState &= ~MFS_CHECKED; - } - } - - release_menu_ptr(check_menu); - } - release_menu_ptr(first_menu); - - return done; + MENUITEMINFOW info; /* abuse to pass last and check */ + info.cch = last; + info.fMask = check; + return NtUserThunkedMenuItemInfo( menu, first, flags, NtUserCheckMenuRadioItem, &info, NULL ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index eab97e58d39..4ba5b42ec9d 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1109,6 +1109,48 @@ static BOOL get_menu_item_info( HMENU handle, UINT id, UINT flags, MENUITEMINFOW return TRUE; } +static BOOL check_menu_radio_item( HMENU handle, UINT first, UINT last, UINT check, UINT flags ) +{ + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; + BOOL done = FALSE; + + for (i = first; i <= last; i++) + { + MENUITEM *item; + + if (!(check_menu = find_menu_item( handle, i, flags, &check_pos ))) continue; + if (!first_menu) first_menu = grab_menu_ptr( check_menu->obj.handle ); + + if (first_menu != check_menu) + { + release_menu_ptr(check_menu); + continue; + } + + item = &check_menu->items[check_pos]; + if (item->fType != MFT_SEPARATOR) + { + if (i == check) + { + item->fType |= MFT_RADIOCHECK; + item->fState |= MFS_CHECKED; + done = TRUE; + } + else + { + /* Windows does not remove MFT_RADIOCHECK */ + item->fState &= ~MFS_CHECKED; + } + } + + release_menu_ptr( check_menu ); + } + + release_menu_ptr( first_menu ); + return done; +} + /********************************************************************** * NtUserThunkedMenuItemInfo (win32u.@) */ @@ -1121,6 +1163,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT switch (method) { + case NtUserCheckMenuRadioItem: + return check_menu_radio_item( handle, pos, info->cch, info->fMask, flags ); + 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; diff --git a/include/ntuser.h b/include/ntuser.h index 41b328376a9..e15345bb7d6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -224,6 +224,7 @@ enum NtUserSetMenuItemInfo, NtUserInsertMenuItem, /* Wine extensions */ + NtUserCheckMenuRadioItem, NtUserGetMenuItemID, NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/311

June 24, 2022