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

Eric Pouech : xcopy: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

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

Alexandre Julliard : kernelbase: Implement ResolveLocaleName().
by Alexandre Julliard 02 May '22

02 May '22

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

Alexandre Julliard : sfc_os: Stub SfpVerifyFile().
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 000b637fa0d4e50c5534aa8520ac625b054cdf07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000b637fa0d4e50c5534aa85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 22:43:37 2022 +0200 sfc_os: Stub SfpVerifyFile(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/sfc.spec | 2 +- dlls/sfc_os/sfc_os.c | 7 +++++++ dlls/sfc_os/sfc_os.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 7509c98b666..d52346d8fdc 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -13,4 +13,4 @@ @ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected -@ stdcall SfpVerifyFile() sfc_os.SfpVerifyFile +@ stdcall SfpVerifyFile(str ptr long) sfc_os.SfpVerifyFile diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 61614264c77..074757d1566 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -123,6 +123,13 @@ DWORD WINAPI SfcConnectToServer(DWORD unknown) return 0; } +BOOL WINAPI SfpVerifyFile(LPCSTR filename, LPSTR error, DWORD size) +{ + FIXME("%s: stub\n", debugstr_a(filename)); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + BOOL WINAPI SRSetRestorePointA(RESTOREPOINTINFOA *restorepoint, STATEMGRSTATUS *status) { FIXME("%p %p\n", restorepoint, status); diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec index 271043e985d..3c717015e56 100644 --- a/dlls/sfc_os/sfc_os.spec +++ b/dlls/sfc_os/sfc_os.spec @@ -15,4 +15,4 @@ @ stub SfcTerminateWatcherThread @ stub SfpDeleteCatalog @ stub SfpInstallCatalog -@ stub SfpVerifyFile +@ stdcall SfpVerifyFile(str ptr long)

1 0

Jacek Caban : user32: Use GetMenuInfo for IsMenu implementation.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 926f5bb416b77b1d479a71a8d18fc10204fc46d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926f5bb416b77b1d479a71a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 29 22:25:17 2022 +0200 user32: Use GetMenuInfo for IsMenu implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index cc6c5c953e9..cf68aaff31b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4482,19 +4482,16 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template ) /********************************************************************** * IsMenu (USER32.@) */ -BOOL WINAPI IsMenu(HMENU hmenu) +BOOL WINAPI IsMenu( HMENU menu ) { - POPUPMENU *menu; - BOOL is_menu; - - menu = grab_menu_ptr(hmenu); - is_menu = menu != NULL; - release_menu_ptr(menu); + MENUINFO info; - if (!is_menu) - SetLastError(ERROR_INVALID_MENU_HANDLE); + info.cbSize = sizeof(info); + info.fMask = 0; + if (GetMenuInfo( menu, &info )) return TRUE; - return is_menu; + SetLastError(ERROR_INVALID_MENU_HANDLE); + return FALSE; } /**********************************************************************

1 0

Jacek Caban : user32: Use MIIM_CHECKMARKS flag in InsertMenuW.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: c7a07f73c5d027142a76eebb9dc0d4edabcd935a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a07f73c5d027142a76eebb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 21:22:19 2022 +0200 user32: Use MIIM_CHECKMARKS flag in InsertMenuW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index cf68aaff31b..6336355691d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3892,12 +3892,11 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, return FALSE; MENU_mnu2mnuii( flags, id, str, &mii); + mii.fMask |= MIIM_CHECKMARKS; item = &menu->items[newpos]; ret = SetMenuItemInfo_common( item, &mii, TRUE); - if (ret) - item->hCheckBit = item->hUnCheckBit = 0; - else + if (!ret) RemoveMenu( hMenu, pos, flags ); release_menu_ptr(menu);

1 0

Jacek Caban : user32: Perform Unicode conversion in SetMenuItemInfoA.
by Alexandre Julliard 02 May '22

02 May '22

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

Jacek Caban : user32: Perform Unicode conversion in InsertMenuItemA.
by Alexandre Julliard 02 May '22

02 May '22

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 : win32u: Move menu item info management from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 77ab51019f56b1537c531d1b5233b75c5e6983e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77ab51019f56b1537c531d1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 00:51:26 2022 +0200 win32u: Move menu item info management 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/mdi.c | 4 +- dlls/user32/menu.c | 324 +++------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/menu.c | 346 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/syscall.c | 2 + dlls/win32u/win32u.spec | 4 +- dlls/wow64win/syscall.h | 2 + dlls/wow64win/user.c | 63 ++++++++ include/ntuser.h | 10 ++ 12 files changed, 444 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77ab51019f56b1537c53…

1 0

Jacek Caban : win32u/tests: Add NtUserThunkedMenuItemInfo tests.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: d366ef515d0970aea352fe160c7ee08ed61bc3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d366ef515d0970aea352fe16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 01:10:44 2022 +0200 win32u/tests: Add NtUserThunkedMenuItemInfo tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/tests/win32u.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 401913f0aee..03c143cc143 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -505,6 +505,80 @@ static void test_window_text(void) DestroyWindow( hwnd ); } +#define test_menu_item_id(a, b, c) test_menu_item_id_(a, b, c, __LINE__) +static void test_menu_item_id_( HMENU menu, int pos, int expect, int line ) +{ + MENUITEMINFOW item; + BOOL ret; + + item.cbSize = sizeof(item); + item.fMask = MIIM_ID; + ret = GetMenuItemInfoW( menu, pos, TRUE, &item ); + ok_(__FILE__,line)( ret, "GetMenuItemInfoW failed: %lu\n", GetLastError() ); + ok_(__FILE__,line)( item.wID == expect, "got if %d, expected %d\n", item.wID, expect ); +} + +static void test_menu(void) +{ + MENUITEMINFOW item; + HMENU menu; + int count; + BOOL ret; + + menu = CreateMenu(); + + memset( &item, 0, sizeof(item) ); + item.cbSize = sizeof(item); + item.fMask = MIIM_ID; + item.wID = 10; + ret = NtUserThunkedMenuItemInfo( menu, 0, MF_BYPOSITION, NtUserInsertMenuItem, &item, NULL ); + ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() ); + + count = GetMenuItemCount( menu ); + ok( count == 1, "count = %d\n", count ); + + item.wID = 20; + ret = NtUserThunkedMenuItemInfo( menu, 1, MF_BYPOSITION, NtUserInsertMenuItem, &item, NULL ); + ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() ); + + count = GetMenuItemCount( menu ); + ok( count == 2, "count = %d\n", count ); + test_menu_item_id( menu, 0, 10 ); + test_menu_item_id( menu, 1, 20 ); + + item.wID = 30; + ret = NtUserThunkedMenuItemInfo( menu, 1, MF_BYPOSITION, NtUserInsertMenuItem, &item, NULL ); + ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() ); + + count = GetMenuItemCount( menu ); + ok( count == 3, "count = %d\n", count ); + test_menu_item_id( menu, 0, 10 ); + test_menu_item_id( menu, 1, 30 ); + test_menu_item_id( menu, 2, 20 ); + + item.wID = 50; + ret = NtUserThunkedMenuItemInfo( menu, 10, 0, NtUserInsertMenuItem, &item, NULL ); + ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() ); + + count = GetMenuItemCount( menu ); + ok( count == 4, "count = %d\n", count ); + test_menu_item_id( menu, 0, 50 ); + test_menu_item_id( menu, 1, 10 ); + test_menu_item_id( menu, 2, 30 ); + test_menu_item_id( menu, 3, 20 ); + + item.wID = 60; + ret = NtUserThunkedMenuItemInfo( menu, 1, MF_BYPOSITION, NtUserSetMenuItemInfo, &item, NULL ); + ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() ); + + count = GetMenuItemCount( menu ); + ok( count == 4, "count = %d\n", count ); + test_menu_item_id( menu, 1, 60 ); + + ret = NtUserDestroyMenu( menu ); + ok( ret, "NtUserDestroyMenu failed: %lu\n", GetLastError() ); +} + START_TEST(win32u) { /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ @@ -517,6 +591,7 @@ START_TEST(win32u) test_cursoricon(); test_message_call(); test_window_text(); + test_menu(); test_NtUserCloseWindowStation(); }

1 0

Jacek Caban : win32u: Move GetMenuState implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

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