December 2023 - Wine-commits

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

15 Dec '23

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

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

15 Dec '23

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

Alexandre Julliard : Release 9.0-rc2.
by Alexandre Julliard 15 Dec '23

15 Dec '23

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 15 Dec '23

15 Dec '23

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

Alexandre Julliard : server: Enforce a mapping size limit instead of relying on the Unix file system.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 24f7869e9385a6b6a4f2e555163deefcda109dc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/24f7869e9385a6b6a4f2e555163dee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 10:11:22 2023 +0100 server: Enforce a mapping size limit instead of relying on the Unix file system. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55667 --- dlls/kernel32/tests/file.c | 13 ++++++++----- server/mapping.c | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0493f90e30d..17cfe24d50a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3105,6 +3105,7 @@ static void test_MapFile(void) { HANDLE handle; HANDLE hmap; + UINT err; ok(test_Mapfile_createtemp(&handle), "Couldn't create test file.\n"); @@ -3123,15 +3124,17 @@ static void test_MapFile(void) ok(test_Mapfile_createtemp(&handle), "Couldn't create test file.\n"); + SetLastError( 0xdeadbeef ); hmap = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0, 0, NULL ); + err = GetLastError(); ok( hmap == NULL, "mapped zero size file\n"); - ok( GetLastError() == ERROR_FILE_INVALID, "not ERROR_FILE_INVALID\n"); - - hmap = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0x80000, 0, NULL ); - ok( hmap == NULL, "mapping should fail\n"); + ok( err == ERROR_FILE_INVALID, "got %u\n", err ); - hmap = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0x80000, 0x10000, NULL ); + SetLastError( 0xdeadbeef ); + hmap = CreateFileMappingA( handle, NULL, PAGE_READWRITE, 0x8000000, 0x10000, NULL ); + err = GetLastError(); ok( hmap == NULL, "mapping should fail\n"); + ok( err == ERROR_NOT_ENOUGH_MEMORY || err == ERROR_INVALID_PARAMETER, "got %u\n", err ); /* On XP you can now map again, on Win 95 you cannot. */ diff --git a/server/mapping.c b/server/mapping.c index a101110c76c..f754078acf7 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -993,7 +993,7 @@ static struct mapping *create_mapping( struct object *root, const struct unicode } else if (st.st_size < mapping->size) { - if (!(file_access & FILE_WRITE_DATA)) + if (!(file_access & FILE_WRITE_DATA) || mapping->size >> 54 /* ntfs limit */) { set_error( STATUS_SECTION_TOO_BIG ); goto error;

1 0

Alexandre Julliard : kernel32/tests: Don't bother checking for errors in cleanup path.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: bd693d67553fb1f1ea3ed9bab8c38886f066e2b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd693d67553fb1f1ea3ed9bab8c388… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 11:03:48 2023 +0100 kernel32/tests: Don't bother checking for errors in cleanup path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55578 --- dlls/kernel32/tests/loader.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ec6f2d5c6a7..8f418ef09a9 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2072,9 +2072,7 @@ static void test_section_access(void) test_image_mapping(dll_name, td[i].scn_page_access, FALSE); - SetLastError(0xdeadbeef); - ret = DeleteFileA(dll_name); - ok(ret, "DeleteFile error %ld\n", GetLastError()); + DeleteFileA(dll_name); } }

1 0

Alexandre Julliard : user32: Support utf-8 in WM_CHAR W->A conversion.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 4a929eaf9702b9c7bed215c5b6f9784c2f66339c URL: https://gitlab.winehq.org/wine/wine/-/commit/4a929eaf9702b9c7bed215c5b6f978… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 13:15:56 2023 +0100 user32: Support utf-8 in WM_CHAR W->A conversion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55655 --- dlls/user32/message.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 86c6593e192..07dfbdb0f85 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -183,9 +183,9 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping */ static void map_wparam_WtoA( MSG *msg, BOOL remove ) { - BYTE ch[4]; + BYTE ch[4] = { 0 }; WCHAR wch[2]; - DWORD len; + DWORD i, len; DWORD cp; switch(msg->message) @@ -195,7 +195,6 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) { cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); - ch[0] = ch[1] = 0; len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); if (len == 2) /* DBCS char */ { @@ -224,14 +223,12 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); wch[1] = HIWORD(msg->wParam); - ch[0] = ch[1] = 0; - WideCharToMultiByte( cp, 0, wch, 2, (LPSTR)ch, 4, NULL, NULL ); - msg->wParam = MAKEWPARAM( ch[0] | (ch[1] << 8), 0 ); + len = WideCharToMultiByte( cp, 0, wch, 2, (LPSTR)ch, 4, NULL, NULL ); + for (msg->wParam = i = 0; i < len; i++) msg->wParam |= ch[i] << (8 * i); break; case WM_IME_CHAR: cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); - ch[0] = ch[1] = 0; len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); if (len == 2) msg->wParam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(msg->wParam) );

1 0

Alexandre Julliard : oleaut32/tests: Use winetest contexts instead of traces in the typelib test.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 7760c1dbb3271ef795920d7f415b16f49d883eef URL: https://gitlab.winehq.org/wine/wine/-/commit/7760c1dbb3271ef795920d7f415b16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 14:26:20 2023 +0100 oleaut32/tests: Use winetest contexts instead of traces in the typelib test. --- dlls/oleaut32/tests/typelib.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 59b2ea7c93e..b373b0a70b3 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1988,12 +1988,12 @@ static void test_CreateTypeLib(SYSKIND sys) { switch(sys){ case SYS_WIN32: - trace("testing SYS_WIN32\n"); + winetest_push_context( "win32" ); ptr_size = 4; alignment = sizeof(void*); break; case SYS_WIN64: - trace("testing SYS_WIN64\n"); + winetest_push_context( "win64" ); ptr_size = 8; alignment = 4; break; @@ -2001,8 +2001,6 @@ static void test_CreateTypeLib(SYSKIND sys) { return; } - trace("CreateTypeLib tests\n"); - hres = LoadTypeLib(wszStdOle2, &stdole); ok(hres == S_OK, "got %08lx\n", hres); @@ -2153,10 +2151,6 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); ok(hres == S_OK, "got %08lx\n", hres); - if(hres != S_OK) { - skip("Skipping some tests\n"); - return; - } hres = ICreateTypeInfo_AddImplType(createti, 1, hreftype); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08lx\n", hres); @@ -3939,6 +3933,7 @@ todo_wine { ok(ITypeLib_Release(tl)==0, "Object should be freed\n"); DeleteFileA(filename); + winetest_pop_context(); } #if 0 /* use this to generate more tests */ @@ -6342,7 +6337,7 @@ static void test_dump_typelib(const WCHAR *name) BSTR bstrIfName; DWORD help_ctx; - trace("Interface %s\n", ti->name); + winetest_push_context("Interface %s", ti->name); ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo)); if (hRefType) { @@ -6411,7 +6406,7 @@ static void test_dump_typelib(const WCHAR *name) UINT cNames; int i; - trace("Function %s\n", fn_info->names[0]); + winetest_push_context("Function %s", fn_info->names[0]); ole_check(ITypeInfo_GetFuncDesc(typeinfo, func, &desc)); expect_int(desc->memid, fn_info->memid); expect_int(desc->funckind, fn_info->funckind); @@ -6496,6 +6491,7 @@ static void test_dump_typelib(const WCHAR *name) memset(&cust_data, 0, sizeof(cust_data)); ITypeInfo_ReleaseFuncDesc(typeinfo, desc); + winetest_pop_context(); } for (var = 0; var < typeattr->cVars; var++) @@ -6505,7 +6501,7 @@ static void test_dump_typelib(const WCHAR *name) BSTR varname; UINT cNames; - trace("Variable %s\n", var_info->name); + winetest_push_context("Variable %s", var_info->name); ole_check(ITypeInfo_GetVarDesc(typeinfo, var, &desc)); expect_int(desc->memid, var_info->memid); @@ -6547,6 +6543,7 @@ static void test_dump_typelib(const WCHAR *name) check_type(&desc->elemdescVar, &var_info->elemdescVar); ITypeInfo_ReleaseVarDesc(typeinfo, desc); + winetest_pop_context(); } if ((typeattr->typekind == TKIND_DISPATCH) && (typeattr->wTypeFlags & TYPEFLAG_FDUAL) && @@ -6564,6 +6561,7 @@ static void test_dump_typelib(const WCHAR *name) ITypeInfo2_Release(typeinfo2); ITypeInfo_Release(typeinfo); + winetest_pop_context(); } expect_eq(ITypeLib_GetTypeInfoCount(typelib), iface, UINT, "%d"); ITypeLib_ReleaseTLibAttr(typelib, libattr); @@ -6694,14 +6692,12 @@ static void test_register_typelib(BOOL system_registration) { TKIND_MODULE, 0 }, }; - trace("Starting %s typelib registration tests\n", - system_registration ? "system" : "user"); - if (!system_registration && (!pRegisterTypeLibForUser || !pUnRegisterTypeLibForUser)) { win_skip("User typelib registration functions are not available\n"); return; } + winetest_push_context( "%s", system_registration ? "system" : "user" ); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); @@ -6720,6 +6716,7 @@ static void test_register_typelib(BOOL system_registration) win_skip("Insufficient privileges to register typelib in the registry\n"); ITypeLib_Release(typelib); DeleteFileW(filename); + winetest_pop_context(); return; } ok(hr == S_OK, "got %08lx\n", hr); @@ -6850,6 +6847,7 @@ static void test_register_typelib(BOOL system_registration) ITypeLib_Release(typelib); DeleteFileW(filename); + winetest_pop_context(); } static void test_register_typelib_64(void) @@ -7953,11 +7951,11 @@ static void test_SetTypeDescAlias(SYSKIND kind) switch(kind){ case SYS_WIN32: - trace("testing SYS_WIN32\n"); + winetest_push_context("win32"); ptr_size = 4; break; case SYS_WIN64: - trace("testing SYS_WIN64\n"); + winetest_push_context("win64"); ptr_size = 8; break; default: @@ -8002,8 +8000,6 @@ static void test_SetTypeDescAlias(SYSKIND kind) ITypeLib_Release(tl); ok(0 == ICreateTypeLib2_Release(ctl), "typelib should have been released\n"); - trace("after save...\n"); - hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); ok(hr == S_OK, "got %08lx\n", hr); @@ -8025,6 +8021,7 @@ static void test_SetTypeDescAlias(SYSKIND kind) ok(0 == ITypeLib_Release(tl), "typelib should have been released\n"); DeleteFileA(filenameA); + winetest_pop_context(); } static void test_GetLibAttr(void)

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard 15 Dec '23

15 Dec '23

Module: wine Branch: master Commit: 3504f138ecbbe49caa1fc5242fe7e13705b0a0c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3504f138ecbbe49caa1fc5242fe7e1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Dec 15 07:35:24 2023 +0100 po: Update Simplified Chinese translation. --- po/zh_CN.po | 156 ++++++++++++++---------------------------------------------- 1 file changed, 37 insertions(+), 119 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 804b97dde59..7baea6a126b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.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: 2023-01-16 12:26+0800\n" +"PO-Revision-Date: 2023-12-15 07:05+0100\n" "Last-Translator: Jactry Zeng <jzeng(a)codeweavers.com>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" @@ -313,7 +313,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" @@ -3664,16 +3664,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 Video 1 视频编解码器" +msgstr "Indeo Video Interactive 版本 5 视频编解码器" #: dlls/joy.cpl/joy.rc:37 msgid "Joysticks" @@ -3971,10 +3967,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" @@ -4035,10 +4029,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" @@ -12552,10 +12544,8 @@ msgid "Duplex:" msgstr "双面:" #: dlls/wineps.drv/wineps.rc:45 -#, fuzzy -#| msgid "&Tray:" msgid "Paper &Tray:" -msgstr "托盘(&T):" +msgstr "纸盒(&T):" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm" @@ -14519,37 +14509,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 "" @@ -14667,52 +14649,39 @@ msgstr "主 DNS 后缀" #: programs/klist/klist.rc:28 msgid "Usage: klist <tickets | tgt | purge | get [service principal name]>\n" -msgstr "" +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 "开始菜单" +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 "KerbTicket 加密类型" #: programs/klist/klist.rc:37 -#, fuzzy -#| msgid "Current Connections" msgid "Current LogonId is" -msgstr "当前连接数" +msgstr "当前 LogonId 是" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -14850,7 +14819,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" @@ -16990,38 +16959,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" @@ -17073,6 +17010,7 @@ msgstr "" "/belownormal 以 belownormal 优先级运行程序。\n" "/node n 在指定的 NUMA 节点中运行程序。\n" "/affinity 掩码以指定的关联掩码运行程序。\n" +"/machine 架构强制使用一个特定的架构(x86、arm、amd64、arm64)。\n" "/wait 等待运行的程序结束，并以它的返回值退出。\n" "/unix 使用 Unix 文件名并像 Windows 文件管理器一样打开该文件。\n" "/exec 执行所指定的文件 (在 Wine 内部使用)。\n" @@ -17150,27 +17088,23 @@ 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 "" +msgstr "已向 PID %2!u! 的子进程、PID 为 %1!u! 的进程发送结束信号。\n" #: include/wine/wine_common_ver.rc:138 -#, fuzzy -#| msgid "page tab list" msgid "Wine tasklist" -msgstr "标签页列表" +msgstr "Wine 任务列表" #: 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" @@ -17181,38 +17115,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 "确定" +msgstr "K" #: programs/tasklist/tasklist.rc:36 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "ERROR: Invalid syntax\n" -msgstr "reg: 语法无效。" +msgstr "错误: 语法无效\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 "错误: 无法识别搜索筛选器。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -18330,10 +18254,8 @@ msgid "&Theme:" msgstr "主题(&T):" #: programs/winecfg/winecfg.rc:295 -#, fuzzy -#| msgid "&Theme:" msgid "&WinRT theme:" -msgstr "主题(&T):" +msgstr "WinRT 主题(&W):" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18352,10 +18274,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" @@ -18458,14 +18378,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

Sven Baars : sapi/tests: Remove registry keys created by SetId() in the SpVoice tests.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: 5def0d2e78f97794e1753f070e020cac8b621c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/5def0d2e78f97794e1753f070e020c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Dec 14 12:48:05 2023 +0100 sapi/tests: Remove registry keys created by SetId() in the SpVoice tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55288 --- dlls/sapi/tests/tts.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 6912dc08e0d..38ec1d31bfc 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -686,6 +686,8 @@ done: ISpVoice_Release(voice); ISpObjectToken_Release(token); ISpMMSysAudio_Release(audio_out); + + RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest\\sapi" ); } START_TEST(tts)

1 0