June 2021 - Wine-commits - list.winehq.org

Paul Gofman : dbghelp: Fix unwind opcodes on x64.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 3fab693d009491e606d5b9ff7fc3ade226dcdee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fab693d009491e606d5b9ff… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 15 16:06:40 2021 +0300 dbghelp: Fix unwind opcodes on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6bcde00566f506ffb1f7cfd9e584c793d6f4a02f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c2789d0d71b..c04d8db61cf 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -41,7 +41,8 @@ typedef enum _UNWIND_OP_CODES UWOP_SET_FPREG, UWOP_SAVE_NONVOL, UWOP_SAVE_NONVOL_FAR, - UWOP_SAVE_XMM128, + UWOP_EPILOG, + UWOP_SAVE_XMM128 = 8, UWOP_SAVE_XMM128_FAR, UWOP_PUSH_MACHFRAME } UNWIND_CODE_OPS;

1 0

Martin Storsjo : include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 0d89678307a32157cae4a39a4de7192597ef73fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d89678307a32157cae4a39a… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 11 23:00:21 2021 +0200 include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode. Clang doesn't support this attribute for windows targets right now; the attribute is only needed for selecting a potentially non-default calling convention on e.g. linux. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 52398912f954a28007468c41be7d108e0f9f11bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index a66f43877ac..4adbe0920f6 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -79,7 +79,7 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ #endif #ifndef WINAPIV -# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) # else # define WINAPIV __cdecl diff --git a/include/windef.h b/include/windef.h index 5351afe66db..ac2ec619fbd 100644 --- a/include/windef.h +++ b/include/windef.h @@ -72,7 +72,7 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ extern "C" { # endif #endif -#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) #else # define WINAPIV __cdecl

1 0

Damjan Jovanovic : mmsystem: Win16 DllEntryPoint uses HINSTANCE16, not HINSTANCE.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 087637e861ad9468b43875a3a9c0df7c537b8a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087637e861ad9468b43875a3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 12 17:42:50 2021 +0200 mmsystem: Win16 DllEntryPoint uses HINSTANCE16, not HINSTANCE. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7464d1042a10e4b013f764e3bbb52bedb6817ede) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmsystem.dll16/mmsystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 083ec2d6da6..445fc48d50e 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -66,7 +66,7 @@ CRITICAL_SECTION mmdrv_cs = { &mmdrv_critsect_debug, -1, 0, 0, 0, 0 }; * MMSYSTEM DLL entry point * */ -BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds, +BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) { static int done;

1 0

Giovanni Mascellani : dwrite: Do not segfault when there are no typographic features to return.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 4b774ec3572b9163d7763cd93ccd319da5df62f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b774ec3572b9163d7763cd9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 3 15:25:28 2021 +0100 dwrite: Do not segfault when there are no typographic features to return. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 65f5033702780ce355749b09644df57c5305db33) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/shape.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index be8a69c27c4..00b589c9e28 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -336,6 +336,12 @@ HRESULT shape_get_typographic_features(struct scriptshaping_context *context, co shape_get_script_lang_index(context, scripts, MS_GPOS_TAG, &script_index, &language_index); opentype_get_typographic_features(&context->cache->gpos, script_index, language_index, &t); + if (t.count == 0) + { + *actual_tagcount = 0; + return S_OK; + } + /* Sort and remove duplicates. */ qsort(t.tags, t.count, sizeof(*t.tags), tag_array_sorting_compare);

1 0

Nikolay Sivov : sc: Fix typos in CLI arguments parsing.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 9433c600f934febccaf19d67bde4aa59d01214eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9433c600f934febccaf19d67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 11 22:09:01 2021 +0300 sc: Fix typos in CLI arguments parsing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d3ddc1186467172c564169e054a82c9f97e99c59) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index a20813b8cd5..02b476957d6 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -82,7 +82,7 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start=" ) && i < argc - 1) { if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; @@ -134,7 +134,7 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f { if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + else if (!wcsicmp( p, L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -159,7 +159,7 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"reboot=" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"actions=" )) { @@ -264,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], L"start="L"start" )) + else if (!wcsicmp( argv[1], L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service)

1 0

Zebediah Figura : explorer: Send systray messages with SendNotifyMessage().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 4f24daba64ce9fb422877a3246bbb9a22b73d7ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f24daba64ce9fb422877a32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:31 2021 -0600 explorer: Send systray messages with SendNotifyMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7eca09d7e06ec9961c81140e717b261c07080159) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index dcd75f4e763..614cee1eb49 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -731,7 +731,7 @@ static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) } TRACE( "relaying 0x%x\n", msg ); - if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + if (!SendNotifyMessageW( icon->owner, icon->callback_message, wp, lp ) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN( "application window was destroyed, removing icon %u\n", icon->id );

1 0

Andrew Sheldon : wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: bd7041e39f7ff0bc8b54589d5eb2034e087af937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7041e39f7ff0bc8b54589d… Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Tue Apr 13 12:58:40 2021 +1000 wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT. Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d1b2eea4218dfb5d08ce2732eb6df9a283f00e0d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e8c611fd7b..344ee13e2c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -513,6 +513,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7323e38a76..5269bdec531 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2898,6 +2898,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, + CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Rémi Bernon : plugplay: Broadcast WM_DEVICECHANGE message asynchronously.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 196f033dec5bb9cf09d9e42ee54e8dc62b27b329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=196f033dec5bb9cf09d9e42e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 15 20:42:00 2021 +0100 plugplay: Broadcast WM_DEVICECHANGE message asynchronously. It may otherwise trigger a nasty race condition, where: 1) For explorer.exe to register the CLSID_ShellWindows classes, it needs RpcSS service to be started, 2) services.exe may start WinePlugPlay service group first, waiting for its startup to complete, 3) during startup and early device enumeration, hidclass.sys may call IoSetDeviceInterfaceState, which calls plugplay_send_event [1], 4) plugplay_send_event tries to broadcast a WM_DEVICECHANGE message with BSF_QUERY, waiting for the individual threads to reply, 5) which times-out because window threads are waiting on explorer.exe to create its desktop window and reply to the WM_NULL SendMessage. This happens more likely as there is threads with message queues being started, each waiting on the desktop window to reply. Usually explorer.exe is able to reply to some messages with the implicit message processing while creating its window, but not all of them. [1] Not completely sure how, it looks like some RPC too, but before RpcSs is started? Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f5ca06016dbf41ea21752f34a16d9202bb7aaa02) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/plugplay/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 19e02286312..1156cb9f036 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -142,8 +142,8 @@ void __cdecl plugplay_send_event( DWORD code, const BYTE *data, unsigned int siz struct listener *listener; struct event *event; - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0 ); + BroadcastSystemMessageW( 0, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); + BroadcastSystemMessageW( 0, NULL, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0 ); EnterCriticalSection( &plugplay_cs );

1 0

Chao Long : wmic: Add missing aliases.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 8d2e4ee83a776708ff2ce09e98c68675d712b3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2e4ee83a776708ff2ce09e… Author: Chao Long <longchao(a)uniontech.com> Date: Mon Mar 8 09:25:42 2021 +0100 wmic: Add missing aliases. Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dba53a0f28f1a30c538744f4d76cdddacc6c8af) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wmic/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 1372c0986e9..f0b6ea0f05d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -44,7 +44,10 @@ alias_map[] = { L"LogicalDisk", L"Win32_LogicalDisk" }, { L"nic", L"Win32_NetworkAdapter" }, { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" } + { L"process", L"Win32_Process" }, + { L"baseboard", L"Win32_BaseBoard" }, + { L"diskdrive", L"Win32_DiskDrive" }, + { L"memorychip", L"Win32_PhysicalMemory" } }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Rémi Bernon : winedbg: Don't dereference possibly NULL thread pointer.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 75158894700090e7867132e787a6778089619962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75158894700090e7867132e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 9 22:54:55 2021 +0100 winedbg: Don't dereference possibly NULL thread pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6eff0342ad6f8c262112e6aeb083bb386d37cf04) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c51fd342496..392502032e8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -111,11 +111,11 @@ struct gdb_context static void gdbctx_delete_xpoint(struct gdb_context *gdbctx, struct dbg_thread *thread, dbg_ctx_t *ctx, struct gdb_xpoint *x) { - struct dbg_process *process = thread->process; + struct dbg_process *process = gdbctx->process; struct backend_cpu *cpu = process->be_cpu; if (!cpu->remove_Xpoint(process->handle, process->process_io, ctx, x->type, x->addr, x->value, x->size)) - ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, x->addr, x->size, x->type); + ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread ? thread->tid : ~0, x->addr, x->size, x->type); list_remove(&x->entry); HeapFree(GetProcessHeap(), 0, x);

1 0