December 2023 - Wine-Commits

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 1cef923e203fc5664fc57b41d67c025804be47c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cef923e203fc5664fc57b41d67c02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 17 18:11:51 2023 +0900 po: Update Japanese translation. --- po/ja.po | 156 ++++++++++++++++----------------------------------------------- 1 file changed, 38 insertions(+), 118 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7f6068c79c3..a6f6259464a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-12-18 19:29+0900\n" +"PO-Revision-Date: 2023-12-18 22:35+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -326,7 +326,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:47 msgid "Please wait until the current uninstall/modify process is complete." -msgstr "" +msgstr "実行中のアンインストール・変更が完了するのをお待ちください。" #: dlls/avifil32/avifil32.rc:42 msgid "Compress options" @@ -3706,16 +3706,12 @@ msgid "High" msgstr "高" #: dlls/ir50_32/ir50_32.rc:28 -#, fuzzy -#| msgid "Index" msgid "Indeo5" -msgstr "索引" +msgstr "Indeo5" #: dlls/ir50_32/ir50_32.rc:29 -#, fuzzy -#| msgid "Wine Video 1 video codec" msgid "Indeo Video Interactive version 5 video codec" -msgstr "Wine ビデオ 1 ビデオコーデック" +msgstr "Indeo Video Interactive バージョン 5 ビデオコーデック" #: dlls/joy.cpl/joy.rc:37 msgid "Joysticks" @@ -4015,10 +4011,8 @@ msgid "Syntax error in regular expression" msgstr "正規表現に構文誤りがあります" #: dlls/jscript/jscript.rc:66 -#, fuzzy -#| msgid "Expected identifier" msgid "Unexpected quantifier" -msgstr "識別子を期待していました" +msgstr "予期しない数量詞です" #: dlls/jscript/jscript.rc:67 msgid "Exception thrown and not caught" @@ -4081,10 +4075,8 @@ msgid "'this' is not a | object" msgstr "'this' は | オブジェクトではありません" #: dlls/jscript/jscript.rc:81 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'key' is not an object" -msgstr "'this' は | オブジェクトではありません" +msgstr "'key' はオブジェクトではありません" #: dlls/jscript/jscript.rc:82 msgid "Property cannot have both accessors and a value" @@ -12626,8 +12618,6 @@ msgid "Duplex:" msgstr "両面印刷:" #: dlls/wineps.drv/wineps.rc:45 -#, fuzzy -#| msgid "&Tray:" msgid "Paper &Tray:" msgstr "給紙方法(&T):" @@ -14726,37 +14716,29 @@ msgid "&Run..." msgstr "実行(&R)..." #: programs/explorer/explorer.rc:36 -#, fuzzy -#| msgid "E&xit Windows" msgid "E&xit desktop" -msgstr "Windows の終了(&X)" +msgstr "デスクトップの終了(&X)" #: programs/explorer/explorer.rc:37 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "" "Are you sure you want to close all programs and exit the virtual desktop?" -msgstr "これらの値を削除しますか?" +msgstr "すべてのプログラムを閉じて、仮想デスクトップを終了しますか?" #: programs/findstr/findstr.rc:28 -#, fuzzy -#| msgid "Use c&onnection string" msgid "Usage: findstr /options string\n" -msgstr "利用する接続文字列(&O)" +msgstr "使い方: findstr /オプション文字列\n" #: programs/findstr/findstr.rc:29 -#, fuzzy -#| msgid "Invalid command line.\n" msgid "FINDSTR: Bad command line\n" -msgstr "コマンドラインが正しくありません。\n" +msgstr "FINDSTR: コマンドラインが正しくありません\n" #: programs/findstr/findstr.rc:30 msgid "FINDSTR: Cannot open %s\n" -msgstr "" +msgstr "FINDSTR: %s を開けません\n" #: programs/findstr/findstr.rc:31 msgid "FINDSTR: /%c ignored\n" -msgstr "" +msgstr "FINDSTR: /%c は無視されました\n" #: programs/fsutil/fsutil.mc:28 msgid "" @@ -14876,51 +14858,39 @@ msgstr "プライマリ DNS サフィックス" #: programs/klist/klist.rc:28 msgid "Usage: klist <tickets | tgt | purge | get [service principal name]>\n" msgstr "" +"使い方: klist <tickets | tgt | purge | get [サービスプリンシパル名]>\n" #: programs/klist/klist.rc:29 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown error\n" -msgstr "不明なエラー" +msgstr "不明なエラー\n" #: programs/klist/klist.rc:30 -#, fuzzy -#| msgid "Start Menu" msgid "Start Time" -msgstr "Start Menu" +msgstr "開始時刻" #: programs/klist/klist.rc:31 -#, fuzzy -#| msgctxt "maximum 31 characters" -#| msgid "FLE Standard Time" msgid "End Time" -msgstr "FLE 標準時" +msgstr "終了時刻" #: programs/klist/klist.rc:32 -#, fuzzy -#| msgid "Enter new time: " msgid "Renew Time" -msgstr "新しい時刻を入力してください: " +msgstr "更新時刻" #: programs/klist/klist.rc:33 msgid "Ticket Flags" -msgstr "" +msgstr "チケットフラグ" #: programs/klist/klist.rc:34 msgid "Cached Tickets" -msgstr "" +msgstr "キャッシュされたチケット" #: programs/klist/klist.rc:36 -#, fuzzy -#| msgid "Encryption Type" msgid "KerbTicket Encryption Type" -msgstr "暗号化の種類" +msgstr "Kerberos チケットの暗号化の種類" #: programs/klist/klist.rc:37 -#, fuzzy -#| msgid "Current Connections" msgid "Current LogonId is" -msgstr "現在の接続" +msgstr "現在のログオン ID は" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -15058,7 +15028,7 @@ msgstr "以下のサービスが実行中です:\n" #: programs/net/net.rc:44 msgid "A command was used with conflicting switches.\n" -msgstr "" +msgstr "コマンドで相反するスイッチが使われました。\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -17223,38 +17193,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL '%1'のアンインストールに成功しました\n" #: programs/start/start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/exec Exec the specified file (for internal Wine usage).\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17307,8 +17245,9 @@ msgstr "" "/belownormal 優先度クラス「通常以下」でプログラムを開始します。\n" "/node n 指定した NUMA ノードでプログラムを開始します。\n" "/affinity mask 指定した関連マスクでプログラムを開始します。\n" -"/wait 開始プログラムの完了を待ち、そのプログラムの終了コードで終了し\n" -"ます。\n" +"/machine arch アーキテクチャ (x86,arm,amd64,arm64) の利用を強制します。\n" +"/wait プログラムの完了を待ち、そのプログラムの終了コードで終了しま\n" +"す。\n" "/unix Unix ファイル名を使い、Windows エクスプローラーのようにファイ\n" "ルを開始します。\n" "/exec 指定したファイルを実行します (Wine 内部で使用)。\n" @@ -17391,27 +17330,24 @@ msgid "Error: Process self-termination is not permitted.\n" msgstr "エラー: このプロセス自身を終了することはできません。\n" #: programs/taskkill/taskkill.rc:44 -#, fuzzy -#| msgid "Process with PID %1!u! was forcibly terminated.\n" msgid "" "The process with PID %1!u! (child process of PID %2!u!) has been " "terminated.\n" -msgstr "プロセス(PID %1!u!)は強制的に終了されました。\n" +msgstr "PID %1!u! のプロセス (PID %2!u! の子プロセス) は終了されました。\n" #: programs/taskkill/taskkill.rc:45 msgid "" "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n" msgstr "" +"終了シグナルが PID %1!u! のプロセス (PID %2!u! の子) に送られました。\n" #: include/wine/wine_common_ver.rc:138 -#, fuzzy -#| msgid "page tab list" msgid "Wine tasklist" -msgstr "ページタブリスト" +msgstr "Wine tasklist" #: programs/tasklist/tasklist.rc:29 msgid "Usage: tasklist [/?]\n" -msgstr "" +msgstr "使い方: tasklist [/?]\n" #: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272 msgid "Image Name" @@ -17422,38 +17358,28 @@ msgid "PID" msgstr "PID" #: programs/tasklist/tasklist.rc:32 -#, fuzzy -#| msgid "Session ID" msgid "Session Name" -msgstr "セッション ID" +msgstr "セッション名" #: programs/tasklist/tasklist.rc:33 -#, fuzzy -#| msgid "Session ID" msgid "Session#" -msgstr "セッション ID" +msgstr "セッション#" #: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276 msgid "Mem Usage" msgstr "メモリ使用量" #: programs/tasklist/tasklist.rc:35 -#, fuzzy -#| msgid "OK" msgid "K" -msgstr "OK" +msgstr "K" #: programs/tasklist/tasklist.rc:36 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "ERROR: Invalid syntax\n" -msgstr "reg: 無効な構文です。" +msgstr "ERROR: 構文が無効です\n" #: programs/tasklist/tasklist.rc:37 -#, fuzzy -#| msgid "The filename cannot be resolved.\n" msgid "ERROR: The search filter cannot be recognized.\n" -msgstr "ファイル名は解決できません。\n" +msgstr "ERROR: 認識できない検索フィルタです。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -18583,10 +18509,8 @@ msgid "&Theme:" msgstr "テーマ(&T):" #: programs/winecfg/winecfg.rc:295 -#, fuzzy -#| msgid "&Theme:" msgid "&WinRT theme:" -msgstr "テーマ(&T):" +msgstr "&WinRT テーマ:" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18605,10 +18529,8 @@ msgid "MIME types" msgstr "MIME タイプ" #: programs/winecfg/winecfg.rc:311 -#, fuzzy -#| msgid "Manage file &associations" msgid "Manage file and protocol &associations" -msgstr "ファイル関連付けの管理(&A)" +msgstr "ファイルとプロトコル関連付けの管理(&A)" #: programs/winecfg/winecfg.rc:314 msgid "Folders" @@ -18711,14 +18633,12 @@ msgid "Mono" msgstr "モノラル" #: programs/winecfg/winecfg.rc:98 -#, fuzzy -#| msgid "Right" msgid "Light" -msgstr "右" +msgstr "ライト" #: programs/winecfg/winecfg.rc:99 msgid "Dark" -msgstr "" +msgstr "ダーク" #: programs/winecfg/winecfg.rc:53 msgid ""

1 0

Nikolay Sivov : oleaut32/typelib: Add a missing break (Coverity).
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 28d95c0c91f17933ecca961e4fe412d73f6fb90c URL: https://gitlab.winehq.org/wine/wine/-/commit/28d95c0c91f17933ecca961e4fe412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 16 20:31:13 2023 +0100 oleaut32/typelib: Add a missing break (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f412074bd21..d920ee7c0cc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2633,6 +2633,7 @@ static void TLB_fix_typeinfo_ptr_size(ITypeInfoImpl *info) case VT_VARIANT: info->typeattr.cbSizeInstance = sizeof(VARIANT); info->typeattr.cbAlignment = sizeof(void *); + break; default: if(info->typeattr.cbSizeInstance < sizeof(void*)) info->typeattr.cbAlignment = info->typeattr.cbSizeInstance;

1 0

Georg Lehmann : vulkan-1/tests: Enable feature in private data test.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: fe41590dfefc660c4cc952367f7f86fd53c8b52f URL: https://gitlab.winehq.org/wine/wine/-/commit/fe41590dfefc660c4cc952367f7f86… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sat Dec 16 12:21:32 2023 +0100 vulkan-1/tests: Enable feature in private data test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51314 --- dlls/vulkan-1/tests/vulkan.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index e68f4fa94c3..74b9ccd4431 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -395,6 +395,7 @@ static void test_private_data(VkPhysicalDevice vk_physical_device) { PFN_vkDestroyPrivateDataSlotEXT pfn_vkDestroyPrivateDataSlotEXT; PFN_vkCreatePrivateDataSlotEXT pfn_vkCreatePrivateDataSlotEXT; + VkPhysicalDevicePrivateDataFeaturesEXT data_features; VkPrivateDataSlotCreateInfoEXT data_create_info; PFN_vkGetPrivateDataEXT pfn_vkGetPrivateDataEXT; PFN_vkSetPrivateDataEXT pfn_vkSetPrivateDataEXT; @@ -407,7 +408,11 @@ static void test_private_data(VkPhysicalDevice vk_physical_device) static const char *ext_name = "VK_EXT_private_data"; - if ((vr = create_device(vk_physical_device, 1, &ext_name, NULL, &vk_device)) < 0) + data_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT; + data_features.pNext = NULL; + data_features.privateData = VK_TRUE; + + if ((vr = create_device(vk_physical_device, 1, &ext_name, &data_features, &vk_device)) < 0) { skip("Failed to create device with VK_EXT_private_data, VkResult %d.\n", vr); return;

1 0

Paul Gofman : ntdll: Use position independent syscall thunk for NtQueryInformationProcess on i386.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: cbcfaab5191838f8738989fcad7fcb2c490fbe98 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbcfaab5191838f8738989fcad7fcb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 15 16:20:54 2023 -0600 ntdll: Use position independent syscall thunk for NtQueryInformationProcess on i386. Fixes a regression introduced by commit efd03f40e6e315d89cd1d09c48180aae82033f9f. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55967 --- dlls/ntdll/signal_i386.c | 24 ++++++++++++++++++++++++ dlls/ntdll/tests/virtual.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4fff401c88d..37360929ba6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -73,6 +73,30 @@ extern DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_R PEXCEPTION_HANDLER handler, PEXCEPTION_HANDLER nested_handler ); +#ifdef __WINE_PE_BUILD + +enum syscall_ids +{ +#define SYSCALL_ENTRY(id,name,args) __id_##name = id, +ALL_SYSCALLS32 +#undef SYSCALL_ENTRY +}; + +/******************************************************************* + * NtQueryInformationProcess + */ +void NtQueryInformationProcess_wrapper(void) +{ + asm( ".globl " __ASM_STDCALL("NtQueryInformationProcess", 20) "\n" + __ASM_STDCALL("NtQueryInformationProcess", 20) ":\n\t" + "movl %0,%%eax\n\t" + "call *%%fs:0xc0\n\t" + "ret $20" :: "i" (__id_NtQueryInformationProcess) ); +} +#define NtQueryInformationProcess syscall_NtQueryInformationProcess + +#endif /* __WINE_PE_BUILD */ + /******************************************************************* * syscalls */ diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index a9dec1b5a8a..011d3f1692f 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -2119,13 +2119,13 @@ static void test_syscalls(void) ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); ok( ptr != NULL, "MapViewOfFile failed err %lu\n", GetLastError() ); CloseHandle( mapping ); - CloseHandle( file ); delta = (char *)ptr - (char *)module; if (memcmp( ptr, module, 0x1000 )) { skip( "modules are not identical (non-PE build?)\n" ); UnmapViewOfFile( ptr ); + CloseHandle( file ); return; } perform_relocations( ptr, delta ); @@ -2152,12 +2152,40 @@ static void test_syscalls(void) } else { -#ifdef __x86_64__ +#ifdef __i386__ + NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, void *, ULONG, ULONG *); + PROCESS_BASIC_INFORMATION pbi; + void *exec_mem, *va_ptr; + ULONG size; + BOOL ret; + + exec_mem = VirtualAlloc( NULL, 4096, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + ok( !!exec_mem, "got NULL.\n" ); + + /* NtQueryInformationProcess is special. */ + pNtQueryInformationProcess = (void *)GetProcAddress( module, "NtQueryInformationProcess" ); + va_ptr = RtlImageRvaToVa( RtlImageNtHeader(module), module, + (char *)pNtQueryInformationProcess - (char *)module, NULL ); + ok( !!va_ptr, "offset not found %p / %p\n", pNtQueryInformationProcess, module ); + ret = SetFilePointer( file, (char *)va_ptr - (char *)module, NULL, FILE_BEGIN ); + ok( ret, "got %d, err %lu.\n", ret, GetLastError() ); + ret = ReadFile( file, exec_mem, 32, NULL, NULL ); + ok( ret, "got %d, err %lu.\n", ret, GetLastError() ); + pNtQueryInformationProcess = exec_mem; + /* The thunk still works without relocation. */ + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &size ); + ok( !status, "got %#lx.\n", status ); + ok( size == sizeof(pbi), "got %lu.\n", size ); + ok( pbi.PebBaseAddress == NtCurrentTeb()->Peb, "got %p, %p.\n", pbi.PebBaseAddress, NtCurrentTeb()->Peb ); + + VirtualFree( exec_mem, 0, MEM_RELEASE ); +#elif defined __x86_64__ ok( 0, "syscall thunk relocated\n" ); #else skip( "syscall thunk relocated\n" ); #endif } + CloseHandle( file ); UnmapViewOfFile( ptr ); }

1 0

Alexandre Julliard : Release 9.0-rc2.
by Alexandre Julliard Dec. 15, 2023

Dec. 15, 2023

Module: wine Branch: master Commit: 7a8c039a5c34fe0c625b3684b4c7026a21dd290e URL: https://gitlab.winehq.org/wine/wine/-/commit/7a8c039a5c34fe0c625b3684b4c702… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 22:09:59 2023 +0100 Release 9.0-rc2. --- ANNOUNCE | 635 +++++++++++--------------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 120 insertions(+), 535 deletions(-)

1 0

Tag wine-9.0-rc2 : Alexandre Julliard : Release 9.0-rc2
by Alexandre Julliard Dec. 15, 2023

Dec. 15, 2023

Module: wine Branch: refs/tags/wine-9.0-rc2 Tag: 36778b41ac36352d40efe37755f03e565303db8e URL: https://gitlab.winehq.org/wine/wine/-/tags/36778b41ac36352d40efe37755f03e56… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 22:09:59 2023 +0100 Release 9.0-rc2

1 0

Alexandros Frantzis : winewayland.drv: Release all keys on keyboard focus loss.
by Alexandre Julliard Dec. 15, 2023

Dec. 15, 2023

Module: wine Branch: master Commit: b853a670cfc5600904af13e544a9eb967e5ddc62 URL: https://gitlab.winehq.org/wine/wine/-/commit/b853a670cfc5600904af13e544a9eb… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Dec 12 12:13:15 2023 +0200 winewayland.drv: Release all keys on keyboard focus loss. The Wayland specification states about the keyboard leave event: After this event client must assume that all keys, including modifiers, are lifted and also it must stop key repeating if there's some going on. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56001 --- dlls/winewayland.drv/wayland_keyboard.c | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index 16ce2a2210b..ba09aad4fc2 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -33,6 +33,7 @@ #include "waylanddrv.h" #include "wine/debug.h" +#include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); @@ -602,6 +603,50 @@ static BOOL find_xkb_layout_variant(const char *name, const char **layout, const return FALSE; } +static BOOL get_async_key_state(BYTE state[256]) +{ + BOOL ret; + + SERVER_START_REQ(get_key_state) + { + req->async = 1; + req->key = -1; + wine_server_set_reply(req, state, 256); + ret = !wine_server_call(req); + } + SERVER_END_REQ; + + return ret; +} + +static void release_all_keys(HWND hwnd) +{ + BYTE state[256]; + int vkey; + INPUT input = {.type = INPUT_KEYBOARD}; + + get_async_key_state(state); + + for (vkey = 1; vkey < 256; vkey++) + { + /* Skip mouse buttons. */ + if (vkey < 7 && vkey != VK_CANCEL) continue; + /* Skip left/right-agnostic modifier vkeys. */ + if (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU) continue; + + if (state[vkey] & 0x80) + { + UINT scan = NtUserMapVirtualKeyEx(vkey, MAPVK_VK_TO_VSC_EX, + keyboard_hkl); + input.ki.wVk = vkey; + input.ki.wScan = scan & 0xff; + input.ki.dwFlags = KEYEVENTF_KEYUP; + if (scan & ~0xff) input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY; + __wine_send_input(hwnd, &input, NULL); + } + } +} + /********************************************************************** * Keyboard handling */ @@ -745,6 +790,10 @@ static void keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard, keyboard->focused_hwnd = NULL; pthread_mutex_unlock(&keyboard->mutex); + /* The spec for the leave event tells us to treat all keys as released, + * and for any key repetition to stop. */ + release_all_keys(hwnd); + /* FIXME: update foreground window as well */ }

1 0

Rémi Bernon : server: Update the desktop cursor position / window on click.
by Alexandre Julliard Dec. 15, 2023

Dec. 15, 2023

Module: wine Branch: master Commit: 82642e34e1835e1eb600c766a2f0f321310a4aa9 URL: https://gitlab.winehq.org/wine/wine/-/commit/82642e34e1835e1eb600c766a2f0f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 25 16:33:57 2023 +0200 server: Update the desktop cursor position / window on click. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 --- server/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index 9007438e082..df5d96486fb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1679,9 +1679,9 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg break; case QS_MOUSEMOVE: prepend_cursor_history( msg->x, msg->y, msg->time, msg_data->info ); - if (update_desktop_cursor_pos( desktop, msg->win, msg->x, msg->y )) always_queue = 1; /* fallthrough */ case QS_MOUSEBUTTON: + if (update_desktop_cursor_pos( desktop, msg->win, msg->x, msg->y )) always_queue = 1; if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; if (desktop->keystate[VK_MBUTTON] & 0x80) msg->wparam |= MK_MBUTTON; if (desktop->keystate[VK_RBUTTON] & 0x80) msg->wparam |= MK_RBUTTON;

1 0

Rémi Bernon : server: Use the capture window as cursor window if it is set.
by Alexandre Julliard Dec. 15, 2023

Dec. 15, 2023

Module: wine Branch: master Commit: c3dcf1e2697b2cdf88dffdeb57feb0d5c7ff06cb URL: https://gitlab.winehq.org/wine/wine/-/commit/c3dcf1e2697b2cdf88dffdeb57feb0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 25 15:36:47 2023 +0200 server: Use the capture window as cursor window if it is set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 --- server/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index df5d96486fb..15a63f880f1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -455,6 +455,7 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y ) { struct thread_input *input; + user_handle_t capture; int updated; x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); @@ -464,7 +465,7 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win desktop->cursor.y = y; desktop->cursor.last_change = get_tick_count(); - if (!win && (input = desktop->foreground_input)) win = input->capture; + if ((input = desktop->foreground_input) && (capture = input->capture)) win = capture; if (!win || !is_window_visible( win ) || is_window_transparent( win )) win = shallow_window_from_point( desktop, x, y ); if (update_desktop_cursor_window( desktop, win )) updated = 1;

1 0

Alexandros Frantzis : winewayland.drv: Support mouse buttons 4 and 5.
by Alexandre Julliard Dec. 15, 2023

Dec. 15, 2023

Module: wine Branch: master Commit: 516bfa12416c41ddb7893e5ce4af17104a35c157 URL: https://gitlab.winehq.org/wine/wine/-/commit/516bfa12416c41ddb7893e5ce4af17… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Dec 14 11:23:09 2023 +0200 winewayland.drv: Support mouse buttons 4 and 5. Map linux mouse buttons to win32 XBUTTON1 and XBUTTON2. Although BTN_SIDE and BTN_EXTRA are the typical event codes for these buttons, some drivers use BTN_BACK and BTN_FORWARD, so map both pairs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56026 --- dlls/winewayland.drv/wayland_pointer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index 3a0656b6580..fad75c8506c 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -163,6 +163,16 @@ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, case BTN_LEFT: input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN; break; case BTN_RIGHT: input.mi.dwFlags = MOUSEEVENTF_RIGHTDOWN; break; case BTN_MIDDLE: input.mi.dwFlags = MOUSEEVENTF_MIDDLEDOWN; break; + case BTN_SIDE: + case BTN_BACK: + input.mi.dwFlags = MOUSEEVENTF_XDOWN; + input.mi.mouseData = XBUTTON1; + break; + case BTN_EXTRA: + case BTN_FORWARD: + input.mi.dwFlags = MOUSEEVENTF_XDOWN; + input.mi.mouseData = XBUTTON2; + break; default: break; }

1 0