September 2023 - Wine-commits

Hans Leidekker : systeminfo: Add an implementation on top of WMI.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: wine Branch: master Commit: c3937d954f560a37f127c8b4f758f0fe351a21e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3937d954f560a37f127c8b4f758f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 22 15:17:26 2023 +0200 systeminfo: Add an implementation on top of WMI. --- programs/systeminfo/Makefile.in | 1 + programs/systeminfo/main.c | 368 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 363 insertions(+), 6 deletions(-)

1 0

Zhiyi Zhang : user32/tests: Fix test failures in Hindi UTF-8 and mixed locales.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: wine Branch: master Commit: b000b6593750c2cb82605c2f960afa36dd68f44c URL: https://gitlab.winehq.org/wine/wine/-/commit/b000b6593750c2cb82605c2f960afa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 27 15:54:31 2023 +0800 user32/tests: Fix test failures in Hindi UTF-8 and mixed locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55656 --- dlls/user32/tests/dialog.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 18a9685b230..7ea0d13c0f3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -38,6 +38,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #define MAXHWNDS 1024 static HWND hwnd [MAXHWNDS]; @@ -569,13 +570,24 @@ static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, L static int wm_char_count; +static BOOL is_cjk(void) +{ + int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); + + if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) + return TRUE; + return FALSE; +} + static LRESULT CALLBACK test_IsDialogMessageA_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) { case WM_CHAR: - if (GetSystemMetrics(SM_DBCSENABLED)) + if (is_cjk()) ok(wparam == 0x5b57, "Got unexpected wparam %#Ix.\n", wparam); + else if (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_HINDI && GetACP() == CP_UTF8) + ok(wparam == 0xfffd, "Got unexpected wparam %#Ix.\n", wparam); else ok(wparam == 0x3f, "Got unexpected wparam %#Ix.\n", wparam); wm_char_count++; @@ -863,8 +875,10 @@ static void test_IsDialogMessage(void) { if (msg.message == WM_CHAR) { - if (GetSystemMetrics(SM_DBCSENABLED)) + if (is_cjk()) ok(msg.wParam != 0x3f && msg.wParam != 0x5b57, "Got unexpected wparam %#Ix.\n", msg.wParam); + else if (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_HINDI && GetACP() == CP_UTF8) + ok(msg.wParam == 0x97ade5, "Got unexpected wparam %#Ix.\n", msg.wParam); else ok(msg.wParam == 0x3f, "Got unexpected wparam %#Ix.\n", msg.wParam); ret = IsDialogMessageA(g_hwndMain, &msg);

1 0

Zhiyi Zhang : user32: Enable IsDialogMessageA() ASCII to Unicode mapping only when the user default lang ID is CJK.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: wine Branch: master Commit: 8d5d413697e92042c64a6a77894b88eed063a8b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d5d413697e92042c64a6a77894b88… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 27 15:57:53 2023 +0800 user32: Enable IsDialogMessageA() ASCII to Unicode mapping only when the user default lang ID is CJK. Using GetSystemMetrics(SM_DBCSENABLED) may incorrectly enable ASCII to Unicode mapping in mixed locale environments. For example, when UserDefaultLCID is French(040c) but SystemDefaultLCID is Japanese(0411). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55655 --- dlls/user32/message.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4016c95539a..86c6593e192 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -807,6 +807,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT return (msg->message != WM_QUIT); } +static BOOL is_cjk(void) +{ + int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); + + if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) + return TRUE; + return FALSE; +} /*********************************************************************** * IsDialogMessageA (USER32.@) @@ -817,7 +825,7 @@ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG pmsg ) enum wm_char_mapping mapping; MSG msg = *pmsg; - mapping = GetSystemMetrics( SM_DBCSENABLED ) ? WMCHAR_MAP_ISDIALOGMESSAGE : WMCHAR_MAP_NOMAPPING; + mapping = is_cjk() ? WMCHAR_MAP_ISDIALOGMESSAGE : WMCHAR_MAP_NOMAPPING; if (!map_wparam_AtoW( msg.message, &msg.wParam, mapping )) return TRUE; return IsDialogMessageW( hwndDlg, &msg );

1 0

Esme Povirk : user32/tests: Use open_clipboard helper in msg tests.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: wine Branch: master Commit: ef837dbceb702d9d31477d8edd17b54a71665dd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef837dbceb702d9d31477d8edd17b5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 27 13:17:00 2023 -0500 user32/tests: Use open_clipboard helper in msg tests. --- dlls/user32/tests/msg.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9d2cc404139..10240b18826 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17623,11 +17623,41 @@ out_unregister: UnregisterClassA("TestDesktopClass", instance); } +#define open_clipboard(hwnd) open_clipboard_(__LINE__, hwnd) +static BOOL open_clipboard_(int line, HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace_(__FILE__, line)("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + #define clear_clipboard(hwnd) clear_clipboard_(__LINE__, (hwnd)) static void clear_clipboard_(int line, HWND hWnd) { BOOL succ; - succ = OpenClipboard(hWnd); + succ = open_clipboard_(line, hWnd); ok_(__FILE__, line)(succ, "OpenClipboard failed, err=%lu\n", GetLastError()); succ = EmptyClipboard(); ok_(__FILE__, line)(succ, "EmptyClipboard failed, err=%lu\n", GetLastError());

1 0

Alex Henrie : include: Move RTL functions that belong in ntddk.h from winternl.h to ntddk.h.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: wine Branch: master Commit: 0d7cf847098e343c06a6f67f29da49aa53fb49de URL: https://gitlab.winehq.org/wine/wine/-/commit/0d7cf847098e343c06a6f67f29da49… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 26 10:25:33 2023 -0600 include: Move RTL functions that belong in ntddk.h from winternl.h to ntddk.h. --- dlls/kernel32/lzexpand.c | 3 +++ dlls/kernel32/resource.c | 1 + dlls/kernelbase/loader.c | 1 + dlls/kernelbase/security.c | 1 + dlls/krnl386.exe16/atom.c | 3 +++ dlls/krnl386.exe16/ne_module.c | 3 +++ dlls/ntdll/actctx.c | 1 + dlls/ntdll/rtlstr.c | 1 + dlls/ntdll/tests/path.c | 1 + dlls/secur32/lsa.c | 1 + dlls/winmm/mmio.c | 3 +++ include/ddk/ntddk.h | 12 ++++++++++++ include/winternl.h | 9 --------- programs/services/rpc.c | 3 +++ 14 files changed, 34 insertions(+), 9 deletions(-)

1 0

Alistair Leslie-Hughes : d3dx9: Trace pointer value in D3DXValidMesh().
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: wine Branch: master Commit: cef39a24ee779ba16f3460b2a006d54ddecd56bc URL: https://gitlab.winehq.org/wine/wine/-/commit/cef39a24ee779ba16f3460b2a006d5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 24 19:03:26 2023 +1000 d3dx9: Trace pointer value in D3DXValidMesh(). --- dlls/d3dx9_36/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 47a0cadde67..7aa70783735 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6464,7 +6464,7 @@ error: HRESULT WINAPI D3DXValidMesh(ID3DXMesh *mesh, const DWORD *adjacency, ID3DXBuffer **errors_and_warnings) { - FIXME("(%p, %p, %p): stub\n", mesh, adjacency, *errors_and_warnings); + FIXME("mesh %p, adjacency %p, errors_and_warnings %p stub.\n", mesh, adjacency, errors_and_warnings); return E_NOTIMPL; }

1 0

Nikolay Sivov : d3d10/tests: Test for correct return value.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: wine Branch: master Commit: 985bb4263ee68d8a5fc8fd5e4482c2b22ed177d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/985bb4263ee68d8a5fc8fd5e4482c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 10:52:01 2023 +0200 d3d10/tests: Test for correct return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 908844d97d0..e5efa2d5df2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9169,11 +9169,7 @@ static void test_effect_fx_4_1_blend_state(void) } hr = create_effect(fx_4_1_test_blend_state, 0, device, NULL, &effect); - todo_wine - ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - - if (effect) - effect->lpVtbl->Release(effect); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount);

1 0

Francisco Casas : vkd3d-shader/d3d-asm: Use vkd3d_shader_register.dimension to know when to dump writemask.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: vkd3d Branch: master Commit: ef1567c17b9521c0b4bd140b49f5b91fa221cf65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef1567c17b9521c0b4bd140b49f5b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 29 18:33:50 2023 -0400 vkd3d-shader/d3d-asm: Use vkd3d_shader_register.dimension to know when to dump writemask. This change ensures that we don't dump the writemask for registers that have a scalar dimension. For instance, for this shader: float r; float4 main(out float d : DEPTH) : sv_target { d = r; return 0; } we now correctly dump dcl_output oDepth instead of dcl_output oDepth.x --- libs/vkd3d-shader/d3d_asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 7df2f163..62b50876 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1264,7 +1264,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_register(compiler, &param->reg, is_declaration); - if (write_mask) + if (write_mask && param->reg.dimension == VSIR_DIMENSION_VEC4) { static const char write_mask_chars[] = "xyzw";

1 0

Francisco Casas : vkd3d-shader/d3d-asm: Don't print offset for DEPTHOUT registers.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: vkd3d Branch: master Commit: 123e399b893cc9c0da47c236df7c609ead70a16e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/123e399b893cc9c0da47c236df7c6… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 29 19:08:24 2023 -0400 vkd3d-shader/d3d-asm: Don't print offset for DEPTHOUT registers. This register is unique and thus is not accompanied with an offset in the native disassembler output. --- libs/vkd3d-shader/d3d_asm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 62b50876..6a3513a2 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1164,7 +1164,8 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const } else if (reg->type != VKD3DSPR_RASTOUT && reg->type != VKD3DSPR_MISCTYPE - && reg->type != VKD3DSPR_NULL) + && reg->type != VKD3DSPR_NULL + && reg->type != VKD3DSPR_DEPTHOUT) { if (offset != ~0u) {

1 0

Andrey Gusev : vkd3d: Add ID3D12Device4 interface stub.
by Alexandre Julliard 27 Sep '23

27 Sep '23

Module: vkd3d Branch: master Commit: acd3ed97dc8e1ac192b2ec6fc19596831a6b61c6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/acd3ed97dc8e1ac192b2ec6fc1959… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 27 20:44:44 2023 +0300 vkd3d: Add ID3D12Device4 interface stub. --- libs/vkd3d/device.c | 270 +++++++++++++++++++++++++++++---------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +- 4 files changed, 181 insertions(+), 107 deletions(-)

1 0