November 2020 - Wine-commits

Rémi Bernon : ntdll: Return failure from RtlQueryProcessDebugInformation.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 97825b9c5311fd8f9b39fb6904fff06266de89b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97825b9c5311fd8f9b39fb69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 26 11:26:53 2020 +0100 ntdll: Return failure from RtlQueryProcessDebugInformation. Some DRM call it with GetCurrentThreadId(), although they don't seem to mind about the result. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugbuffer.c | 13 +++++++++++-- dlls/ntdll/tests/rtl.c | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index 3ac765d454e..9f5d214aacb 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -114,7 +114,16 @@ NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER iBuf) NTSTATUS WINAPI RtlQueryProcessDebugInformation(IN ULONG iProcessId, IN ULONG iDebugInfoMask, IN OUT PDEBUG_BUFFER iBuf) { - NTSTATUS nts = STATUS_SUCCESS; + CLIENT_ID cid; + NTSTATUS status; + HANDLE process; + + cid.UniqueProcess = ULongToHandle( iProcessId ); + cid.UniqueThread = 0; + + if ((status = NtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid ))) return status; + NtClose( process ); + FIXME("(%d, %x, %p): stub\n", iProcessId, iDebugInfoMask, iBuf); iBuf->InfoClassMask = iDebugInfoMask; @@ -139,5 +148,5 @@ NTSTATUS WINAPI RtlQueryProcessDebugInformation(IN ULONG iProcessId, IN ULONG iD } TRACE("returns:%p\n", iBuf); dump_DEBUG_BUFFER(iBuf); - return nts; + return status; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 897be4fcd12..28dd02fd118 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -132,6 +132,24 @@ static void InitFunctionPtrs(void) ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); } +static void test_RtlQueryProcessDebugInformation(void) +{ + DEBUG_BUFFER *buffer; + NTSTATUS status; + + buffer = RtlCreateQueryDebugBuffer( 0, 0 ); + ok( buffer != NULL, "RtlCreateQueryDebugBuffer returned NULL" ); + + status = RtlQueryProcessDebugInformation( GetCurrentThreadId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); + ok( status == STATUS_INVALID_CID, "RtlQueryProcessDebugInformation returned %x\n", status ); + + status = RtlQueryProcessDebugInformation( GetCurrentProcessId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); + ok( !status, "RtlQueryProcessDebugInformation returned %x\n", status ); + + status = RtlDestroyQueryDebugBuffer( buffer ); + ok( !status, "RtlDestroyQueryDebugBuffer returned %x\n", status ); +} + #define COMP(str1,str2,cmplen,len) size = RtlCompareMemory(str1, str2, cmplen); \ ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len) @@ -3668,6 +3686,7 @@ START_TEST(rtl) { InitFunctionPtrs(); + test_RtlQueryProcessDebugInformation(); test_RtlCompareMemory(); test_RtlCompareMemoryUlong(); test_RtlMoveMemory();

1 0

Alexandre Julliard : include: Make the CURRENT_STACK16 and CURRENT_DS macros available globally.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 6e1c296ef3b8cc37e595453365175f892f08b51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e1c296ef3b8cc37e5954533… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 12:42:54 2020 +0100 include: Make the CURRENT_STACK16 and CURRENT_DS macros available globally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/kernel16_private.h | 3 --- dlls/krnl386.exe16/thunk.c | 2 +- dlls/toolhelp.dll16/toolhelp.c | 10 ++++----- dlls/user.exe16/message.c | 40 ++++++++++++++--------------------- dlls/user.exe16/user.c | 24 ++++++++++----------- dlls/user.exe16/window.c | 3 +-- include/wine/winbase16.h | 4 ++++ 7 files changed, 38 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e1c296ef3b8cc37e595…

1 0

Alexandre Julliard : include: Add CURRENT_SS/SP macros for 16-bit code.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: f87262ea9935f5bc62d1f2f9c0146c7723ef7b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87262ea9935f5bc62d1f2f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 12:49:41 2020 +0100 include: Add CURRENT_SS/SP macros for 16-bit code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 4 ++-- dlls/krnl386.exe16/kernel.c | 7 +++--- dlls/krnl386.exe16/kernel16_private.h | 9 ++++---- dlls/krnl386.exe16/ne_module.c | 8 +++---- dlls/krnl386.exe16/ne_segment.c | 24 ++++++++++---------- dlls/krnl386.exe16/task.c | 37 +++++++++++++++--------------- dlls/krnl386.exe16/thunk.c | 42 ++++++++++++++++------------------- dlls/krnl386.exe16/wowthunk.c | 15 +++++-------- dlls/system.drv16/system.c | 2 +- dlls/user.exe16/message.c | 6 ++--- include/wine/winbase16.h | 2 ++ 11 files changed, 73 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f87262ea9935f5bc62d1…

1 0

Alexandre Julliard : krnl386: Move the 16-bit stack out of the WOW32Reserved field.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: b636f9816f898ddd368d6366fd822a1a4b17e515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b636f9816f898ddd368d6366… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 13:25:06 2020 +0100 krnl386: Move the 16-bit stack out of the WOW32Reserved field. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 6 +++--- dlls/krnl386.exe16/kernel16_private.h | 1 + dlls/krnl386.exe16/thunk.c | 4 ++-- dlls/krnl386.exe16/wowthunk.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/toolhelp.dll16/toolhelp.c | 4 ++-- include/wine/winbase16.h | 6 +++--- tools/winebuild/relay.c | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 864b7f76643..45b3bd95df6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -213,16 +213,16 @@ static BOOL i386_stack_walk(struct cpu_stack_walk *csw, STACKFRAME64 *frame, /* Init done */ set_curr_mode((frame->AddrPC.Mode == AddrModeFlat) ? stm_32bit : stm_16bit); - /* cur_switch holds address of WOW32Reserved field in TEB in debuggee + /* cur_switch holds address of SystemReserved1[0] field in TEB in debuggee * address space */ if (NtQueryInformationThread(csw->hThread, ThreadBasicInformation, &info, sizeof(info), NULL) == STATUS_SUCCESS) { - curr_switch = (DWORD_PTR)info.TebBaseAddress + FIELD_OFFSET(TEB, WOW32Reserved); + curr_switch = (DWORD_PTR)info.TebBaseAddress + FIELD_OFFSET(TEB, SystemReserved1); if (!sw_read_mem(csw, curr_switch, &p, sizeof(p))) { - WARN("Can't read TEB:WOW32Reserved\n"); + WARN("Can't read TEB:SystemReserved1\n"); goto done_err; } next_switch = p; diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 8c93b1dc0a2..279058ac68f 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -298,6 +298,7 @@ struct tagSYSLEVEL; struct kernel_thread_data { + SEGPTR stack; /* 16-bit stack pointer */ WORD stack_sel; /* 16-bit stack selector */ WORD htask16; /* Win16 task handle */ DWORD sys_count[4]; /* syslevel mutex entry counters */ diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index ad2c52fab46..98dbf31a770 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -1229,7 +1229,7 @@ void WINAPI __regs_K32Thk1632Prolog( CONTEXT *context ) DWORD argSize = context->Ebp - context->Esp; char *stack16 = (char *)context->Esp - 4; STACK16FRAME *frame16 = (STACK16FRAME *)stack16 - 1; - STACK32FRAME *frame32 = NtCurrentTeb()->WOW32Reserved; + STACK32FRAME *frame32 = (STACK32FRAME *)kernel_get_thread_data()->stack; char *stack32 = (char *)frame32 - argSize; WORD stackSel = SELECTOROF(frame32->frame16); DWORD stackBase = GetSelectorBase(stackSel); @@ -1282,7 +1282,7 @@ void WINAPI __regs_K32Thk1632Epilog( CONTEXT *context ) TRACE("before SYSTHUNK hack: EBP: %08x ESP: %08x cur_stack: %04x:%04x\n", context->Ebp, context->Esp, CURRENT_SS, CURRENT_SP); - NtCurrentTeb()->WOW32Reserved = frame16->frame32; + kernel_get_thread_data()->stack = (SEGPTR)frame16->frame32; context->Esp = (DWORD)stack16 + nArgsPopped; context->Ebp = frame16->ebp; diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 2b4deb34e99..73d1565c573 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -127,7 +127,7 @@ static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RE { /* unwinding: restore the stack pointer in the TEB, and leave the Win16 mutex */ STACK32FRAME *frame32 = CONTAINING_RECORD(frame, STACK32FRAME, frame); - NtCurrentTeb()->WOW32Reserved = (void *)frame32->frame16; + kernel_get_thread_data()->stack = frame32->frame16; _LeaveWin16Lock(); } else if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION || diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 58b79940773..eb4a6653f5e 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -630,7 +630,7 @@ static inline void *init_handler( const ucontext_t *sigcontext ) * SS is still non-system segment. This is why both CS and SS * are checked. */ - return teb->WOW32Reserved; + return teb->SystemReserved1[0]; } return (void *)(ESP_sig(sigcontext) & ~3); } diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 5d7bf8f016e..57a95fb8d8f 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -491,8 +491,8 @@ BOOL16 WINAPI TaskNext16( TASKENTRY *lpte ) lpte->hTaskParent = pTask->hParent; lpte->hInst = pTask->hInstance; lpte->hModule = pTask->hModule; - lpte->wSS = SELECTOROF( pTask->teb->WOW32Reserved ); - lpte->wSP = OFFSETOF( pTask->teb->WOW32Reserved ); + lpte->wSS = SELECTOROF( pTask->teb->SystemReserved1[0] ); + lpte->wSP = OFFSETOF( pTask->teb->SystemReserved1[0] ); lpte->wStackTop = pInstData->stacktop; lpte->wStackMinimum = pInstData->stackmin; lpte->wStackBottom = pInstData->stackbottom; diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index a3ff69b264d..71493395f3a 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -562,9 +562,9 @@ BOOL16 WINAPI WritePrivateProfileSection16(LPCSTR,LPCSTR,LPCSTR); BOOL16 WINAPI WritePrivateProfileStruct16(LPCSTR,LPCSTR,LPVOID,UINT16,LPCSTR); BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); -#define CURRENT_STACK16 ((STACK16FRAME *)MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved)) +#define CURRENT_STACK16 ((STACK16FRAME *)MapSL((SEGPTR)NtCurrentTeb()->SystemReserved1[0])) #define CURRENT_DS (CURRENT_STACK16->ds) -#define CURRENT_SP (((WORD *)&NtCurrentTeb()->WOW32Reserved)[0]) -#define CURRENT_SS (((WORD *)&NtCurrentTeb()->WOW32Reserved)[1]) +#define CURRENT_SP (((WORD *)NtCurrentTeb()->SystemReserved1)[0]) +#define CURRENT_SS (((WORD *)NtCurrentTeb()->SystemReserved1)[1]) #endif /* __WINE_WINE_WINBASE16_H */ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 29d0a74c833..dc0960761a5 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -31,7 +31,7 @@ #include "build.h" /* offset of the stack pointer relative to %fs:(0) */ -#define STACKOFFSET 0xc0 /* FIELD_OFFSET(TEB,WOW32Reserved) */ +#define STACKOFFSET 0x10c /* FIELD_OFFSET(TEB,SystemReserved1) */ /* fix this if the x86_thread_data structure is changed */ #define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */

1 0

Alexandre Julliard : ntdll: Store the syscall dispatcher also in the WOW32Reserved TEB field.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: baec5f1eca35450e13f24b65605c9783e5dca1d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baec5f1eca35450e13f24b65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 13:33:52 2020 +0100 ntdll: Store the syscall dispatcher also in the WOW32Reserved TEB field. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index eaaf7242883..785583a340a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2542,6 +2542,7 @@ static void init_teb( TEB *teb, PEB *peb ) PtrToUlong( &teb64->ActivationContextStack.FrameListCache ); teb64->StaticUnicodeString.Buffer = PtrToUlong( teb64->StaticUnicodeBuffer ); teb64->StaticUnicodeString.MaximumLength = sizeof( teb64->StaticUnicodeBuffer ); + teb->WOW32Reserved = __wine_syscall_dispatcher; #endif teb->Peb = peb; teb->Tib.Self = &teb->Tib;

1 0

Alexandre Julliard : include: Force aligning stack pointer also for Mingw builds.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 5a0c9270b1225da86782bffd9eb798a39723d70f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0c9270b1225da86782bffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 16:01:49 2020 +0100 include: Force aligning stack pointer also for Mingw builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50189 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 22 +++++++--------------- include/windef.h | 22 +++++++--------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 587dcce2a54..eee028c2028 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -61,7 +61,8 @@ #define __has_attribute(x) 0 #endif -#if !defined(_MSC_VER) && !defined(__stdcall) +#ifndef _MSC_VER +# undef __stdcall # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -87,27 +88,18 @@ # endif /* __i386__ */ #endif /* __stdcall */ -#if !defined(_MSC_VER) && !defined(__cdecl) +#ifndef _MSC_VER +# undef __cdecl # if defined(__i386__) && defined(__GNUC__) -# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__)) # endif -# elif defined(__x86_64__) && defined (__GNUC__) -# if __has_attribute(__force_align_arg_pointer__) -# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) -# else -# define __cdecl __attribute__((ms_abi)) -# endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) -# define __cdecl __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) # else -# define __cdecl +# define __cdecl __stdcall # endif -#endif /* __cdecl */ +#endif #ifndef __ms_va_list # if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) diff --git a/include/windef.h b/include/windef.h index db5c60641d4..b8e5ed692b1 100644 --- a/include/windef.h +++ b/include/windef.h @@ -54,7 +54,8 @@ extern "C" { # endif #endif -#if !defined(_MSC_VER) && !defined(__stdcall) +#ifndef _MSC_VER +# undef __stdcall # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -80,27 +81,18 @@ extern "C" { # endif /* __i386__ */ #endif /* __stdcall */ -#if !defined(_MSC_VER) && !defined(__cdecl) +#ifndef _MSC_VER +# undef __cdecl # if defined(__i386__) && defined(__GNUC__) -# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__)) # endif -# elif defined(__x86_64__) && defined (__GNUC__) -# if __has_attribute(__force_align_arg_pointer__) -# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) -# else -# define __cdecl __attribute__((ms_abi)) -# endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) -# define __cdecl __attribute__((pcs("aapcs-vfp"))) -# elif defined(__aarch64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) # else -# define __cdecl +# define __cdecl __stdcall # endif -#endif /* __cdecl */ +#endif #if !defined(_MSC_VER) && !defined(__fastcall) # define __fastcall __stdcall

1 0

Rémi Bernon : gdi32/tests: Add locale-dependent face matching test.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: c57a53147f4c86ec37e1abc05ff171114a224771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57a53147f4c86ec37e1abc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 23 13:20:49 2020 +0100 gdi32/tests: Add locale-dependent face matching test. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 19 ++++++++++++++----- dlls/gdi32/tests/wine_langnames3.sfd | 4 ++-- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2048 -> 2076 bytes 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 94910ff60fc..2988ab45ea7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7269,12 +7269,21 @@ static void test_lang_names(void) /* either because it's the primary language, or because it's a secondary */ ok( efnd.total == min( 2, i + 1 ), "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - strcpy( font.lfFaceName, "Wine Lang Cond (fr)" ); - memset( &efnd, 0, sizeof(efnd) ); - EnumFontFamiliesExA( dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0 ); + wcscpy( font_w.lfFaceName, L"Wine Police d'\xe9" "criture (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); /* as wine_langnames3.sfd does not specify (en) name, (fr) is preferred */ - if (i == 2) ok( efnd.total == 1, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - else ok( efnd.total == 0, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); + if (i == 2) ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + else ok( efnd_w.total == 0, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + + /* case matching should not depend on the current locale */ + if (i == 2) + { + wcscpy( font_w.lfFaceName, L"Wine POLICE D'\xc9" "CRITURE (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); + todo_wine ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + } strcpy( font.lfFaceName, "Wine Lang Cond (ko)" ); memset( &efnd, 0, sizeof(efnd) ); diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index ea0dbff57d9..55536fa58c1 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -39,8 +39,8 @@ MarkAttachClasses: 1 DEI: 91125 LangName: 1036 \ "" \ - "Wine Lang Cond (fr)" \ - "Reg (fr)" \ + "Wine Police d'+AOkA-criture (fr)" \ + "R+AOkA-guli+AOgA-re (fr)" \ "" \ "Wine Lang Cond Reg (fr)" LangName: 1042 \ diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index dd76bd478bb..408d127fb1e 100644 Binary files a/dlls/gdi32/tests/wine_langnames3.ttf and b/dlls/gdi32/tests/wine_langnames3.ttf differ

1 0

Rémi Bernon : gdi32: Compare font face names using RtlDowncaseUnicodeChar.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: c06cacff1127b3903f982389b97e7a7ffa82fb17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06cacff1127b3903f982389… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 23 13:20:50 2020 +0100 gdi32: Compare font face names using RtlDowncaseUnicodeChar. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 68 +++++++++++++++++++++++++++++++------------------ dlls/gdi32/tests/font.c | 2 +- 2 files changed, 44 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c06cacff1127b3903f98…

1 0

Piotr Caban : msvcrt: Reimplement _configthreadlocale function.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: a9dfe7aba20ab30743c838e378e2bfe02bb99a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9dfe7aba20ab30743c838e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:37 2020 +0100 msvcrt: Reimplement _configthreadlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3925678a9fd..2502e556ee2 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2128,40 +2128,17 @@ int CDECL _configthreadlocale(int type) thread_data_t *data = msvcrt_get_thread_data(); int ret; - if(!data) - return -1; - ret = (data->locale_flags & LOCALE_THREAD ? MSVCRT__ENABLE_PER_THREAD_LOCALE : MSVCRT__DISABLE_PER_THREAD_LOCALE); - if(ret == type) - return ret; - - if(data->locale_flags & LOCALE_FREE) - { - free_locinfo(data->locinfo); - free_mbcinfo(data->mbcinfo); - data->locale_flags &= ~LOCALE_FREE; - } - - if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) { - MSVCRT__locale_tstruct locale; - get_current_locale_noalloc(&locale); - data->locinfo = locale.locinfo; - data->mbcinfo = locale.mbcinfo; - data->locale_flags = LOCALE_FREE | LOCALE_THREAD; - return ret; - } + if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) + data->locale_flags |= LOCALE_THREAD; + else if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) + data->locale_flags &= ~LOCALE_THREAD; + else if(type) + ret = -1; - if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) { - data->locale_flags = 0; - return ret; - } - - if(!type) - return ret; - - return -1; + return ret; } #endif

1 0

Piotr Caban : msvcrt: Make old locale access thread-safe in setlocale.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: a7f124eb5e57d8be36daa3e87edb66a9b6843e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f124eb5e57d8be36daa3e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:41 2020 +0100 msvcrt: Make old locale access thread-safe in setlocale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 2502e556ee2..6d891c3a8e0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -601,15 +601,6 @@ void CDECL _unlock_locales(void) _unlock(_SETLOCALE_LOCK); } -static MSVCRT_pthreadlocinfo* CDECL get_locinfo_ptr(void) { - thread_data_t *data = msvcrt_get_thread_data(); - - if(!data || !(data->locale_flags & LOCALE_THREAD)) - return &MSVCRT_locale->locinfo; - - return &data->locinfo; -} - static void CDECL grab_locinfo(MSVCRT_pthreadlocinfo locinfo) { int i; @@ -2041,8 +2032,8 @@ MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t */ char* CDECL MSVCRT_setlocale(int category, const char* locale) { - MSVCRT_pthreadlocinfo *plocinfo = get_locinfo_ptr(); - MSVCRT_pthreadlocinfo locinfo = *plocinfo, newlocinfo; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_pthreadlocinfo locinfo = get_locinfo(), newlocinfo; if(category<MSVCRT_LC_MIN || category>MSVCRT_LC_MAX) return NULL; @@ -2063,26 +2054,34 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) if(locale[0] != 'C' || locale[1] != '\0') initial_locale = FALSE; - _lock_locales(); - free_locinfo(locinfo); - *plocinfo = newlocinfo; - _unlock_locales(); - - if(newlocinfo == MSVCRT_locale->locinfo) { + if(data->locale_flags & LOCALE_THREAD) + { + if(data->locale_flags & LOCALE_FREE) + free_locinfo(data->locinfo); + data->locinfo = newlocinfo; + } + else + { int i; + _lock_locales(); + free_locinfo(MSVCRT_locale->locinfo); + MSVCRT_locale->locinfo = newlocinfo; + MSVCRT___lc_codepage = newlocinfo->lc_codepage; MSVCRT___lc_collate_cp = newlocinfo->lc_collate_cp; MSVCRT___mb_cur_max = newlocinfo->mb_cur_max; MSVCRT__pctype = newlocinfo->pctype; for(i=MSVCRT_LC_MIN; i<=MSVCRT_LC_MAX; i++) MSVCRT___lc_handle[i] = MSVCRT_locale->locinfo->lc_handle[i]; + _unlock_locales(); + update_thread_locale(data); } if(category == MSVCRT_LC_ALL) - return construct_lc_all(newlocinfo); + return construct_lc_all(data->locinfo); - return newlocinfo->lc_category[category].locale; + return data->locinfo->lc_category[category].locale; } /*********************************************************************

1 0