June 2021 - Wine-commits - list.winehq.org

Giovanni Mascellani : winex11.drv: Allow keyboard layout score to be negative.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 054b7c8204ea7be2157cbeb690dabc85c2eaa08b URL: https://source.winehq.org/git/wine.git/?a=commit;h=054b7c8204ea7be2157cbeb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 9 12:56:18 2021 +0200 winex11.drv: Allow keyboard layout score to be negative. The keyboard layout matching algorithm can assign a negative score to a keyboard layout. If the user has a strange keyboard layout, possibly a custom one, it might happen that all keyboard layouts known by Wine get a negative score. This is not an error in itself, and we should still strive to find the best match. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d86f418a64e..5fde07ead31 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1432,7 +1432,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) KeySym keysym = 0; const char (*lkey)[MAIN_LEN][4]; unsigned max_seq = 0; - int max_score = 0, ismatch = 0; + int max_score = INT_MIN, ismatch = 0; char ckey[256][4]; syms = keysyms_per_keycode;

1 0

Giovanni Mascellani : winex11.drv: Do not pollute logs with misencoded bytes.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 2a505efb1ca14f33503657eb070de6edd484b4f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a505efb1ca14f33503657eb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 9 12:56:19 2021 +0200 winex11.drv: Do not pollute logs with misencoded bytes. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5fde07ead31..c6eab6f5cfa 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1505,7 +1505,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) char str[5]; for (i = 0; i < 4; i++) str[i] = ckey[keyc][i] ? ckey[keyc][i] : ' '; str[4] = 0; - TRACE_(key)("mismatch for keycode %u, got %s\n", keyc, str); + TRACE_(key)("mismatch for keycode %u, got %s\n", keyc, debugstr_a(str)); mismatch++; score -= syms; }

1 0

Rémi Bernon : ntoskrnl.exe/tests: Use HID helper macros to write report descriptors.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 1722f8793897556b764d757861276b0debf9bacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1722f8793897556b764d7578… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:12:16 2021 +0200 ntoskrnl.exe/tests: Use HID helper macros to write report descriptors. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 28 ++++++----- dlls/ntoskrnl.exe/tests/pop_hid_macros.h | 83 +++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/psh_hid_macros.h | 85 ++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 0f626e6866c..b34ba7f19ae 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -85,22 +85,26 @@ static NTSTATUS WINAPI driver_power(DEVICE_OBJECT *device, IRP *irp) return PoCallDriver(ext->NextDeviceObject, irp); } +#include "psh_hid_macros.h" + static const unsigned char report_descriptor[] = { - 0x05, HID_USAGE_PAGE_GENERIC, - 0x09, HID_USAGE_GENERIC_JOYSTICK, - 0xa1, 0x01, /* application collection */ - 0x05, HID_USAGE_PAGE_GENERIC, - 0x09, HID_USAGE_GENERIC_X, - 0x09, HID_USAGE_GENERIC_Y, - 0x15, 0x80, /* logical minimum -128 */ - 0x25, 0x7f, /* logical maximum 127 */ - 0x75, 0x08, /* report size */ - 0x95, 0x02, /* report count */ - 0x81, 0x02, /* input, variable */ - 0xc0, /* end collection */ + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + LOGICAL_MINIMUM(1, -128), + LOGICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + END_COLLECTION, }; +#include "pop_hid_macros.h" + static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { static BOOL test_failed; diff --git a/dlls/ntoskrnl.exe/tests/pop_hid_macros.h b/dlls/ntoskrnl.exe/tests/pop_hid_macros.h new file mode 100644 index 00000000000..767c26e8ecb --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/pop_hid_macros.h @@ -0,0 +1,83 @@ +/* + * HID report helper macros. + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#undef Data +#undef Cnst +#undef Array +#undef Var +#undef Abs +#undef Rel +#undef NoWrap +#undef Wrap +#undef NonLin +#undef Lin +#undef NoPref +#undef Pref +#undef NoNull +#undef Null +#undef NonVol +#undef Vol +#undef Bits +#undef Buff + +#undef Physical +#undef Application +#undef Logical +#undef Report +#undef NamedArray +#undef UsageSwitch +#undef UsageModifier + +#undef SHORT_ITEM_0 +#undef SHORT_ITEM_1 +#undef SHORT_ITEM_2 +#undef SHORT_ITEM_4 + +#undef LONG_ITEM + +#undef INPUT +#undef OUTPUT +#undef FEATURE +#undef COLLECTION +#undef END_COLLECTION + +#undef USAGE_PAGE +#undef LOGICAL_MINIMUM +#undef LOGICAL_MAXIMUM +#undef PHYSICAL_MINIMUM +#undef PHYSICAL_MAXIMUM +#undef UNIT_EXPONENT +#undef UNIT +#undef REPORT_SIZE +#undef REPORT_ID +#undef REPORT_COUNT +#undef PUSH +#undef POP + +#undef USAGE +#undef USAGE_MINIMUM +#undef USAGE_MAXIMUM +#undef DESIGNATOR_INDEX +#undef DESIGNATOR_MINIMUM +#undef DESIGNATOR_MAXIMUM +#undef STRING_INDEX +#undef STRING_MINIMUM +#undef STRING_MAXIMUM +#undef DELIMITER diff --git a/dlls/ntoskrnl.exe/tests/psh_hid_macros.h b/dlls/ntoskrnl.exe/tests/psh_hid_macros.h new file mode 100644 index 00000000000..4623af20598 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/psh_hid_macros.h @@ -0,0 +1,85 @@ +/* + * HID report helper macros. + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <hidusage.h> + +#define Data 0 +#define Cnst 0x01 +#define Ary 0 +#define Var 0x02 +#define Abs 0 +#define Rel 0x04 +#define NoWrap 0 +#define Wrap 0x08 +#define NonLin 0 +#define Lin 0x10 +#define NoPref 0 +#define Pref 0x20 +#define NoNull 0 +#define Null 0x40 +#define NonVol 0 +#define Vol 0x80 +#define Bits 0 +#define Buff 0x100 + +#define Physical 0x00 +#define Application 0x01 +#define Logical 0x02 +#define Report 0x03 +#define NamedArray 0x04 +#define UsageSwitch 0x05 +#define UsageModifier 0x06 + +#define SHORT_ITEM_0(tag,type) (((tag)<<4)|((type)<<2)|0) +#define SHORT_ITEM_1(tag,type,data) (((tag)<<4)|((type)<<2)|1),((data)&0xff) +#define SHORT_ITEM_2(tag,type,data) (((tag)<<4)|((type)<<2)|2),((data)&0xff),(((data)>>8)&0xff) +#define SHORT_ITEM_4(tag,type,data) (((tag)<<4)|((type)<<2)|3),((data)&0xff),(((data)>>8)&0xff),(((data)>>16)&0xff),(((data)>>24)&0xff) + +#define LONG_ITEM(tag,size) SHORT_ITEM_2(0xf,0x3,((tag)<<8)|(size)) + +#define INPUT(n,data) SHORT_ITEM_##n(0x8,0,data) +#define OUTPUT(n,data) SHORT_ITEM_##n(0x9,0,data) +#define FEATURE(n,data) SHORT_ITEM_##n(0xb,0,data) +#define COLLECTION(n,data) SHORT_ITEM_##n(0xa,0,data) +#define END_COLLECTION SHORT_ITEM_0(0xc,0) + +#define USAGE_PAGE(n,data) SHORT_ITEM_##n(0x0,1,data) +#define LOGICAL_MINIMUM(n,data) SHORT_ITEM_##n(0x1,1,data) +#define LOGICAL_MAXIMUM(n,data) SHORT_ITEM_##n(0x2,1,data) +#define PHYSICAL_MINIMUM(n,data) SHORT_ITEM_##n(0x3,1,data) +#define PHYSICAL_MAXIMUM(n,data) SHORT_ITEM_##n(0x4,1,data) +#define UNIT_EXPONENT(n,data) SHORT_ITEM_##n(0x5,1,data) +#define UNIT(n,data) SHORT_ITEM_##n(0x6,1,data) +#define REPORT_SIZE(n,data) SHORT_ITEM_##n(0x7,1,data) +#define REPORT_ID(n,data) SHORT_ITEM_##n(0x8,1,data) +#define REPORT_COUNT(n,data) SHORT_ITEM_##n(0x9,1,data) +#define PUSH(n,data) SHORT_ITEM_##n(0xa,1,data) +#define POP(n,data) SHORT_ITEM_##n(0xb,1,data) + +#define USAGE(n,data) SHORT_ITEM_##n(0x0,2,data) +#define USAGE_MINIMUM(n,data) SHORT_ITEM_##n(0x1,2,data) +#define USAGE_MAXIMUM(n,data) SHORT_ITEM_##n(0x2,2,data) +#define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) +#define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) +#define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data)

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some buttons and hatswitch controls.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 21fa04194ca99fe664d6eb37058718940bc11b68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fa04194ca99fe664d6eb37… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:12:17 2021 +0200 ntoskrnl.exe/tests: Add some buttons and hatswitch controls. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index b34ba7f19ae..1fe644250f7 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -100,6 +100,27 @@ static const unsigned char report_descriptor[] = REPORT_SIZE(1, 8), REPORT_COUNT(1, 2), INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), END_COLLECTION, }; @@ -181,7 +202,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_READ_REPORT: { - ULONG expected_size = 2; + ULONG expected_size = 4; ok(!in_size, "got input size %u\n", in_size); if (!test_failed) todo_wine ok(out_size == expected_size, "got output size %u\n", out_size); if (out_size != expected_size) test_failed = TRUE;

1 0

Alexandre Julliard : ntdll: Create a thread to run the ctrl-C routine instead of raising an exception.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 1bd447348402ce1b648ac48b9812a698f15df0c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd447348402ce1b648ac48b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 9 15:19:43 2021 +0200 ntdll: Create a thread to run the ctrl-C routine instead of raising an exception. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 ---------------- dlls/ntdll/loader.c | 15 +++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/signal_arm.c | 7 +++++-- dlls/ntdll/unix/signal_arm64.c | 7 +++++-- dlls/ntdll/unix/signal_i386.c | 9 +++++++-- dlls/ntdll/unix/signal_x86_64.c | 7 +++++-- dlls/ntdll/unix/unix_private.h | 1 + programs/conhost/conhost.c | 10 ---------- 10 files changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 6a3bfdeba65..c38e8e91955 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -470,20 +470,6 @@ DWORD WINAPI CtrlRoutine( void *arg ) } -static LONG WINAPI handle_ctrl_c( EXCEPTION_POINTERS *eptr ) -{ - if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH; - if (!RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle) return EXCEPTION_CONTINUE_SEARCH; - - if (!(NtCurrentTeb()->Peb->ProcessParameters->ConsoleFlags & 1)) - { - HANDLE thread = CreateThread( NULL, 0, CtrlRoutine, (void*)CTRL_C_EVENT, 0, NULL ); - if (thread) CloseHandle( thread ); - } - return EXCEPTION_CONTINUE_EXECUTION; -} - - /****************************************************************************** * FillConsoleOutputAttribute (kernelbase.@) */ @@ -1854,6 +1840,4 @@ void init_console( void ) AllocConsole(); } else if (params->ConsoleHandle) create_console_connection( params->ConsoleHandle ); - - RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e19b62cdaaf..54806b0ab22 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -72,6 +72,8 @@ typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *) void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) = NULL; +static DWORD (WINAPI *pCtrlRoutine)(void *); + const struct unix_funcs *unix_funcs = NULL; /* windows directory */ @@ -2939,6 +2941,17 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, DWORD reason, const void } +/*********************************************************************** + * __wine_ctrl_routine + */ +NTSTATUS WINAPI __wine_ctrl_routine( void *arg ) +{ + DWORD ret = 0; + + if (pCtrlRoutine && NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle) ret = pCtrlRoutine( arg ); + RtlExitUserThread( ret ); +} + /****************************************************************** * LdrLoadDll (NTDLL.@) */ @@ -3773,6 +3786,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } + RtlInitAnsiString( &func_name, "CtrlRoutine" ); + LdrGetProcedureAddress( kernel32_handle, &func_name, 0, (void **)&pCtrlRoutine ); actctx_init(); if (wm->ldr.Flags & LDR_COR_ILONLY) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9113a5d54dc..6bd6579d432 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1616,6 +1616,7 @@ @ cdecl -syscall __wine_unix_call(int64 long ptr) @ cdecl __wine_set_unix_funcs(long ptr) @ cdecl __wine_init_unix_lib(long long ptr ptr) +@ stdcall __wine_ctrl_routine(ptr) @ extern __wine_syscall_dispatcher @ extern -arch=i386 __wine_ldt_copy diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1830c4fb392..268f85994ae 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -109,6 +109,7 @@ void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,P NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; +void (WINAPI *p__wine_ctrl_routine)(void*); static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); @@ -836,6 +837,7 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( KiUserApcDispatcher ); GET_FUNC( LdrInitializeThunk ); GET_FUNC( RtlUserThreadStart ); + GET_FUNC( __wine_ctrl_routine ); GET_FUNC( __wine_set_unix_funcs ); #undef GET_FUNC #define SET_PTR(name,val) \ diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 3397e876722..0dba9cada94 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -716,9 +716,12 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec = { CONTROL_C_EXIT }; + HANDLE handle; - setup_exception( sigcontext, &rec ); + if (!p__wine_ctrl_routine) return; + if (!NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), + p__wine_ctrl_routine, 0 /* CTRL_C_EVENT */, 0, 0, 0, 0, NULL )) + NtClose( handle ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 5552704987f..a65184ba0a4 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -878,9 +878,12 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec = { CONTROL_C_EXIT }; + HANDLE handle; - setup_exception( sigcontext, &rec ); + if (!p__wine_ctrl_routine) return; + if (!NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), + p__wine_ctrl_routine, 0 /* CTRL_C_EVENT */, 0, 0, 0, 0, NULL )) + NtClose( handle ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 7aba553216f..b5afbcf0aac 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1956,9 +1956,14 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec = { CONTROL_C_EXIT }; + HANDLE handle; - setup_exception( sigcontext, &rec ); + init_handler( sigcontext ); + + if (!p__wine_ctrl_routine) return; + if (!NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), + p__wine_ctrl_routine, 0 /* CTRL_C_EVENT */, 0, 0, 0, 0, NULL )) + NtClose( handle ); } /********************************************************************** diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 524c9348ec2..148e3641d0e 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2427,9 +2427,12 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec = { CONTROL_C_EXIT }; + HANDLE handle; - setup_exception( sigcontext, &rec ); + if (!p__wine_ctrl_routine) return; + if (!NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), + p__wine_ctrl_routine, 0 /* CTRL_C_EVENT */, 0, 0, 0, 0, NULL )) + NtClose( handle ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 39ab7912490..5ebbc6d702b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,6 +100,7 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; +extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dd423ee5491..86dadad9277 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2713,14 +2713,6 @@ static int main_loop( struct console *console, HANDLE signal ) return 0; } -static LONG WINAPI handle_ctrl_c( EXCEPTION_POINTERS *eptr ) -{ - if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH; - /* In Unix mode, ignore ctrl c exceptions. Signals are sent it to clients as well and we will - * terminate the usual way if they don't handle it. */ - return EXCEPTION_CONTINUE_EXECUTION; -} - int __cdecl wmain(int argc, WCHAR *argv[]) { int headless = 0, i, width = 0, height = 0; @@ -2810,7 +2802,5 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) ? si.wShowWindow : SW_SHOW ); } - if (console.is_unix) RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); - return main_loop( &console, signal ); }

1 0

Zebediah Figura : l3codeca.acm: Remove the Mac OS AudioToolbox backend.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: d9ed4ee992b0b277dacf87d05cc0b69bcd06b90c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9ed4ee992b0b277dacf87d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:36 2021 -0500 l3codeca.acm: Remove the Mac OS AudioToolbox backend. libmpg123 is readily available in Mac OS package managers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/l3codeca.acm/Makefile.in | 2 +- dlls/l3codeca.acm/mpegl3.c | 390 +----------------------------------------- 4 files changed, 4 insertions(+), 392 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9ed4ee992b0b277dacf…

1 0

Zebediah Figura : l3codeca.acm: Call mp3_horse() directly.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 7a85ec7172639353af8c4873830bd7d1dba52c71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a85ec7172639353af8c4873… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:37 2021 -0500 l3codeca.acm: Call mp3_horse() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index e625a75b7ac..25097d424c4 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -113,8 +113,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) typedef struct tagAcmMpeg3Data { - void (*convert)(PACMDRVSTREAMINSTANCE adsi, - const unsigned char*, LPDWORD, unsigned char*, LPDWORD); mpg123_handle *mh; } AcmMpeg3Data; @@ -241,7 +239,6 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || adsi->pwfxDst->wBitsPerSample != 16) goto theEnd; - aad->convert = mp3_horse; aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); @@ -574,7 +571,7 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD MPEG3_Reset(adsi, aad); } - aad->convert(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); + mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); adsh->cbSrcLengthUsed = nsrc; adsh->cbDstLengthUsed = ndst;

1 0

Zebediah Figura : l3codeca.acm: Simplify error handling in MPEG3_StreamOpen().
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 341b0cf2300efffc831122870296dc4cb5646ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341b0cf2300efffc83112287… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:38 2021 -0500 l3codeca.acm: Simplify error handling in MPEG3_StreamOpen(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 105 ++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 69 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 25097d424c4..fb7c9cf386b 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -179,94 +179,59 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, *ndst = dpos; } -/*********************************************************************** - * MPEG3_Reset - * - */ -static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) -{ - mpg123_feedseek(aad->mh, 0, SEEK_SET, NULL); - mpg123_close(aad->mh); - mpg123_open_feed(aad->mh); -} - /*********************************************************************** * MPEG3_StreamOpen * */ -static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) +static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) { - LRESULT error = MMSYSERR_NOTSUPPORTED; AcmMpeg3Data* aad; int err; - assert(!(adsi->fdwOpen & ACM_STREAMOPENF_ASYNC)); + assert(!(instance->fdwOpen & ACM_STREAMOPENF_ASYNC)); - if (MPEG3_GetFormatIndex(adsi->pwfxSrc) == 0xFFFFFFFF || - MPEG3_GetFormatIndex(adsi->pwfxDst) == 0xFFFFFFFF) - return ACMERR_NOTPOSSIBLE; + if (MPEG3_GetFormatIndex(instance->pwfxSrc) == 0xFFFFFFFF + || MPEG3_GetFormatIndex(instance->pwfxDst) == 0xFFFFFFFF) + return ACMERR_NOTPOSSIBLE; - aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)); - if (aad == 0) return MMSYSERR_NOMEM; + if (instance->pwfxDst->wFormatTag != WAVE_FORMAT_PCM) + return MMSYSERR_NOTSUPPORTED; - adsi->dwDriver = (DWORD_PTR)aad; + if (instance->pwfxSrc->wFormatTag != WAVE_FORMAT_MPEGLAYER3 + && instance->pwfxSrc->wFormatTag != WAVE_FORMAT_MPEG) + return MMSYSERR_NOTSUPPORTED; - if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) + if (instance->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3) { - goto theEnd; + MPEGLAYER3WAVEFORMAT *mp3_format = (MPEGLAYER3WAVEFORMAT *)instance->pwfxSrc; + + if (instance->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES + || mp3_format->wID != MPEGLAYER3_ID_MPEG) + return ACMERR_NOTPOSSIBLE; } - else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || - adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) - { - if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3) - { - MPEGLAYER3WAVEFORMAT *formatmp3 = (MPEGLAYER3WAVEFORMAT *)adsi->pwfxSrc; - - if (adsi->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES || - formatmp3->wID != MPEGLAYER3_ID_MPEG) - { - error = ACMERR_NOTPOSSIBLE; - goto theEnd; - } - } - /* resampling or mono <=> stereo not available - * MPEG3 algo only define 16 bit per sample output - */ - if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) - goto theEnd; - aad->mh = mpg123_new(NULL,&err); - mpg123_open_feed(aad->mh); + if (instance->pwfxSrc->nSamplesPerSec != instance->pwfxDst->nSamplesPerSec + || instance->pwfxSrc->nChannels != instance->pwfxDst->nChannels + || instance->pwfxDst->wBitsPerSample != 16) + return MMSYSERR_NOTSUPPORTED; + + if (!(aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)))) + return MMSYSERR_NOMEM; + instance->dwDriver = (DWORD_PTR)aad; + + aad->mh = mpg123_new(NULL, &err); + mpg123_open_feed(aad->mh); #if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ - /* mpg123 may find a XING header in the mp3 and use that information - * to ask for seeks in order to read specific frames in the file. - * We cannot allow that since the caller application is feeding us. - * This fixes problems for mp3 files encoded with LAME (bug 42361) - */ - mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); + /* mpg123 may find a XING header in the mp3 and use that information + * to ask for seeks in order to read specific frames in the file. + * We cannot allow that since the caller application is feeding us. + * This fixes problems for mp3 files encoded with LAME (bug 42361) + */ + mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); #endif - } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) - { - WARN("Encoding to MPEG is not supported\n"); - goto theEnd; - } - else goto theEnd; - MPEG3_Reset(adsi, aad); return MMSYSERR_NOERROR; - - theEnd: - HeapFree(GetProcessHeap(), 0, aad); - adsi->dwDriver = 0L; - return error; } /*********************************************************************** @@ -568,7 +533,9 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD */ if ((adsh->fdwConvert & ACM_STREAMCONVERTF_START)) { - MPEG3_Reset(adsi, aad); + mpg123_feedseek(aad->mh, 0, SEEK_SET, NULL); + mpg123_close(aad->mh); + mpg123_open_feed(aad->mh); } mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst);

1 0

Zebediah Figura : l3codeca.acm: Store the mpg123 handle directly as the ACM driver data.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 1e047d786d71ed8d8e9f0f9442fd019c96080751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e047d786d71ed8d8e9f0f94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:39 2021 -0500 l3codeca.acm: Store the mpg123 handle directly as the ACM driver data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 51 +++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index fb7c9cf386b..fa9f38258e5 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -111,11 +111,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) return 0xFFFFFFFF; } -typedef struct tagAcmMpeg3Data -{ - mpg123_handle *mh; -} AcmMpeg3Data; - /*********************************************************************** * MPEG3_drvOpen */ @@ -135,11 +130,9 @@ static LRESULT MPEG3_drvClose(DWORD_PTR dwDevID) } -static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, - unsigned char* dst, LPDWORD ndst) +static void mp3_horse(mpg123_handle *handle, const unsigned char *src, + DWORD *nsrc, unsigned char *dst, DWORD *ndst) { - AcmMpeg3Data* amd = (AcmMpeg3Data*)adsi->dwDriver; int ret; size_t size; DWORD dpos = 0; @@ -147,7 +140,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, if (*nsrc > 0) { - ret = mpg123_feed(amd->mh, src, *nsrc); + ret = mpg123_feed(handle, src, *nsrc); if (ret != MPG123_OK) { ERR("Error feeding data\n"); @@ -158,7 +151,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, do { size = 0; - ret = mpg123_read(amd->mh, dst + dpos, *ndst - dpos, &size); + ret = mpg123_read(handle, dst + dpos, *ndst - dpos, &size); if (ret == MPG123_ERR) { FIXME("Error occurred during decoding!\n"); @@ -170,7 +163,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, { long rate; int channels, enc; - mpg123_getformat(amd->mh, &rate, &channels, &enc); + mpg123_getformat(handle, &rate, &channels, &enc); TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); } dpos += size; @@ -185,7 +178,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, */ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) { - AcmMpeg3Data* aad; + mpg123_handle *handle; int err; assert(!(instance->fdwOpen & ACM_STREAMOPENF_ASYNC)); @@ -215,12 +208,9 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) || instance->pwfxDst->wBitsPerSample != 16) return MMSYSERR_NOTSUPPORTED; - if (!(aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)))) - return MMSYSERR_NOMEM; - instance->dwDriver = (DWORD_PTR)aad; - - aad->mh = mpg123_new(NULL, &err); - mpg123_open_feed(aad->mh); + handle = mpg123_new(NULL, &err); + instance->dwDriver = (DWORD_PTR)handle; + mpg123_open_feed(handle); #if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information @@ -228,7 +218,7 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ - mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); + mpg123_param(handle, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); #endif return MMSYSERR_NOERROR; @@ -238,11 +228,12 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) * MPEG3_StreamClose * */ -static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) +static LRESULT MPEG3_StreamClose(ACMDRVSTREAMINSTANCE *instance) { - mpg123_close(((AcmMpeg3Data*)adsi->dwDriver)->mh); - mpg123_delete(((AcmMpeg3Data*)adsi->dwDriver)->mh); - HeapFree(GetProcessHeap(), 0, (void*)adsi->dwDriver); + mpg123_handle *handle = (mpg123_handle *)instance->dwDriver; + + mpg123_close(handle); + mpg123_delete(handle); return MMSYSERR_NOERROR; } @@ -513,9 +504,9 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad * MPEG3_StreamConvert * */ -static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER adsh) +static LRESULT MPEG3_StreamConvert(ACMDRVSTREAMINSTANCE *instance, ACMDRVSTREAMHEADER *adsh) { - AcmMpeg3Data* aad = (AcmMpeg3Data*)adsi->dwDriver; + mpg123_handle *handle = (mpg123_handle *)instance->dwDriver; DWORD nsrc = adsh->cbSrcLength; DWORD ndst = adsh->cbDstLength; @@ -533,12 +524,12 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD */ if ((adsh->fdwConvert & ACM_STREAMCONVERTF_START)) { - mpg123_feedseek(aad->mh, 0, SEEK_SET, NULL); - mpg123_close(aad->mh); - mpg123_open_feed(aad->mh); + mpg123_feedseek(handle, 0, SEEK_SET, NULL); + mpg123_close(handle); + mpg123_open_feed(handle); } - mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); + mp3_horse(handle, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); adsh->cbSrcLengthUsed = nsrc; adsh->cbDstLengthUsed = ndst;

1 0

Esme Povirk : advapi32: Fix typo.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 5a7d9fc26155ea40018ba4fb7d1b0ba2e7d61783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a7d9fc26155ea40018ba4fb… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 9 12:46:03 2021 -0500 advapi32: Fix typo. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6246cd21a62..02787fc841c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -101,7 +101,7 @@ static const AccountSid ACCOUNT_SIDS[] = { { WinBuiltinPreWindows2000CompatibleAccessSid, L"Pre-Windows 2000 Compatible Access", L"BUILTIN", SidTypeAlias }, { WinBuiltinRemoteDesktopUsersSid, L"Remote Desktop Users", L"BUILTIN", SidTypeAlias }, { WinBuiltinNetworkConfigurationOperatorsSid, L"Network Configuration Operators", L"BUILTIN", SidTypeAlias }, - { WinNTLMAuthenticationSid, L"NTML Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinNTLMAuthenticationSid, L"NTLM Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinDigestAuthenticationSid, L"Digest Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinSChannelAuthenticationSid, L"SChannel Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinThisOrganizationSid, L"This Organization", L"NT AUTHORITY", SidTypeWellKnownGroup },

1 0