- Wine-Devel - list.winehq.org

[PATCH 1/8] dinput: Don't pass a module handle to SetWindowsHookExW.
by Rémi Bernon Jan. 5, 2022

Jan. 5, 2022

For low-level hooks, which don't need it. Passing a module handle will make set_windows_hook call GetModuleFileNameW which requires the loader lock. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is a bit longer than I'd like and I don't like very much the idea of the thread timeout, but I don't see any other solution. Maybe a finer grained loader locking could solve the underlying problem, but it's not going to be there soon. dlls/dinput/dinput_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a62d4d2ea3d..980edeba817 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1317,7 +1317,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) - kbd_hook = SetWindowsHookExW( WH_KEYBOARD_LL, LL_hook_proc, DINPUT_instance, 0 ); + kbd_hook = SetWindowsHookExW( WH_KEYBOARD_LL, LL_hook_proc, NULL, 0 ); else if (!kbd_cnt && kbd_hook) { UnhookWindowsHookEx( kbd_hook ); @@ -1325,7 +1325,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) } if (mice_cnt && !mouse_hook) - mouse_hook = SetWindowsHookExW( WH_MOUSE_LL, LL_hook_proc, DINPUT_instance, 0 ); + mouse_hook = SetWindowsHookExW( WH_MOUSE_LL, LL_hook_proc, NULL, 0 ); else if (!mice_cnt && mouse_hook) { UnhookWindowsHookEx( mouse_hook ); -- 2.34.1

1 8

[PATCH v2 1/6] d3d8/tests: Test for window changes when it's not active.
by Gabriel Ivăncescu Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I'm sending these tests first to show the behavior across d3d versions. I do not plan to fix them during code freeze, except for ddraw, since I'm not aware of any regressions due to them. I might fix them after code freeze though. dlls/d3d8/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fc94dca..9e7c0fb 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4055,6 +4055,97 @@ static void test_window_style(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(device_window); + DestroyWindow(focus_window); + + /* Window changes are done only if either the device or focus windows are active */ + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + device = create_device(d3d8, focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + ShowWindow(device_window, SW_SHOWNOACTIVATE); + + /* 32-bit tests ran under Windows 8 and 10 testbots have pretty + inconsistent behavior but topmost is set even when inactive. */ + style = GetWindowLongA(device_window, GWL_EXSTYLE); + if (broken(style & WS_EX_TOPMOST)) + { + win_skip("topmost set when inactive due to inconsistent behavior, skipping related tests..."); + goto skip_inactive; + } + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + SetForegroundWindow(focus_window); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + +skip_inactive: + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); done: IDirect3D8_Release(d3d8); -- 2.34.1

3 14

[PATCH] po: Update Japanese translation.
by Jactry Zeng Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- cc Sagawa, since I don't speak Japanese actually. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index ba9835a5494..f2f7a431995 100644 --- a/po/ja.po +++ b/po/ja.po @@ -443,7 +443,7 @@ msgstr "閉じる(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "リセット(R&)" +msgstr "リセット(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -9008,7 +9008,7 @@ msgstr "利用するデータソース名(&D)" #: dlls/oledb32/version.rc:74 msgid "Use c&onnection string" -msgstr "利用する接続文字列(&C)" +msgstr "利用する接続文字列(&O)" #: dlls/oledb32/version.rc:75 msgid "&Connection string:" -- 2.34.1

2 1

[PATCH] iphlpapi: Always populate the friendly name.
by Huw Davies Jan. 5, 2022

Jan. 5, 2022

The GAA_FLAG_SKIP_FRIENDLY_NAME flag is essentially ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48084 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 11 ++++------- dlls/iphlpapi/tests/iphlpapi.c | 8 +++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 15c4f067105..c94f869c9f9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1221,7 +1221,7 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if (err) return err; needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(stat->descr.String)); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(rw->alias.String); + needed += count * sizeof(rw->alias.String); /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ aa = heap_alloc_zero( needed ); if (!aa) @@ -1243,12 +1243,9 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(stat[i].descr.String), &stat[i].descr ); aa[i].Description = (WCHAR *)str_ptr; str_ptr += sizeof(stat[i].descr.String); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - { - if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); - aa[i].FriendlyName = (WCHAR *)str_ptr; - str_ptr += sizeof(rw[i].alias.String); - } + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); + aa[i].FriendlyName = (WCHAR *)str_ptr; + str_ptr += sizeof(rw[i].alias.String); aa[i].PhysicalAddressLength = rw[i].phys_addr.Length; if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; memcpy( aa[i].PhysicalAddress, rw[i].phys_addr.Address, aa[i].PhysicalAddressLength ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 2adacd36b48..12da629c30c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1580,6 +1580,12 @@ static void test_GetAdaptersAddresses(void) ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; + /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ + osize = 0x7fffffff; + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, NULL, &osize); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + ok(osize == size, "expected %d, got %d\n", size, osize); + ptr = HeapAlloc(GetProcessHeap(), 0, size); ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); @@ -1589,7 +1595,7 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize); -- 2.23.0

1 0

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 248 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 206 insertions(+), 42 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 52072333886..995198ef63f 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: 2022-01-03 00:36+0800\n" +"PO-Revision-Date: 2022-01-05 12:09+0800\n" "Last-Translator: Jactry Zeng <jzeng(a)codeweavers.com>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" @@ -44,7 +44,7 @@ msgstr "安装/卸载" msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要从软盘，光盘或硬盘安装新程序，请按'安装'。" +msgstr "要从软盘，光盘或硬盘安装新程序，请单击“安装”。" #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." @@ -55,7 +55,7 @@ msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." -msgstr "下列软件可以自动卸载。按'修改/删除'可卸载选定程序或者调整已安装部件。" +msgstr "下列软件可以自动卸载。单击“修改/删除”可卸载选中的程序或修改其已安装的组件。" #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -294,7 +294,7 @@ msgstr "所有文件 (*.*)" #: dlls/appwiz.cpl/appwiz.rc:46 msgid "&Modify/Remove" -msgstr "修改或删除(&M)" +msgstr "修改/删除(&M)" #: dlls/appwiz.cpl/appwiz.rc:51 msgid "Downloading..." @@ -388,7 +388,7 @@ msgstr "时" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" -msgstr "属性 %s" +msgstr "%s 的属性" #: dlls/comctl32/comctl32.rc:73 dlls/comdlg32/comdlg32.rc:265 msgid "&Apply" @@ -429,7 +429,7 @@ msgstr "关闭(&C)" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "重置(&e)" +msgstr "重置(&E)" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -637,7 +637,7 @@ msgstr "方向" #: dlls/comdlg32/comdlg32.rc:237 msgid "Po&rtrait" -msgstr "纵向(&P)" +msgstr "纵向(&R)" #: dlls/comdlg32/comdlg32.rc:238 dlls/comdlg32/comdlg32.rc:445 #: dlls/wineps.drv/wineps.rc:37 @@ -728,7 +728,7 @@ msgstr "蓝(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色调(&E):" +msgstr "色调(&H):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" @@ -784,7 +784,7 @@ msgstr "下(&D)" #: dlls/comdlg32/comdlg32.rc:329 dlls/comdlg32/comdlg32.rc:347 msgid "&Find Next" -msgstr "找下一个(&F)" +msgstr "查找下一个(&F)" #: dlls/comdlg32/comdlg32.rc:337 msgid "Replace" @@ -872,7 +872,7 @@ msgstr "纸张来源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" -msgstr "纵向(&P)" +msgstr "纵向(&O)" #: dlls/comdlg32/comdlg32.rc:422 msgid "L&andscape" @@ -908,7 +908,7 @@ msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." -msgstr "打印机(&P)..." +msgstr "打印机(&R)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" @@ -946,7 +946,7 @@ msgstr "找不到文件" #: dlls/comdlg32/comdlg32.rc:34 msgid "Please verify that the correct file name was given" -msgstr "请检验是否给予正确的文件名称" +msgstr "请检查给予的文件名是否正确" #: dlls/comdlg32/comdlg32.rc:35 msgid "" @@ -1050,7 +1050,7 @@ msgstr "紫色" #: dlls/comdlg32/comdlg32.rc:128 programs/wordpad/wordpad.rc:131 msgid "Teal" -msgstr "鸭翅绿" +msgstr "青色" #: dlls/comdlg32/comdlg32.rc:129 programs/wordpad/wordpad.rc:132 msgid "Gray" @@ -1115,7 +1115,7 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." -msgstr "“份数”项不能空。" +msgstr "“份数”项不能为空。" #: dlls/comdlg32/comdlg32.rc:67 msgid "" @@ -3227,7 +3227,7 @@ msgstr "正在传输" #: dlls/gphoto2.ds/gphoto2.rc:46 msgid "Transferring... Please Wait" -msgstr "正在传输… 请稍候" +msgstr "正在传输... 请稍候" #: dlls/gphoto2.ds/gphoto2.rc:51 msgid "Connecting to camera" @@ -3235,7 +3235,7 @@ msgstr "连接照相机" #: dlls/gphoto2.ds/gphoto2.rc:55 msgid "Connecting to camera... Please Wait" -msgstr "正在连接照相机… 请稍候" +msgstr "正在连接照相机... 请稍候" #: dlls/hhctrl.ocx/hhctrl.rc:59 msgid "S&ync" @@ -6899,7 +6899,7 @@ msgstr "找不到用户名。\n" #: dlls/kernel32/winerror.mc:3743 msgid "This network connection does not exist.\n" -msgstr "该网络链接不存在。\n" +msgstr "该网络连接不存在。\n" #: dlls/kernel32/winerror.mc:3748 msgid "Connection reset by peer.\n" @@ -8061,7 +8061,7 @@ msgstr "正在复制新文件" #: dlls/msi/msi.rc:105 msgid "Installing ODBC components" -msgstr "正在安装 ODBC 组建" +msgstr "正在安装 ODBC 组件" #: dlls/msi/msi.rc:106 msgid "Installing new services" @@ -8101,7 +8101,7 @@ msgstr "正在为文件打补丁" #: dlls/msi/msi.rc:115 msgid "Updating component registration" -msgstr "正在更新组建注册信息" +msgstr "正在更新组件注册信息" #: dlls/msi/msi.rc:116 msgid "Publishing Qualified Components" @@ -9012,7 +9012,7 @@ msgstr "秒。" #: dlls/oledb32/version.rc:104 msgid "A&ccess:" -msgstr "访问(&A):" +msgstr "访问(&C):" #: dlls/oledb32/version.rc:110 msgid "All" @@ -9259,7 +9259,7 @@ msgstr "正在扫描" #: dlls/sane.ds/sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "正在扫描… 请稍候" +msgstr "正在扫描... 请稍候" #: dlls/sane.ds/sane.rc:31 msgctxt "unit: pixels" @@ -9410,11 +9410,11 @@ msgstr "打印目标(&P)" #: dlls/shdoclc/shdoclc.rc:71 dlls/shdoclc/shdoclc.rc:154 #: dlls/shdoclc/shdoclc.rc:178 msgid "S&how Picture" -msgstr "显示图片(&S)" +msgstr "显示图片(&H)" #: dlls/shdoclc/shdoclc.rc:72 dlls/shdoclc/shdoclc.rc:179 msgid "&Save Picture As..." -msgstr "将图片存为(&A)..." +msgstr "将图片另存为(&S)..." #: dlls/shdoclc/shdoclc.rc:73 msgid "&E-mail Picture..." @@ -9471,7 +9471,7 @@ msgstr "行(&R)" #: dlls/shdoclc/shdoclc.rc:107 msgid "&Column" -msgstr "列(&O)" +msgstr "列(&C)" #: dlls/shdoclc/shdoclc.rc:108 msgid "&Table" @@ -9495,7 +9495,7 @@ msgstr "剪下" #: dlls/shdoclc/shdoclc.rc:155 msgid "&Save Video As..." -msgstr "将视频存为(&V)..." +msgstr "将视频另存为(&S)..." #: dlls/shdoclc/shdoclc.rc:166 dlls/shdoclc/shdoclc.rc:190 msgid "Play" @@ -10205,7 +10205,7 @@ msgstr "错误" #: dlls/shlwapi/shlwapi.rc:43 msgid "Don't show me th&is message again" -msgstr "不要再显示这个讯息(&i)" +msgstr "不要再显示这个信息(&I)" #: dlls/shlwapi/shlwapi.rc:30 msgid "%d bytes" @@ -11917,7 +11917,7 @@ msgstr "最大化(&X)" #: dlls/user32/user32.rc:36 msgid "&Close\tAlt+F4" -msgstr "关闭(&N)\tAlt+F4" +msgstr "关闭(&C)\tAlt+F4" #: dlls/user32/user32.rc:38 msgid "&About Wine" @@ -11925,7 +11925,7 @@ msgstr "关于 Wine(&A)" #: dlls/user32/user32.rc:49 msgid "&Close\tCtrl+F4" -msgstr "关闭(&N)\tCtrl+F4" +msgstr "关闭(&C)\tCtrl+F4" #: dlls/user32/user32.rc:51 msgid "Nex&t\tCtrl+F6" @@ -13837,7 +13837,7 @@ msgstr "" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷标 (11 个字符, 直接按 <回车> 以留空)?" +msgstr "卷标 (11 个字符，直接按 <回车> 以留空)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -14152,7 +14152,7 @@ msgstr "以太网" #: programs/ipconfig/ipconfig.rc:35 msgid "Connection-specific DNS suffix" -msgstr "链接专用的 DNS 后缀" +msgstr "连接专用的 DNS 后缀" #: programs/ipconfig/ipconfig.rc:36 msgid "IPv4 address" @@ -14754,7 +14754,7 @@ msgstr "专家模式(&E)" #: programs/oleview/oleview.rc:65 msgid "&Hidden component categories" -msgstr "隐藏部件分类(&H)" +msgstr "隐藏组件分类(&H)" #: programs/oleview/oleview.rc:67 programs/oleview/oleview.rc:89 #: programs/winefile/winefile.rc:65 programs/wordpad/wordpad.rc:71 @@ -14952,7 +14952,7 @@ msgstr "对象类型" #: programs/oleview/oleview.rc:131 msgid "Grouped by Component Category" -msgstr "按部件类型分组" +msgstr "按组件类型分组" #: programs/oleview/oleview.rc:132 msgid "OLE 1.0 Objects" @@ -15032,7 +15032,7 @@ msgstr "新建(&N)..." #: programs/progman/progman.rc:34 msgid "O&pen\tEnter" -msgstr "打开(&O)\tEnter" +msgstr "打开(&P)\tEnter" #: programs/progman/progman.rc:35 programs/winefile/winefile.rc:30 msgid "&Move...\tF7" @@ -15347,6 +15347,51 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <项> [/v 值名称 | /ve] [/t 类型] [/s 分隔符] [/d 数据] [/f]\n" +"\n" +" 添加一个项到注册表，或添加一个新的值到所指定的注册表项。\n" +"\n" +" <项>\n" +" 要添加的注册表项，如果指定了 [/v] 或 [/ve] 选项，\n" +" 则新的注册表数据将被添加到该项。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /v <值名称>\n" +" 所要添加的注册表值名称。\n" +"\n" +" /ve\n" +" 添加一个未指定名称的值。该选项将修改 (默认) 注册表值。\n" +"\n" +" /t <类型>\n" +" 所要添加到注册表的数据的类型。如果指定了 [/t] 选项，\n" +" <类型> 应为以下的其中一个:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" 如果未指定 [/t] 选项，默认的数据类型是 REG_SZ。\n" +"\n" +" /s <分隔符>\n" +" 指定一个字符，用于分隔 REG_MULTI_SZ 数据中的字符串。\n" +" 如果 [/s] 选项未被指定，默认的分隔符是 \\0。\n" +"\n" +" /d <数据>\n" +" 所要添加到新建注册表值的数据。\n" +"\n" +" /f\n" +" 无需确认提示，修改注册表。\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15382,6 +15427,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <项1> <项2> [/s] [/f]\n" +"\n" +" 复制所指定的注册表项的内容到另外一个位置。\n" +" 默认情况下，该操作只复制注册表值。使用 [/s] 选项可以\n" +" 递归复制所有的子项和值。\n" +"\n" +" <项1>，<项2>\n" +" 用于指定源项 (<项1>) 和目标项 (<项2>)。\n" +" 如果 <项2> 不存在，它将会被创建。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /s\n" +" 从 <项1> 复制所有的子项和值到 <项2>。\n" +"\n" +" /f\n" +" 无需确认提示，覆盖 <项2> 中所有的数据。\n" +" 该选项不会修改只存在于 <项2> 中的子项和值。\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15421,6 +15495,39 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <项> [/v 值名称 | /ve | /va] [/f]\n" +"\n" +" 删除一个注册表项 (包括所有的子项和值)，或删除\n" +" 指定注册表项中的一个或多个注册表值。\n" +"\n" +" <项>\n" +" 所要删除的注册表项，如果指定了 [/v]，[/ve] 或 [/va] 选项的\n" +" 其中一个，则可删除注册表项内的一个或多个值。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /v <值名称>\n" +" 所要删除的注册表值名称。\n" +"\n" +" /ve\n" +" 删除一个未指定名称的注册表值。该选项将删除 (默认) 注册表值。\n" +"\n" +" /va\n" +" 删除注册表项中所有的值。\n" +"\n" +" /f\n" +" 无需确认提示，删除注册表项 (包括所有的子项和值)。\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15452,6 +15559,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <项> <文件> [/y]\n" +"\n" +" 导出所指定的注册表项 (包括所有的子项和值)\n" +" 到一个文件。\n" +"\n" +" <key>\n" +" 所要导出的注册表项。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" <文件>\n" +" 所要创建的注册表文件的名称和路径。\n" +" 该文件必须使用 .reg 扩展名。\n" +"\n" +" /y\n" +" 无需确认提示，覆盖 <文件>。\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15505,6 +15639,36 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <项> [/v 值名称 | /ve] [/s]\n" +"\n" +" 查询所指定的注册表项，并列出该注册表项中所有的子项、值和数据。\n" +" 使用 [/s] 选项可以递归查询每一个子项。\n" +"\n" +" <key>\n" +" 所要查询的注册表项。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 内置的注册表项。应为以下的其中一个:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 位于指定的 ROOT 下的注册表项完整路径。\n" +"\n" +" /v <值名称>\n" +" 所要查询的注册表值名称，如果未指定 [/v] 或 [/ve] 选项，\n" +" <项1> 中所有的值都将被列出。\n" +"\n" +" /ve\n" +" 查询一个未指定名称的值。该选项将查询 (默认) 注册表值。\n" +"\n" +" /s\n" +" 列出 <项> 及其子项中的所有注册表项。\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15699,7 +15863,7 @@ msgstr "展开" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 msgid "Modify &Binary Data..." -msgstr "修改二进制数据...(&B)" +msgstr "修改二进制数据(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -16782,7 +16946,7 @@ msgstr "映像名称(&I)" #: programs/taskmgr/taskmgr.rc:523 msgid "&PID (Process Identifier)" -msgstr "&PID (进程编号)" +msgstr "PID (进程编号)(&P)" #: programs/taskmgr/taskmgr.rc:525 msgid "&CPU Usage" @@ -16790,7 +16954,7 @@ msgstr "&CPU 负载率" #: programs/taskmgr/taskmgr.rc:527 msgid "CPU Tim&e" -msgstr "CPU 耗时(&T)" +msgstr "CPU 耗时(&E)" #: programs/taskmgr/taskmgr.rc:529 msgid "&Memory Usage" @@ -17372,7 +17536,7 @@ msgstr "允许窗口管理器控制窗口(&W)" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "虚拟桌面(&D)" +msgstr "虚拟桌面(&E)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -18004,7 +18168,7 @@ msgstr "按日期排序(&D)" #: programs/winefile/winefile.rc:59 msgid "Filter by&..." -msgstr "过滤标准&..." +msgstr "过滤标准(&.)..." #: programs/winefile/winefile.rc:66 msgid "&Drive Bar" @@ -18024,7 +18188,7 @@ msgstr "层叠\tCtrl+F5" #: programs/winefile/winefile.rc:77 msgid "Tile &Vertically\tCtrl+F4" -msgstr "垂直平铺(&)\tCtrl+F4" +msgstr "垂直平铺(&V)\tCtrl+F4" #: programs/winefile/winefile.rc:84 msgid "&About Wine File Manager" @@ -18273,7 +18437,7 @@ msgstr "如何使用帮助(&H)\tF1" #: programs/winhlp32/winhlp32.rc:59 msgid "&About Wine Help" -msgstr "关于 Wine 帮助(&I)" +msgstr "关于 Wine 帮助(&A)" #: programs/winhlp32/winhlp32.rc:67 msgid "Annotation..." @@ -18317,7 +18481,7 @@ msgstr "找不到文件“%s”。您想要自己找这个文件吗?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "找不到 richedit 的实现……终止" +msgstr "找不到 richedit 的实现... 终止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " @@ -18517,7 +18681,7 @@ msgstr "添加(&A)" #: programs/wordpad/wordpad.rc:259 msgid "Remove al&l" -msgstr "全部删除(&R)" +msgstr "全部删除(&L)" #: programs/wordpad/wordpad.rc:267 msgid "Line wrapping" -- 2.34.1

1 0

[PATCH] kernel32/tests: Drop change test workarounds for Windows <= 2000
by Alex Henrie Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Dropping support for very old Windows versions allows us to enable the test for FindFirstChangeNotificationA with a null path. --- dlls/kernel32/tests/change.c | 154 ++++++++++------------------------- 1 file changed, 44 insertions(+), 110 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 254faf9c2a1..c0fcf00ba68 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -99,16 +99,14 @@ static void test_FindFirstChangeNotification(void) change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_NO_MORE_FILES, /* win95 */ + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "FindFirstChangeNotification error: %d\n", GetLastError()); - if (0) /* This documents win2k behavior. It crashes on win98. */ - { - change = FindFirstChangeNotificationA(NULL, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == NULL && GetLastError() == ERROR_PATH_NOT_FOUND, - "FindFirstChangeNotification error: %d\n", GetLastError()); - } + change = FindFirstChangeNotificationA(NULL, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); + ok(change == INVALID_HANDLE_VALUE || broken(change == NULL) /* < win7 */, + "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "FindFirstChangeNotification error: %u\n", GetLastError()); ret = FindNextChangeNotification(NULL); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindNextChangeNotification error: %d\n", @@ -137,10 +135,10 @@ static void test_FindFirstChangeNotification(void) ret = CloseHandle(file); ok( ret, "CloseHandle error: %d\n", GetLastError()); - /* Try to register notification for a file. win98 and win2k behave differently here */ + /* Try to register notification for a file */ change = FindFirstChangeNotificationA(filename1, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_DIRECTORY || - GetLastError() == ERROR_FILE_NOT_FOUND), + ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_DIRECTORY, "FindFirstChangeNotification error: %d\n", GetLastError()); lstrcpyA(dirname1, filename1); @@ -156,15 +154,14 @@ static void test_FindFirstChangeNotification(void) thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); ok(ret, "MoveFileA error: %d\n", GetLastError()); - /* win9x and win2k behave differently here, don't check result */ - FinishNotificationThread(thread); + ok(!FinishNotificationThread(thread), "Got notification\n"); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); - /* win9x and win2k behave differently here, don't check result */ - FinishNotificationThread(thread); + ret = FinishNotificationThread(thread); + todo_wine ok(ret, "Missed notification\n"); /* functional checks */ @@ -263,16 +260,8 @@ static void test_ffcn(void) static const WCHAR szHoo[] = { '\\','h','o','o',0 }; static const WCHAR szZoo[] = { '\\','z','o','o',0 }; - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -407,9 +396,6 @@ static void test_ffcnMultipleThreads(void) ok( r == TRUE, "failed to remove dir\n"); } -static BOOL (WINAPI *pReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD, - LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); - static void test_readdirectorychanges(void) { HANDLE hdir; @@ -423,22 +409,8 @@ static void test_readdirectorychanges(void) PFILE_NOTIFY_INFORMATION pfni; BOOL got_subdir_change = FALSE; - if (!pReadDirectoryChangesW) - { - win_skip("ReadDirectoryChangesW is not available\n"); - return; - } - - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -455,7 +427,7 @@ static void test_readdirectorychanges(void) ok( r == TRUE, "failed to create directory\n"); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(NULL,NULL,0,FALSE,0,NULL,NULL,NULL); + r = ReadDirectoryChangesW(NULL,NULL,0,FALSE,0,NULL,NULL,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); @@ -468,12 +440,12 @@ static void test_readdirectorychanges(void) ov.hEvent = CreateEventW( NULL, 1, 0, NULL ); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,NULL,NULL); + r = ReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,NULL,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); @@ -491,15 +463,15 @@ static void test_readdirectorychanges(void) ov.InternalHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,-1,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,-1,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 10 ); @@ -522,11 +494,11 @@ static void test_readdirectorychanges(void) ResetEvent(ov.hEvent); SetLastError(0xd0b00b00); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,NULL,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,NULL,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,0,NULL,&ov,NULL); ok(GetLastError()==ERROR_INVALID_PARAMETER,"last error wrong\n"); ok(r==FALSE, "should return false\n"); @@ -538,7 +510,7 @@ static void test_readdirectorychanges(void) S(U(ov)).Offset = 0; S(U(ov)).OffsetHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); ok( (NTSTATUS)ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); @@ -570,7 +542,7 @@ static void test_readdirectorychanges(void) ok( !memcmp(pfni->FileName,&szHoo[1],6), "name wrong\n" ); /* what happens if the buffer is too small? */ - r = pReadDirectoryChangesW(hdir,buffer,0x10,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,0x10,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = CreateDirectoryW( subdir, NULL ); @@ -583,7 +555,7 @@ static void test_readdirectorychanges(void) ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); /* test the recursive watch */ - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = CreateDirectoryW( subsubdir, NULL ); @@ -619,7 +591,7 @@ static void test_readdirectorychanges(void) if (got_subdir_change) break; - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); } ok(got_subdir_change, "didn't get subdir change\n"); @@ -629,7 +601,7 @@ static void test_readdirectorychanges(void) ov.Internal = 1; ov.InternalHigh = 1; - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = RemoveDirectoryW( subdir ); @@ -674,21 +646,8 @@ static void test_readdirectorychanges_null(void) static const WCHAR szHoo[] = { '\\','h','o','o',0 }; PFILE_NOTIFY_INFORMATION pfni; - if (!pReadDirectoryChangesW) - { - win_skip("ReadDirectoryChangesW is not available\n"); - return; - } - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -716,7 +675,7 @@ static void test_readdirectorychanges_null(void) ov.InternalHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,NULL,0,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -737,7 +696,7 @@ static void test_readdirectorychanges_null(void) S(U(ov)).OffsetHigh = 0; memset( buffer, 0, sizeof buffer ); - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -774,16 +733,8 @@ static void test_readdirectorychanges_filedir(void) static const WCHAR szFoo[] = { '\\','f','o','o',0 }; PFILE_NOTIFY_INFORMATION pfni; - SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok( r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW( path, szBoo ); lstrcpyW( subdir, path ); @@ -809,7 +760,7 @@ static void test_readdirectorychanges_filedir(void) filter = FILE_NOTIFY_CHANGE_FILE_NAME; - r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); + r = ReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); r = WaitForSingleObject( ov.hEvent, 10 ); @@ -865,22 +816,8 @@ static void test_readdirectorychanges_cr(void) HANDLE hdir, hfile; NTSTATUS r; - if (!pReadDirectoryChangesW) - { - win_skip("ReadDirectoryChangesW is not available\n"); - return; - } - - SetLastError(0xdeadbeef); r = GetTempPathW(MAX_PATH, path); - if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetTempPathW is not implemented\n"); - return; - } ok(r != 0, "temp path failed\n"); - if (!r) - return; lstrcatW(path, szBoo); lstrcpyW(dir, path); @@ -905,9 +842,9 @@ static void test_readdirectorychanges_cr(void) memset(&ov, 0, sizeof(ov)); ov.hEvent = (void*)0xdeadbeef; - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); hfile = CreateFileW(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); @@ -922,9 +859,9 @@ static void test_readdirectorychanges_cr(void) ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); /* This event will not be reported */ r = CreateDirectoryW(dir, NULL); @@ -942,9 +879,9 @@ static void test_readdirectorychanges_cr(void) ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = MoveFileW(sub_file, file); ok(r == TRUE, "failed to move file\n"); @@ -958,9 +895,9 @@ static void test_readdirectorychanges_cr(void) ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = DeleteFileW(file); ok(r == TRUE, "failed to delete file\n"); @@ -981,9 +918,9 @@ static void test_readdirectorychanges_cr(void) FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); ok(hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = MoveFileW(dir, file); ok(r == TRUE, "failed to move directory\n"); @@ -1012,9 +949,9 @@ static void test_readdirectorychanges_cr(void) if (fni->NextEntryOffset == 0) { - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory move event\n"); @@ -1027,9 +964,9 @@ static void test_readdirectorychanges_cr(void) r = RemoveDirectoryW(dir); ok(r == TRUE, "failed to remove directory\n"); - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory creation event\n"); @@ -1042,9 +979,9 @@ static void test_readdirectorychanges_cr(void) fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); else { - r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + r = ReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); - ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + ok(r == TRUE, "ReadDirectoryChangesW failed\n"); r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory removal event\n"); @@ -1150,9 +1087,6 @@ static void test_ffcn_directory_overlap(void) START_TEST(change) { - HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); - pReadDirectoryChangesW = (void *)GetProcAddress(hkernel32, "ReadDirectoryChangesW"); - test_ffcnMultipleThreads(); /* The above function runs a test that must occur before FindCloseChangeNotification is run in the current thread to preserve the emptiness of the wine user APC queue. To ensure this it should be -- 2.34.1

1 0

[PATCH] comctl32/tests: Drop tooltips test workarounds for Windows <= 2000
by Alex Henrie Jan. 5, 2022

Jan. 5, 2022

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Dropping support for very old Windows versions allows us to enable the test for TTM_GETTEXTW with a null handle. --- dlls/comctl32/tests/tooltips.c | 35 +++++++++++----------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 639d51f7c28..4483e6f3fa3 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -55,8 +55,7 @@ static void test_create_tooltip(BOOL is_v6) style = GetWindowLongA(hwnd, GWL_STYLE); exp_style = 0x7fffffff | WS_POPUP; exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); - ok(style == exp_style || broken(style == (exp_style | WS_BORDER)), /* nt4 */ - "wrong style %08x/%08x\n", style, exp_style); + ok(style == exp_style, "wrong style %08x/%08x\n", style, exp_style); DestroyWindow(hwnd); @@ -243,8 +242,7 @@ static void test_customdraw(void) { if (CD_Stages) { /* Check CustomDraw results */ - ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls || - broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */ + ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls, "%d: CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages, expectedResults[iterationNumber].ExpectedCalls); } @@ -503,14 +501,11 @@ todo_wine todo_wine ok(!r, "Adding the tool to the tooltip succeeded!\n"); - if (0) /* crashes on NT4 */ - { - toolinfoW.hwnd = NULL; - toolinfoW.uId = 0x1234ABCD; - toolinfoW.lpszText = bufW; - SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); - ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); - } + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); /* text with embedded tabs */ toolinfoA.cbSize = sizeof(TTTOOLINFOA); @@ -571,9 +566,7 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xaaaaaaaa; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0x1abe11ed == ti.lParam || - broken(0x1abe11ed != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0x1abe11ed, got %lx\n", ti.lParam); + ok(0x1abe11ed == ti.lParam, "Expected 0x1abe11ed, got %lx\n", ti.lParam); tiW.cbSize = TTTOOLINFOW_V2_SIZE; tiW.hwnd = NULL; @@ -582,9 +575,7 @@ static void test_ttm_gettoolinfo(void) tiW.lpszText = NULL; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); - ok(0x1abe11ed == tiW.lParam || - broken(0x1abe11ed != tiW.lParam), /* comctl32 < 5.81 */ - "Expected 0x1abe11ed, got %lx\n", tiW.lParam); + ok(0x1abe11ed == tiW.lParam, "Expected 0x1abe11ed, got %lx\n", tiW.lParam); ti.cbSize = TTTOOLINFOA_V2_SIZE; ti.uId = 0x1234ABCD; @@ -595,9 +586,7 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xdeadbeef; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0x55555555 == ti.lParam || - broken(0x55555555 != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0x55555555, got %lx\n", ti.lParam); + ok(0x55555555 == ti.lParam, "Expected 0x55555555, got %lx\n", ti.lParam); DestroyWindow(hwnd); @@ -854,9 +843,7 @@ static void test_longtextW(void) toolinfoW.lpszText = bufW; SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); textlen = lstrlenW(toolinfoW.lpszText); - ok(textlen == lenW || - broken(textlen == 0 && toolinfoW.lpszText == NULL), /* nt4, kb186177 */ - "lpszText has %d chars\n", textlen); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); } DestroyWindow(hwnd); -- 2.34.1

1 0

RFC: Rework of wined3d cs fencing
by Stefan Dösinger Jan. 5, 2022

Jan. 5, 2022

Hi, Before the holidays I spent some time optimizing the cs resource fencing code. The current state is attached for review. I'll send it for upstreaming after the code freeze. The basic idea is to use the default queue head and tail for fencing. This completely removes any work on the command stream thread side, and the main thread work goes from an interlocked op to a simple assignment. Together with the technically unrelated patch 4 it improves a microbenchmark I wrote for this (https://github.com/stefand/perftest/tree/main/resource_tracking_d3d11) from ~200 fps to ~700 fps on my Ryzen CPU. Other CPUs have lower gains, but still more than double the framerate. It also produces a measurable improvement in Rocket League once other known CS issues are hacked away. Items for discussion: 1) I am not entirely sure I do the ULONG / LONG handling correctly. I guess we could get away with just keeping everything as signed LONGs, but technically signed int overflow is undefined behavior. Interlocked ops accept LONG * though... 2) resource_acquire could be renamed to something else 3) Separate read and write timestamps. This should be easy to add on top of the current code. 4) Traversing resource->device->cs->queue in wined3d_resource_acquire is ugly. I'm contemplating passing const struct wined3d_cs or the timestamp to it explicitly. 5) We still iterate over a huge number of resources. Does anyone have ideas how to cut this down? Happy new Year, Stefan

2 2

[PATCH] mshtml: Remove duplicate check in get_top_window.
by Jacek Caban Jan. 4, 2022

Jan. 4, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49174 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] winegcc: Use libgcc on Cygwin target.
by Jacek Caban Jan. 4, 2022

Jan. 4, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52328 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

1 0