wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Nikolay Sivov : vkd3d-shader/hlsl: Support reflect() intrinsic.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: vkd3d Branch: master Commit: e7bc634307804859f5b729950d78fc28da989ce1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e7bc634307804859f5b729950d78f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 3 11:16:21 2023 +0300 vkd3d-shader/hlsl: Support reflect() intrinsic. Tests authored by Giovanni. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 22 ++++++++++ tests/reflect.shader_test | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+) diff --git a/Makefile.am b/Makefile.am index f9199472..8822e9eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,6 +130,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/reflect.shader_test \ tests/return.shader_test \ tests/round.shader_test \ tests/sampler.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 76b0eae7..2f001611 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2774,6 +2774,27 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_reflect(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *i = params->args[0], *n = params->args[1]; + struct hlsl_ir_node *dot, *mul_n, *two_dot, *neg; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, i, n, loc))) + return false; + + if (!(two_dot = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, dot, dot, loc))) + return false; + + if (!(mul_n = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, n, two_dot, loc))) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, mul_n, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, i, neg, loc); +} + static bool intrinsic_round(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2982,6 +3003,7 @@ intrinsic_functions[] = {"mul", 2, true, intrinsic_mul}, {"normalize", 1, true, intrinsic_normalize}, {"pow", 2, true, intrinsic_pow}, + {"reflect", 2, true, intrinsic_reflect}, {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, {"sin", 1, true, intrinsic_sin}, diff --git a/tests/reflect.shader_test b/tests/reflect.shader_test new file mode 100644 index 00000000..02488589 --- /dev/null +++ b/tests/reflect.shader_test @@ -0,0 +1,101 @@ +[pixel shader] +uniform float4 i; +uniform float4 n; + +float4 main() : sv_target +{ + return reflect(i, n); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +draw quad +probe all rgba (-0.1, -0.5, 0.5, -0.7) 4 + +[pixel shader] +uniform float4 i; +uniform float4 n; + +float4 main() : sv_target +{ + float i1 = i.x; + + return reflect(i1, n); +} + +[test] +uniform 0 float4 0.5 0.0 0.0 0.0 +uniform 4 float4 0.6 0.4 -0.3 1.0 +draw quad +probe all rgba (-0.52, -0.18, 1.01, -1.2) 4 + +[pixel shader] +uniform float4 i; +uniform float4 n; + +float4 main() : sv_target +{ + float n1 = n.x; + + return reflect(i, n1); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.0 0.0 0.0 +draw quad +probe all rgba (-0.148, -0.748, -0.448, -0.348) 4 + +[pixel shader] +uniform float4 i; +uniform float4 n; + +float4 main() : sv_target +{ + float i1 = i.x; + float n1 = n.x; + + return reflect(i1, n1); +} + +[test] +uniform 0 float4 0.5 0.0 0.0 0.0 +uniform 4 float4 0.6 0.0 0.0 0.0 +draw quad +probe all rgba (0.14, 0.14, 0.14, 0.14) 4 + +[pixel shader] +uniform float4 i; +uniform float4 n; + +float4 main() : sv_target +{ + float2 i1 = i.xy; + + return float4(reflect(i1, n), 0.0, 0.0); +} + +[test] +uniform 0 float4 0.5 -0.1 0.0 0.0 +uniform 4 float4 0.6 0.4 -0.3 1.0 +draw quad +probe all rgba (0.188, -0.308, 0.0, 0.0) 4 + +[pixel shader] +uniform float4 i; +uniform float4 n; + +float4 main() : sv_target +{ + float3 i1 = i.xyz; + float2 n1 = n.xy; + + return float4(reflect(i1, n1), 0.0, 0.0); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.0 +uniform 4 float4 0.6 0.4 0.0 0.0 +draw quad +probe all rgba (0.188, -0.308, 0.0, 0.0) 4

1 0

Alexandre Julliard : Wine release 8.2
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: website Branch: master Commit: 289792443602231cf12aa4446d42eeec359fc84e URL: https://gitlab.winehq.org/winehq/winehq/-/commit/289792443602231cf12aa4446d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 21:40:57 2023 +0100 Wine release 8.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023021701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2023021701.xml b/news/en/2023021701.xml new file mode 100644 index 00000000..3a2a7c96 --- /dev/null +++ b/news/en/2023021701.xml @@ -0,0 +1,17 @@ +<news> +<date>February 17, 2023</date> +<title>Wine 8.2 Released</title> +<body> + The Wine development release 8.2 is now available. + <a href="{$root}/announce/8.2">What's new</a> in this release: +<ul> + <li>Better debug information in Wow64 mode.</li> + <li>Wow64 thunks in the WPCAP library.</li> + <li>Indeo IV50 codec support.</li> + <li>Monitor names set from EDID data.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.2 : Alexandre Julliard : Release 8.2
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: refs/tags/wine-8.2 Tag: 858d2132896e5f4d1ab374240625b86b6e5abf0d URL: https://gitlab.winehq.org/wine/wine/-/tags/858d2132896e5f4d1ab374240625b86b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 21:38:14 2023 +0100 Release 8.2

1 0

Alexandre Julliard : Release 8.2.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 464be65ceec111e49b7dc2aa6ce8432cb6113ae1 URL: https://gitlab.winehq.org/wine/wine/-/commit/464be65ceec111e49b7dc2aa6ce843… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 21:32:47 2023 +0100 Release 8.2. --- ANNOUNCE | 753 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 379 insertions(+), 397 deletions(-)

1 0

Francois Gouget : ws2_32: Warn that a libnss plugin may be missing if getaddrinfo() returns EBUSY.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: a5c007df2da825b61dd80cbd45a28e970714cdff URL: https://gitlab.winehq.org/wine/wine/-/commit/a5c007df2da825b61dd80cbd45a28e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 1 14:14:17 2023 +0100 ws2_32: Warn that a libnss plugin may be missing if getaddrinfo() returns EBUSY. --- dlls/ws2_32/unixlib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index f013e1ac3d0..4646e8ff26f 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -102,6 +102,7 @@ #include "ws2_32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winsock); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifndef HAVE_LINUX_GETHOSTBYNAME_R_6 static pthread_mutex_t host_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -463,6 +464,7 @@ static int addrinfo_err_from_unix( int err ) case EAI_SERVICE: return WS_EAI_SERVICE; case EAI_SOCKTYPE: return WS_EAI_SOCKTYPE; case EAI_SYSTEM: + if (errno == EBUSY) ERR_(winediag)("getaddrinfo() returned EBUSY. You may be missing a libnss plugin\n"); /* some broken versions of glibc return EAI_SYSTEM and set errno to * 0 instead of returning EAI_NONAME */ return errno ? errno_from_unix( errno ) : WS_EAI_NONAME;

1 0

Eric Pouech : ntdll: Implement RtlAddressInSectionTable.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 89d42d64d768d27e44408533d8fee9218dfa087d URL: https://gitlab.winehq.org/wine/wine/-/commit/89d42d64d768d27e44408533d8fee9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:07:17 2023 +0100 ntdll: Implement RtlAddressInSectionTable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54432 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/loader.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0689dd0f575..f254f1beefd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4355,6 +4355,15 @@ PVOID WINAPI RtlImageRvaToVa( const IMAGE_NT_HEADERS *nt, HMODULE module, } +/*********************************************************************** + * RtlAddressInSectionTable (NTDLL.@) + */ +PVOID WINAPI RtlAddressInSectionTable( const IMAGE_NT_HEADERS *nt, HMODULE module, + DWORD rva ) +{ + return RtlImageRvaToVa( nt, module, rva, NULL ); +} + /*********************************************************************** * RtlPcToFileHeader (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 87f4629ee2c..3117e4c9b72 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -490,7 +490,7 @@ # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) @ stdcall RtlAddVectoredExceptionHandler(long ptr) -# @ stub RtlAddressInSectionTable +@ stdcall RtlAddressInSectionTable(ptr long long) @ stdcall RtlAdjustPrivilege(long long long ptr) @ stdcall RtlAllocateAndInitializeSid (ptr long long long long long long long long long ptr) @ stdcall RtlAllocateHandle(ptr ptr) diff --git a/include/winternl.h b/include/winternl.h index 87d390308af..3a6c89a5f7a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4260,6 +4260,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID NTSYSAPI NTSTATUS WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); +NTSYSAPI PVOID WINAPI RtlAddressInSectionTable(const IMAGE_NT_HEADERS*,HMODULE,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *); NTSYSAPI RTL_HANDLE * WINAPI RtlAllocateHandle(RTL_HANDLE_TABLE *,ULONG *);

1 0

Francois Gouget : ntdll: Use the thread pool stack information.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: c2d9e92374d472a46635ec56e9a7103ea7a51d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d9e92374d472a46635ec56e9a710… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 03:39:05 2023 +0100 ntdll: Use the thread pool stack information. --- dlls/ntdll/threadpool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 99525f831e1..c50983e83d4 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1152,7 +1152,8 @@ static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) HANDLE thread; NTSTATUS status; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, 0, 0, 0, + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, 0, + pool->stack_info.StackReserve, pool->stack_info.StackCommit, threadpool_worker_proc, pool, &thread, NULL ); if (status == STATUS_SUCCESS) {

1 0

Francois Gouget : ntdll/tests: Test the thread pool stack APIs.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 710ae2928e614ed0974374f3dd75053100c1a6d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/710ae2928e614ed0974374f3dd7505… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 03:39:55 2023 +0100 ntdll/tests: Test the thread pool stack APIs. --- dlls/ntdll/tests/threadpool.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 008755e6e5d..a7457e0a315 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -33,15 +33,17 @@ static VOID (WINAPI *pTpCallbackReleaseSemaphoreOnCompletion)(TP_CALLBACK_IN static void (WINAPI *pTpCancelAsyncIoOperation)(TP_IO *); static VOID (WINAPI *pTpDisassociateCallback)(TP_CALLBACK_INSTANCE *); static BOOL (WINAPI *pTpIsTimerSet)(TP_TIMER *); -static VOID (WINAPI *pTpReleaseWait)(TP_WAIT *); static VOID (WINAPI *pTpPostWork)(TP_WORK *); +static NTSTATUS (WINAPI *pTpQueryPoolStackInformation)(TP_POOL *,TP_POOL_STACK_INFORMATION *); static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL,PVOID); static void (WINAPI *pTpReleaseIoCompletion)(TP_IO *); static VOID (WINAPI *pTpReleasePool)(TP_POOL *); static VOID (WINAPI *pTpReleaseTimer)(TP_TIMER *); +static VOID (WINAPI *pTpReleaseWait)(TP_WAIT *); static VOID (WINAPI *pTpReleaseWork)(TP_WORK *); static VOID (WINAPI *pTpSetPoolMaxThreads)(TP_POOL *,DWORD); +static NTSTATUS (WINAPI *pTpSetPoolStackInformation)(TP_POOL *,TP_POOL_STACK_INFORMATION *); static VOID (WINAPI *pTpSetTimer)(TP_TIMER *,LARGE_INTEGER *,LONG,LONG); static VOID (WINAPI *pTpSetWait)(TP_WAIT *,HANDLE,LARGE_INTEGER *); static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); @@ -80,6 +82,7 @@ static BOOL init_threadpool(void) GET_PROC(TpDisassociateCallback); GET_PROC(TpIsTimerSet); GET_PROC(TpPostWork); + GET_PROC(TpQueryPoolStackInformation); GET_PROC(TpReleaseCleanupGroup); GET_PROC(TpReleaseCleanupGroupMembers); GET_PROC(TpReleaseIoCompletion); @@ -88,6 +91,7 @@ static BOOL init_threadpool(void) GET_PROC(TpReleaseWait); GET_PROC(TpReleaseWork); GET_PROC(TpSetPoolMaxThreads); + GET_PROC(TpSetPoolStackInformation); GET_PROC(TpSetTimer); GET_PROC(TpSetWait); GET_PROC(TpSimpleTryPost); @@ -575,6 +579,7 @@ static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) static void test_tp_simple(void) { + TP_POOL_STACK_INFORMATION stack_info; TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; TP_CLEANUP_GROUP *group; @@ -678,6 +683,22 @@ static void test_tp_simple(void) pTpReleaseCleanupGroupMembers(group, TRUE, NULL); ok(userdata < 100, "expected userdata < 100, got %lu\n", userdata); + /* test querying and setting the stack size */ + status = pTpQueryPoolStackInformation(pool, &stack_info); + ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); + ok(stack_info.StackReserve == 2 * 1024 * 1024, "expected default StackReserve, got %ld\n", (ULONG)stack_info.StackReserve); + ok(stack_info.StackCommit == 4 * 1024, "expected default StackCommit, got %ld\n", (ULONG)stack_info.StackCommit); + + /* threadpool does not validate the stack size values */ + stack_info.StackReserve = stack_info.StackCommit = 1; + status = pTpSetPoolStackInformation(pool, &stack_info); + ok(!status, "TpSetPoolStackInformation failed: %lx\n", status); + + status = pTpQueryPoolStackInformation(pool, &stack_info); + ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); + ok(stack_info.StackReserve == 1, "expected 1 byte StackReserve, got %ld\n", (ULONG)stack_info.StackReserve); + ok(stack_info.StackCommit == 1, "expected 1 byte StackCommit, got %ld\n", (ULONG)stack_info.StackCommit); + /* cleanup */ pTpReleaseCleanupGroup(group); pTpReleasePool(pool);

1 0

Francois Gouget : user32/tests: Show ToAscii(A) returns 'a' for multiple keyboard layouts.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 41a53f535fe6d919c75181a7aac7cf0da3ac79be URL: https://gitlab.winehq.org/wine/wine/-/commit/41a53f535fe6d919c75181a7aac7cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 15 04:25:02 2023 +0100 user32/tests: Show ToAscii(A) returns 'a' for multiple keyboard layouts. Not all layouts return 'a' but layouts like Azerty still return 'a' despite the A and Q keys being swapped. --- dlls/user32/tests/input.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d9d2a1aee8a..ee39b11fc12 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3177,7 +3177,6 @@ static void test_ToAscii(void) const BYTE HIGHEST_BIT = 0x80; int ret, len; DWORD gle; - BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); memset(state, 0, sizeof(state)); @@ -3202,7 +3201,16 @@ static void test_ToAscii(void) else /* ToAscii() can only return 2 chars => it fails if len > 2 */ ok(ret == 0, "ToAscii(A) returned %i, expected 0\n", ret); - if (us_kbd) ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); + switch ((ULONG_PTR)GetKeyboardLayout(0)) + { + case 0x04090409: /* Qwerty */ + case 0x04070407: /* Qwertz */ + case 0x040c040c: /* Azerty */ + ok(lstrcmpW(wstr, L"a") == 0, "ToUnicode(A) returned %s\n", wine_dbgstr_w(wstr)); + ok(character == 'a', "ToAscii(A) returned char=%i, expected %i\n", character, 'a'); + break; + /* Other keyboard layouts may or may not return 'a' */ + } state[VK_CONTROL] |= HIGHEST_BIT; state[VK_LCONTROL] |= HIGHEST_BIT;

1 0

Francois Gouget : user32/tests: Fix the ToAscii(A) test on Hindi + UTF-8.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: df811f91cc2821dd14fa1b72d4e474fb4720624e URL: https://gitlab.winehq.org/wine/wine/-/commit/df811f91cc2821dd14fa1b72d4e474… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 15 04:18:59 2023 +0100 user32/tests: Fix the ToAscii(A) test on Hindi + UTF-8. ToAscii() can only return two bytes and thus cannot return three-byte UTF-8 characters. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54058 --- dlls/user32/tests/input.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f8b40099091..d9d2a1aee8a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3169,11 +3169,14 @@ static void test_ToUnicode(void) static void test_ToAscii(void) { + WCHAR wstr[16]; + char str[16]; WORD character; BYTE state[256]; const BYTE SC_RETURN = 0x1c, SC_A = 0x1e; const BYTE HIGHEST_BIT = 0x80; - int ret; + int ret, len; + DWORD gle; BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); memset(state, 0, sizeof(state)); @@ -3183,9 +3186,22 @@ static void test_ToAscii(void) ok(ret == 1, "ToAscii for Return key didn't return 1 (was %i)\n", ret); ok(character == '\r', "ToAscii for Return was %i (expected 13)\n", character); + wstr[0] = 0; + ret = ToUnicode('A', SC_A, state, wstr, sizeof(wstr), 0); + ok(ret == 1, "ToUnicode(A) returned %i, expected 1\n", ret); + + str[0] = '\0'; + len = WideCharToMultiByte(CP_ACP, 0, wstr, -1, str, sizeof(str), NULL, NULL); + gle = GetLastError(); + ok(len > 0, "Could not convert %s (gle %lu)\n", wine_dbgstr_w(wstr), gle); + character = 0; ret = ToAscii('A', SC_A, state, &character, 0); - ok(ret == 1, "ToAscii for character 'A' didn't return 1 (was %i)\n", ret); + if (len == 1 || len == 2) + ok(ret == 1, "ToAscii(A) returned %i, expected 1\n", ret); + else + /* ToAscii() can only return 2 chars => it fails if len > 2 */ + ok(ret == 0, "ToAscii(A) returned %i, expected 0\n", ret); if (us_kbd) ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); state[VK_CONTROL] |= HIGHEST_BIT;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2023