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

Jacek Caban : win32u/tests: Add NtUserThunkedMenuItemInfo tests.
by Alexandre Julliard May 2, 2022

May 2, 2022

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

Alexandre Julliard : sfc_os: Stub SfpVerifyFile().
by Alexandre Julliard May 2, 2022

May 2, 2022

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

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

May 2, 2022

Module: wine Branch: master Commit: c277ef66fc1d4c5cbebd07d389f4c789b113f3b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c277ef66fc1d4c5cbebd07d3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 wscript: 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/wscript/host.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index bd16b7b4cbe..463f5ee7aa6 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -80,12 +80,12 @@ static void print_string(const WCHAR *string) return; } - lena = WideCharToMultiByte(GetConsoleOutputCP(), 0, string, len, NULL, 0, NULL, NULL); + lena = WideCharToMultiByte(GetOEMCP(), 0, string, len, NULL, 0, NULL, NULL); buf = heap_alloc(len); if(!buf) return; - WideCharToMultiByte(GetConsoleOutputCP(), 0, string, len, buf, lena, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, string, len, buf, lena, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, lena, &count, FALSE); heap_free(buf); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), "\r\n", 2, &count, FALSE);

1 0

Jacek Caban : user32: Use MIIM_CHECKMARKS flag in InsertMenuW.
by Alexandre Julliard May 2, 2022

May 2, 2022

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

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

May 2, 2022

Module: wine Branch: master Commit: 18f9d2dd9df6864b23332610aa5be63029e83f8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f9d2dd9df6864b23332610… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 start: 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/start/start.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 835128ebf28..62804917941 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -38,25 +38,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(start); static void output(const WCHAR *message) { DWORD count; - DWORD res; int wlen = lstrlenW(message); if (!wlen) return; - res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL); - /* If writing to console fails, assume it's file * i/o so convert to OEM codepage and output */ - if (!res) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL)) { DWORD len; char *mesA; /* Convert to OEM, then output */ - len = WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( GetOEMCP(), 0, message, wlen, NULL, 0, NULL, NULL ); mesA = HeapAlloc(GetProcessHeap(), 0, len*sizeof(char)); if (!mesA) return; - WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, mesA, len, NULL, NULL ); + WideCharToMultiByte( GetOEMCP(), 0, message, wlen, mesA, len, NULL, NULL ); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), mesA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, mesA); }

1 0

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

May 2, 2022

Module: wine Branch: master Commit: aebe845316a035c034e0470cbb549b443b6f7a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebe845316a035c034e0470c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 hostname: 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/hostname/hostname.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index b8704cff7a7..73f4d259c16 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -32,28 +32,26 @@ static int hostname_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; - DWORD count, ret; + DWORD count; WCHAR msg_buffer[8192]; wlen = vswprintf(msg_buffer, ARRAY_SIZE(msg_buffer), msg, va_args); - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL)) { DWORD len; char *msgA; /* 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. */ - len = WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, + len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); if (!msgA) return 0; - WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

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

May 2, 2022

Module: wine Branch: master Commit: 8201fe2494c1df6ff0693ba9d339f4e290e65459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8201fe2494c1df6ff0693ba9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 ipconfig: 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/ipconfig/ipconfig.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index f985d337265..b787947885d 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -31,30 +31,27 @@ static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; - DWORD count, ret; + DWORD count; WCHAR msg_buffer[8192]; wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, ARRAY_SIZE(msg_buffer), &va_args); - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL)) { DWORD len; char *msgA; /* 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. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); if (!msgA) return 0; - WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, - NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

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

May 2, 2022

Module: wine Branch: master Commit: b111fab95315238d794b2ea6933622efd0b2a1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b111fab95315238d794b2ea6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 regedit: 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/regedit/regedit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 6a50a63226f..cc31f83c903 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -30,21 +30,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); static void output_writeconsole(const WCHAR *str, DWORD wlen) { - DWORD count, ret; + DWORD count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) { DWORD len; char *msgA; /* WriteConsole() fails on Windows if its output is redirected. If this occurs, - * we should call WriteFile() and assume the console encoding is still correct. + * we should call WriteFile() with OEM code page. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = heap_xalloc(len); + if (!msgA) return; - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); heap_free(msgA); }

1 0

Drew Ronneberg : urlmon: Remove obsolete -D_URLMON_ from Makefile.in.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 4d9b7b6cbc317bb77b200cefa6fe52ec4b183020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d9b7b6cbc317bb77b200cef… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:10 2022 -0400 urlmon: Remove obsolete -D_URLMON_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index f95e7972829..a29c831e455 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -1,7 +1,6 @@ MODULE = urlmon.dll IMPORTLIB = urlmon IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 -EXTRADEFS = -D_URLMON_ DELAYIMPORTS = advpack C_SRCS = \

1 0

Connor McAdams : uiautomationcore/tests: Add tests for UiaProviderFromIAccessible.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 1ebccd0f442d19efeeffa7dfacbcd71c296ffc80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ebccd0f442d19efeeffa7df… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Apr 29 09:46:56 2022 -0400 uiautomationcore/tests: Add tests for UiaProviderFromIAccessible. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/tests/Makefile.in | 2 +- dlls/uiautomationcore/tests/uiautomation.c | 424 +++++++++++++++++++++++++++++ 2 files changed, 425 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ebccd0f442d19efeeff…

1 0