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

Jacek Caban : win32u: Move GetMenuState implementation from user32.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 1899cd2a9eebbadf5bca45f601b850ef0d8ce308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1899cd2a9eebbadf5bca45f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 16:20:38 2022 +0200 win32u: Move GetMenuState implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 32 ++------------------------------ dlls/win32u/menu.c | 34 ++++++++++++++++++++++++++++++++++ include/ntuser.h | 2 ++ 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5101a095966..e81fc086918 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3687,37 +3687,9 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, /********************************************************************** * GetMenuState (USER32.@) */ -UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags ) +UINT WINAPI GetMenuState( HMENU menu, UINT item, UINT flags ) { - POPUPMENU *menu; - UINT state, pos; - MENUITEM *item; - - TRACE("(menu=%p, id=%04x, flags=%04x);\n", hMenu, wItemID, wFlags); - - if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) - return -1; - - item = &menu->items[pos]; - debug_print_menuitem (" item: ", item, ""); - if (item->fType & MF_POPUP) - { - POPUPMENU *submenu = grab_menu_ptr(item->hSubMenu); - if (submenu) - state = (submenu->nItems << 8) | ((item->fState | item->fType) & 0xff); - else - state = -1; - release_menu_ptr(submenu); - } - else - { - /* We used to (from way back then) mask the result to 0xff. */ - /* I don't know why and it seems wrong as the documented */ - /* return flag MF_SEPARATOR is outside that mask. */ - state = (item->fType | item->fState); - } - release_menu_ptr(menu); - return state; + return NtUserThunkedMenuItemInfo( menu, item, flags, NtUserGetMenuState, NULL, NULL ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 0d7127fb4c6..0f918a4762d 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -772,6 +772,37 @@ static BOOL set_menu_item_info( MENUITEM *menu, const MENUITEMINFOW *info ) return TRUE; } +/* see GetMenuState */ +static UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) +{ + POPUPMENU *menu; + UINT state, pos; + MENUITEM *item; + + TRACE( "(menu=%p, id=%04x, flags=%04x);\n", handle, item_id, flags ); + + if (!(menu = find_menu_item( handle, item_id, flags, &pos ))) + return -1; + + item = &menu->items[pos]; + TRACE( " item: %s\n", debugstr_menuitem( item )); + if (item->fType & MF_POPUP) + { + POPUPMENU *submenu = grab_menu_ptr( item->hSubMenu ); + if (submenu) + state = (submenu->nItems << 8) | ((item->fState | item->fType) & 0xff); + else + state = -1; + release_menu_ptr( submenu ); + } + else + { + state = item->fType | item->fState; + } + release_menu_ptr(menu); + return state; +} + /********************************************************************** * NtUserThunkedMenuItemInfo (win32u.@) */ @@ -822,6 +853,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT release_menu_ptr(menu); break; + case NtUserGetMenuState: + return get_menu_state( handle, pos, flags ); + default: FIXME( "unsupported method %u\n", method ); return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index 75b9ba7b73c..75c16e412c0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -183,6 +183,8 @@ enum { NtUserSetMenuItemInfo, NtUserInsertMenuItem, + /* Wine extensions */ + NtUserGetMenuState, }; struct send_message_timeout_params

1 0

Jacek Caban : win32u: Move NtUserTranslateAccelerator from user32.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: dc0d16f192fa245dea07384b8290d7b64ac1970a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0d16f192fa245dea07384b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Apr 10 16:14:50 2022 +0200 win32u: Move NtUserTranslateAccelerator from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 204 +------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 279 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + 7 files changed, 291 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc0d16f192fa245dea07…

1 0

Jacek Caban : win32u: Move NtUserGetSystemMenu implementation from user32.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 4604c4554007165e84d4dc44db215975923e2ba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4604c4554007165e84d4dc44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 00:54:36 2022 +0200 win32u: Move NtUserGetSystemMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 + dlls/user32/defwnd.c | 6 +++--- dlls/user32/mdi.c | 4 ++-- dlls/user32/menu.c | 45 ++------------------------------------------ dlls/user32/nonclient.c | 8 ++++---- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/win32u/class.c | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 15 files changed, 70 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4604c4554007165e84d4…

1 0

Jacek Caban : win32u: Move NtUserDeleteMenu implementation from user32.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 189da79a18bcb7baabcd50de36bf2a6ba818b79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=189da79a18bcb7baabcd50de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 00:42:16 2022 +0200 win32u: Move NtUserDeleteMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 6 +++--- dlls/user32/menu.c | 26 +++----------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 19 +++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 9 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b856f054247..1b06143d4cf 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -945,11 +945,11 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild ) } /* close */ - DeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_CLOSE, MF_BYCOMMAND ); /* restore */ - DeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_RESTORE, MF_BYCOMMAND ); /* minimize */ - DeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_MINIMIZE, MF_BYCOMMAND ); DrawMenuBar(frame); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 669d838bf61..761718182b5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -410,7 +410,7 @@ static HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) if (hPopupMenu) { if (GetClassLongW(hWnd, GCL_STYLE) & CS_NOCLOSE) - DeleteMenu(hPopupMenu, SC_CLOSE, MF_BYCOMMAND); + NtUserDeleteMenu( hPopupMenu, SC_CLOSE, MF_BYCOMMAND ); InsertMenuW( hMenu, -1, MF_SYSMENU | MF_POPUP | MF_BYPOSITION, (UINT_PTR)hPopupMenu, NULL ); @@ -3540,7 +3540,7 @@ BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data, TRACE("menu=%p pos=%d data=%p id=%08x flags=%08x\n", hMenu, pos, data, id, flags ); if (flags & MF_APPEND) return AppendMenuA( hMenu, flags & ~MF_APPEND, id, data ); - if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE); + if (flags & MF_DELETE) return NtUserDeleteMenu( hMenu, pos, flags & ~MF_DELETE ); if (flags & MF_CHANGE) return ModifyMenuA(hMenu, pos, flags & ~MF_CHANGE, id, data ); if (flags & MF_REMOVE) return NtUserRemoveMenu( hMenu, @@ -3560,7 +3560,7 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, TRACE("menu=%p pos=%d data=%p id=%08x flags=%08x\n", hMenu, pos, data, id, flags ); if (flags & MF_APPEND) return AppendMenuW( hMenu, flags & ~MF_APPEND, id, data ); - if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE); + if (flags & MF_DELETE) return NtUserDeleteMenu( hMenu, pos, flags & ~MF_DELETE ); if (flags & MF_CHANGE) return ModifyMenuW(hMenu, pos, flags & ~MF_CHANGE, id, data ); if (flags & MF_REMOVE) return NtUserRemoveMenu( hMenu, @@ -3825,26 +3825,6 @@ BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags, } -/********************************************************************** - * DeleteMenu (USER32.@) - */ -BOOL WINAPI DeleteMenu( HMENU hMenu, UINT id, UINT flags ) -{ - POPUPMENU *menu; - UINT pos; - - if (!(menu = find_menu_item(hMenu, id, flags, &pos))) - return FALSE; - - if (menu->items[pos].fType & MF_POPUP) - NtUserDestroyMenu( menu->items[pos].hSubMenu ); - - NtUserRemoveMenu( menu->obj.handle, pos, flags | MF_BYPOSITION ); - release_menu_ptr(menu); - return TRUE; -} - - /******************************************************************* * ModifyMenuW (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 26f2d1caf45..0697bcfa841 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -153,7 +153,7 @@ @ stdcall DefWindowProcA(long long long long) @ stdcall DefWindowProcW(long long long long) @ stdcall DeferWindowPos(long long long long long long long long) -@ stdcall DeleteMenu(long long long) +@ stdcall DeleteMenu(long long long) NtUserDeleteMenu @ stdcall DeregisterShellHookWindow (long) @ stdcall DestroyAcceleratorTable(long) NtUserDestroyAcceleratorTable @ stdcall DestroyCaret() diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index d41aba956f2..67abac37037 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -976,6 +976,25 @@ BOOL WINAPI NtUserRemoveMenu( HMENU handle, UINT id, UINT flags ) return TRUE; } +/********************************************************************** + * NtUserDeleteMenu (win32u.@) + */ +BOOL WINAPI NtUserDeleteMenu( HMENU handle, UINT id, UINT flags ) +{ + POPUPMENU *menu; + UINT pos; + + if (!(menu = find_menu_item( handle, id, flags, &pos ))) + return FALSE; + + if (menu->items[pos].fType & MF_POPUP) + NtUserDestroyMenu( menu->items[pos].hSubMenu ); + + NtUserRemoveMenu( menu->obj.handle, pos, flags | MF_BYPOSITION ); + release_menu_ptr( menu ); + return TRUE; +} + /********************************************************************** * NtUserSetMenuContextHelpId (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f585e90bd4a..488056ef439 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -114,6 +114,7 @@ static void * const syscalls[] = NtUserCreateAcceleratorTable, NtUserCreateDesktopEx, NtUserCreateWindowStation, + NtUserDeleteMenu, NtUserDestroyAcceleratorTable, NtUserFindExistingCursorIcon, NtUserFindWindowEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 483b3d52289..43db8421bb8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -824,7 +824,7 @@ @ stdcall NtUserDeferWindowPosAndBand(long long long long long long long long long long) @ stub NtUserDelegateCapturePointers @ stub NtUserDelegateInput -@ stub NtUserDeleteMenu +@ stdcall -syscall NtUserDeleteMenu(long long long) @ stub NtUserDeleteWindowGroup @ stdcall -syscall NtUserDestroyAcceleratorTable(long) @ stub NtUserDestroyActivationGroup diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 776a7e671f6..27ba163408b 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserCreateAcceleratorTable ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ + SYSCALL_ENTRY( NtUserDeleteMenu ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserFindWindowEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1f287c7631c..d90c4ec2f99 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -669,6 +669,15 @@ NTSTATUS WINAPI wow64_NtUserCheckMenuItem( UINT *args ) return NtUserCheckMenuItem( handle, id, flags ); } +NTSTATUS WINAPI wow64_NtUserDeleteMenu( UINT *args ) +{ + HMENU menu = get_handle( &args ); + UINT id = get_ulong( &args ); + UINT flags = get_ulong( &args ); + + return NtUserDeleteMenu( menu, id, flags ); +} + NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 1876b32c84b..dfa9f53a187 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -487,6 +487,7 @@ HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK m ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ); +BOOL WINAPI NtUserDeleteMenu( HMENU menu, UINT id, UINT flags ); BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle ); BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDestroyMenu( HMENU menu );

1 0

Jacek Caban : win32u: Move GetMenuItemCount implementation from user32.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: bad82953dbe5c0a8a61f81ca5313d7f32a004977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad82953dbe5c0a8a61f81ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 16:28:06 2022 +0200 win32u: Move GetMenuItemCount implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 12 ++---------- dlls/win32u/menu.c | 14 ++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e81fc086918..9f51fa555f8 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3696,17 +3696,9 @@ UINT WINAPI GetMenuState( HMENU menu, UINT item, UINT flags ) /********************************************************************** * GetMenuItemCount (USER32.@) */ -INT WINAPI GetMenuItemCount( HMENU hMenu ) +INT WINAPI GetMenuItemCount( HMENU menu ) { - POPUPMENU *menu = grab_menu_ptr(hMenu); - INT count; - - if (!menu) return -1; - count = menu->nItems; - release_menu_ptr(menu); - - TRACE("(%p) returning %d\n", hMenu, count); - return count; + return NtUserGetMenuItemCount( menu ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 0f918a4762d..8544cca47b4 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -864,6 +864,20 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT return ret; } +/* see GetMenuItemCount */ +INT get_menu_item_count( HMENU handle ) +{ + POPUPMENU *menu; + INT count; + + if (!(menu = grab_menu_ptr( handle ))) return -1; + count = menu->nItems; + release_menu_ptr(menu); + + TRACE( "(%p) returning %d\n", handle, count ); + return count; +} + /********************************************************************** * NtUserRemoveMenu (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3cf03d68399..114016954aa 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4718,6 +4718,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_GetIconParam: return get_icon_param( UlongToHandle(arg) ); + case NtUserCallOneParam_GetMenuItemCount: + return get_menu_item_count( UlongToHandle(arg) ); + case NtUserCallOneParam_GetSysColor: return get_sys_color( arg ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index caf77590559..537eec38a34 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -377,6 +377,7 @@ extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN; extern BOOL draw_menu_bar( HWND hwnd ) DECLSPEC_HIDDEN; extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; +extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 75c16e412c0..1876b32c84b 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -704,6 +704,7 @@ enum NtUserCallOneParam_GetClipCursor, NtUserCallOneParam_GetCursorPos, NtUserCallOneParam_GetIconParam, + NtUserCallOneParam_GetMenuItemCount, NtUserCallOneParam_GetPrimaryMonitorRect, NtUserCallOneParam_GetSysColor, NtUserCallOneParam_GetSysColorBrush, @@ -773,6 +774,11 @@ static inline UINT_PTR NtUserGetIconParam( HICON icon ) return NtUserCallOneParam( HandleToUlong(icon), NtUserCallOneParam_GetIconParam ); } +static inline UINT_PTR NtUserGetMenuItemCount( HMENU menu ) +{ + return NtUserCallOneParam( HandleToUlong(menu), NtUserCallOneParam_GetMenuItemCount ); +} + static inline RECT NtUserGetPrimaryMonitorRect(void) { RECT primary;

1 0

Jacek Caban : user32: Perform Unicode conversion in InsertMenuItemA.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 75c297f2b81a0e69181db1f07ae386ca4119047c URL: https://source.winehq.org/git/wine.git/?a=commit;h=75c297f2b81a0e69181db1f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 30 18:53:46 2022 +0200 user32: Perform Unicode conversion in InsertMenuItemA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 58 +++++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 14ed4cb10e2..5e9d8df17f5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -127,7 +127,7 @@ static BOOL fEndMenu = FALSE; DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFONT hFont); -static BOOL SetMenuItemInfo_common( MENUITEM *, const MENUITEMINFOW *, BOOL); +static BOOL SetMenuItemInfo_common( MENUITEM *, const MENUITEMINFOW * ); static BOOL is_win_menu_disallowed(HWND hwnd) { @@ -3895,7 +3895,7 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, mii.fMask |= MIIM_CHECKMARKS; item = &menu->items[newpos]; - ret = SetMenuItemInfo_common( item, &mii, TRUE); + ret = SetMenuItemInfo_common( item, &mii ); if (!ret) RemoveMenu( hMenu, pos, flags ); release_menu_ptr(menu); @@ -4032,7 +4032,7 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, } menu->Height = 0; /* force size recalculate */ MENU_mnu2mnuii( flags, id, str, &mii); - ret = SetMenuItemInfo_common(&menu->items[item_pos], &mii, TRUE); + ret = SetMenuItemInfo_common( &menu->items[item_pos], &mii ); release_menu_ptr(menu); return ret; } @@ -4654,26 +4654,6 @@ BOOL WINAPI GetMenuItemInfoW( HMENU hmenu, UINT item, BOOL bypos, } -/* set a menu item text from an ANSI or Unicode string */ -static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicode ) -{ - if (!text) - menu->text = NULL; - else if (unicode) - { - if ((menu->text = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(text)+1) * sizeof(WCHAR) ))) - lstrcpyW( menu->text, text ); - } - else - { - LPCSTR str = (LPCSTR)text; - int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - if ((menu->text = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_ACP, 0, str, -1, menu->text, len ); - } -} - - /********************************************************************** * MENU_depth * @@ -4709,9 +4689,7 @@ static int MENU_depth( POPUPMENU *pmenu, int depth) * MIIM_BITMAP and MIIM_STRING flags instead. */ -static BOOL SetMenuItemInfo_common(MENUITEM * menu, - const MENUITEMINFOW *lpmii, - BOOL unicode) +static BOOL SetMenuItemInfo_common( MENUITEM *menu, const MENUITEMINFOW *lpmii ) { if (!menu) return FALSE; @@ -4722,9 +4700,13 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, menu->fType |= lpmii->fType & MENUITEMINFO_TYPE_MASK; } if (lpmii->fMask & MIIM_STRING ) { + const WCHAR *text = lpmii->dwTypeData; /* free the string when used */ HeapFree(GetProcessHeap(), 0, menu->text); - set_menu_item_text( menu, lpmii->dwTypeData, unicode ); + if (!text) + menu->text = NULL; + else if ((menu->text = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(text)+1) * sizeof(WCHAR) ))) + lstrcpyW( menu->text, text ); } if (lpmii->fMask & MIIM_STATE) @@ -4850,7 +4832,7 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, if (item == SC_TASKLIST && !bypos) return TRUE; return FALSE; } - ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); + ret = SetMenuItemInfo_common( &menu->items[pos], &mii ); release_menu_ptr(menu); HeapFree( GetProcessHeap(), 0, strW ); return ret; @@ -4878,7 +4860,7 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, return FALSE; } - ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); + ret = SetMenuItemInfo_common(&menu->items[pos], &mii); release_menu_ptr(menu); return ret; } @@ -4931,6 +4913,7 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags) BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOA *lpmii) { + WCHAR *strW = NULL; MENUITEMINFOW mii; POPUPMENU *menu; UINT pos; @@ -4940,11 +4923,24 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; + if ((mii.fMask & MIIM_STRING) && mii.dwTypeData) + { + const char *str = (const char *)mii.dwTypeData; + UINT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if (!(strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_ACP, 0, str, -1, strW, len ); + mii.dwTypeData = strW; + } + if (!(menu = insert_menu_item(hMenu, uItem, bypos ? MF_BYPOSITION : 0, &pos))) + { + HeapFree( GetProcessHeap(), 0, strW ); return FALSE; + } - ret = SetMenuItemInfo_common(&menu->items[pos], &mii, FALSE); + ret = SetMenuItemInfo_common( &menu->items[pos], &mii ); release_menu_ptr(menu); + HeapFree( GetProcessHeap(), 0, strW ); return ret; } @@ -4967,7 +4963,7 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, if (!(menu = insert_menu_item(hMenu, uItem, bypos ? MF_BYPOSITION : 0, &pos))) return FALSE; - ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); + ret = SetMenuItemInfo_common( &menu->items[pos], &mii ); release_menu_ptr(menu); return ret; }

1 0

Jacek Caban : user32: Perform Unicode conversion in SetMenuItemInfoA.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: d5a367783eef7390b8cc73fe6b090c757b997863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a367783eef7390b8cc73fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 21:46:32 2022 +0200 user32: Perform Unicode conversion in SetMenuItemInfoA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6336355691d..14ed4cb10e2 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4824,6 +4824,7 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { + WCHAR *strW = NULL; MENUITEMINFOW mii; POPUPMENU *menu; UINT pos; @@ -4833,14 +4834,25 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; + if ((mii.fMask & MIIM_STRING) && mii.dwTypeData) + { + const char *str = (const char *)mii.dwTypeData; + UINT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if (!(strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_ACP, 0, str, -1, strW, len ); + mii.dwTypeData = strW; + } + if (!(menu = find_menu_item(hmenu, item, bypos ? MF_BYPOSITION : 0, &pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ + HeapFree( GetProcessHeap(), 0, strW ); if (item == SC_TASKLIST && !bypos) return TRUE; return FALSE; } - ret = SetMenuItemInfo_common(&menu->items[pos], &mii, FALSE); + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); release_menu_ptr(menu); + HeapFree( GetProcessHeap(), 0, strW ); return ret; }

1 0

Alexandre Julliard : kernelbase: Implement ResolveLocaleName().
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: ea1eae646dd8aceb5078a8675e32be65c53da304 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1eae646dd8aceb5078a867… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 14:12:10 2022 +0200 kernelbase: Implement ResolveLocaleName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/locale.c | 37 ++++++++++++++++++++-- 2 files changed, 108 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 65687313fbb..dc9fc7c09e6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -72,6 +72,7 @@ static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pIdnToUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pGetLocaleInfoEx)(LPCWSTR, LCTYPE, LPWSTR, INT); static BOOL (WINAPI *pIsValidLocaleName)(LPCWSTR); +static INT (WINAPI *pResolveLocaleName)(LPCWSTR,LPWSTR,INT); static INT (WINAPI *pCompareStringOrdinal)(const WCHAR *, INT, const WCHAR *, INT, BOOL); static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPNLSVERSIONINFO, LPVOID, LPARAM); @@ -125,6 +126,7 @@ static void InitFunctionPointers(void) X(IdnToUnicode); X(GetLocaleInfoEx); X(IsValidLocaleName); + X(ResolveLocaleName); X(CompareStringOrdinal); X(CompareStringEx); X(GetGeoInfoA); @@ -5160,6 +5162,77 @@ static void test_IsValidLocaleName(void) ok(!ret, "RtlIsValidLocaleName should have failed\n"); } +static void test_ResolveLocaleName(void) +{ + static const struct { const WCHAR *name, *exp; BOOL broken; } tests[] = + { + { L"en-US", L"en-US" }, + { L"en", L"en-US" }, + { L"en-RR", L"en-US" }, + { L"en-na", L"en-NA", TRUE /* <= win8 */ }, + { L"EN-zz", L"en-US" }, + { L"en-US", L"en-US" }, + { L"de-DE_phoneb", L"de-DE" }, + { L"DE-de-phoneb", L"de-DE" }, + { L"fr-029", L"fr-029", TRUE /* <= win8 */ }, + { L"fr-CH_XX", L"fr-CH", TRUE /* <= win10 1809 */ }, + { L"fr-CHXX", L"fr-FR" }, + { L"zh", L"zh-CN" }, + { L"zh-Hant", L"zh-HK" }, + { L"zh-hans", L"zh-CN" }, + { L"ja-jp_radstr", L"ja-JP" }, + { L"az", L"az-Latn-AZ" }, + { L"uz", L"uz-Latn-UZ" }, + { L"uz-cyrl", L"uz-Cyrl-UZ" }, + { L"ia", L"ia-001", TRUE /* <= win10 1809 */ }, + { L"zz", L"" }, + { L"zzz-ZZZ", L"" }, + { L"zzzz", L"" }, + { L"zz+XX", NULL }, + { L"zz.XX", NULL }, + { LOCALE_NAME_INVARIANT, L"" }, + { LOCALE_NAME_SYSTEM_DEFAULT, NULL }, + }; + INT i, ret; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + + if (!pResolveLocaleName) + { + win_skip( "ResolveLocaleName not available\n" ); + return; + } + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + SetLastError( 0xdeadbeef ); + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pResolveLocaleName( tests[i].name, buffer, sizeof(buffer) ); + if (tests[i].exp) + { + ok( !wcscmp( buffer, tests[i].exp ) || broken( tests[i].broken ), + "%s: got %s\n", debugstr_w(tests[i].name), debugstr_w(buffer) ); + ok( ret == wcslen(buffer) + 1, "%s: got %u\n", debugstr_w(tests[i].name), ret ); + } + else + { + ok( !ret || broken( ret == 1 ) /* win7 */, + "%s: got %s\n", debugstr_w(tests[i].name), debugstr_w(buffer) ); + if (!ret) + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "%s: wrong error %lu\n", debugstr_w(tests[i].name), GetLastError() ); + } + } + SetLastError( 0xdeadbeef ); + ret = pResolveLocaleName( L"en-US", buffer, 4 ); + ok( !ret, "got %u\n", ret ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %lu\n", GetLastError() ); + ok( !wcscmp( buffer, L"en-" ), "got %s\n", debugstr_w(buffer) ); + + SetLastError( 0xdeadbeef ); + ret = pResolveLocaleName( L"en-US", NULL, 0 ); + ok( ret == 6, "got %u\n", ret ); + ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); +} + static void test_CompareStringOrdinal(void) { INT ret; @@ -7635,6 +7708,7 @@ START_TEST(locale) test_GetStringTypeW(); test_Idn(); test_IsValidLocaleName(); + test_ResolveLocaleName(); test_CompareStringOrdinal(); test_GetGeoInfo(); test_EnumSystemGeoID(); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 25ccfc5f010..b002d219d61 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -6057,10 +6057,41 @@ INT WINAPI DECLSPEC_HOTPATCH NormalizeString(NORM_FORM form, const WCHAR *src, I */ INT WINAPI DECLSPEC_HOTPATCH ResolveLocaleName( LPCWSTR name, LPWSTR buffer, INT len ) { - FIXME( "stub: %s, %p, %d\n", wine_dbgstr_w(name), buffer, len ); + LCID lcid; + UINT pos, datalen; + const NLS_LOCALE_DATA *locale = get_locale_by_name( name, &lcid ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (!locale) + { + static const WCHAR valid[] = L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; + WCHAR *p, tmp[LOCALE_NAME_MAX_LENGTH]; + + if (wcsspn( name, valid ) < wcslen( name )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + lstrcpynW( tmp, name, LOCALE_NAME_MAX_LENGTH ); + while (!locale) + { + for (p = tmp + wcslen(tmp) - 1; p >= tmp; p--) if (*p == '-' || *p == '_') break; + if (p <= tmp) break; + *p = 0; + locale = get_locale_by_name( tmp, &lcid ); + } + } + + pos = locale ? (locale->inotneutral ? locale->sname : locale->ssortlocale) : 0; + datalen = locale_strings[pos] + 1; + + if (!len) return datalen; + lstrcpynW( buffer, locale_strings + pos + 1, len ); + if (datalen > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + return datalen; }

1 0

Eric Pouech : xcopy: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 1adb4b52ffb7f51928a778e7d5b33fda9c7c69f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1adb4b52ffb7f51928a778e7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 xcopy: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 0f46a6c42ab..1d003007c0b 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -150,7 +150,7 @@ static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { } /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, + convertedChars = WideCharToMultiByte(GetOEMCP(), 0, output_bufW, len, output_bufA, MAX_WRITECONSOLE_SIZE, "?", &usedDefaultChar); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars,

1 0

Eric Pouech : whoami: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 98838aaf97ba64c4dfc3a16bb724ed470d18bb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98838aaf97ba64c4dfc3a16b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 whoami: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/whoami/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/programs/whoami/main.c b/programs/whoami/main.c index 7f6381d161a..7e93de998ef 100644 --- a/programs/whoami/main.c +++ b/programs/whoami/main.c @@ -26,24 +26,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(whoami); static int output_write(const WCHAR* str, int len) { - DWORD ret, count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); - if (!ret) + DWORD count; + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL)) { DWORD lenA; char* strA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. + * back to WriteFile() with OEM code page. */ - lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); strA = HeapAlloc(GetProcessHeap(), 0, lenA); if (!strA) return 0; - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); HeapFree(GetProcessHeap(), 0, strA);

1 0