November 2020 - Wine-Commits

Michael Stefaniuc : mmdevapi: Use wide-char string literals.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 591f06d85e155b6a6876d46cf828637084a01183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=591f06d85e155b6a6876d46c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 23:29:16 2020 +0100 mmdevapi: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 95 +++++++++++++---------------------------- dlls/mmdevapi/main.c | 18 +++----- dlls/mmdevapi/tests/mmdevenum.c | 6 +-- dlls/mmdevapi/tests/propstore.c | 13 ++---- 4 files changed, 40 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=591f06d85e155b6a6876…

1 0

Michael Stefaniuc : msacm32: Make the registry key variables global.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 31f6332f48d5826d25317a051ac230d875d0639a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f6332f48d5826d25317a05… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 23:29:17 2020 +0100 msacm32: Make the registry key variables global. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/internal.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..cccf5014fcf 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -52,17 +52,17 @@ static PWINE_ACMNOTIFYWND MSACM_pLastACMNotifyWnd = NULL; static void MSACM_ReorderDriversByPriority(void); +static const WCHAR drvkey[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"; +static const WCHAR baseKey[] = L"Software\\Microsoft\\AudioCompressionManager\\DriverCache\\"; +static const WCHAR basePriorityKey[] = + L"Software\\Microsoft\\Multimedia\\Audio Compression Manager\\Priority v4.00"; + /*********************************************************************** * MSACM_RegisterDriverFromRegistry() */ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) { static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; WCHAR buf[2048]; DWORD bufLen, lRet; HKEY hKey; @@ -181,9 +181,6 @@ errCleanUp: */ static LPWSTR MSACM_GetRegistryKey(const WINE_ACMDRIVERID* padid) { - static const WCHAR baseKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'A','u','d','i','o','C','o','m','p','r','e','s','s','i','o','n','M','a','n','a','g','e','r','\\', - 'D','r','i','v','e','r','C','a','c','h','e','\\','\0'}; LPWSTR ret; int len; @@ -354,11 +351,6 @@ void MSACM_RegisterAllDrivers(void) static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; DWORD i, cnt, bufLen, lRet, type; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; @@ -565,13 +557,6 @@ static void MSACM_ReorderDriversByPriority(void) if (iNumDrivers > 1) { LONG lError; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; unsigned int i; LONG lBufferLength; WCHAR szBuffer[256]; @@ -666,13 +651,6 @@ void MSACM_WriteCurrentPriorities(void) { LONG lError; HKEY hPriorityKey; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; PWINE_ACMDRIVERID padid; DWORD dwPriorityCounter; static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'};

1 0

Alexandre Julliard : ntdll: Make x86_64 syscall thunks position independent.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 043489456c1f633f86f8dd1fde6b32c48c90c6f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=043489456c1f633f86f8dd1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 20:19:43 2020 +0100 ntdll: Make x86_64 syscall thunks position independent. Based on a patch by Paul Gofman. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 111 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 6 +++ tools/winebuild/import.c | 4 +- 3 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 9c2cf824018..546a7d83bbd 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -643,6 +643,116 @@ static void test_user_shared_data(void) } } +static void perform_relocations( void *module, INT_PTR delta ) +{ + IMAGE_NT_HEADERS *nt; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + if (!relocs->VirtualAddress || !relocs->Size) return; + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = (char *)module + sec[i].VirtualAddress; + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + rel = (IMAGE_BASE_RELOCATION *)((char *)module + relocs->VirtualAddress); + end = (IMAGE_BASE_RELOCATION *)((char *)rel + relocs->Size); + while (rel && rel < end - 1 && rel->SizeOfBlock) + rel = LdrProcessRelocationBlock( (char *)module + rel->VirtualAddress, + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = (char *)module + sec[i].VirtualAddress; + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } +} + + +static void test_syscalls(void) +{ + HMODULE module = GetModuleHandleW( L"ntdll.dll" ); + HANDLE handle; + NTSTATUS status; + NTSTATUS (WINAPI *pNtClose)(HANDLE); + WCHAR path[MAX_PATH]; + HANDLE file, mapping; + INT_PTR delta; + void *ptr; + + /* initial image */ + pNtClose = (void *)GetProcAddress( module, "NtClose" ); + handle = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( handle != 0, "CreateEventWfailed %u\n", GetLastError() ); + status = pNtClose( handle ); + ok( !status, "NtClose failed %x\n", status ); + status = pNtClose( handle ); + ok( status == STATUS_INVALID_HANDLE, "NtClose failed %x\n", status ); + + /* syscall thunk copy */ + ptr = VirtualAlloc( NULL, 0x1000, MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + ok( ptr != NULL, "VirtualAlloc failed\n" ); + memcpy( ptr, pNtClose, 32 ); + pNtClose = ptr; + handle = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( handle != 0, "CreateEventWfailed %u\n", GetLastError() ); + status = pNtClose( handle ); + ok( !status, "NtClose failed %x\n", status ); + status = pNtClose( handle ); + ok( status == STATUS_INVALID_HANDLE, "NtClose failed %x\n", status ); + VirtualFree( ptr, 0, MEM_FREE ); + + /* new mapping */ + GetModuleFileNameW( module, path, MAX_PATH ); + file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "can't open %s: %u\n", wine_dbgstr_w(path), GetLastError() ); + mapping = CreateFileMappingW( file, NULL, SEC_IMAGE | PAGE_READONLY, 0, 0, NULL ); + ok( mapping != NULL, "CreateFileMappingW failed err %u\n", GetLastError() ); + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + ok( ptr != NULL, "MapViewOfFile failed err %u\n", GetLastError() ); + CloseHandle( mapping ); + CloseHandle( file ); + delta = (char *)ptr - (char *)module; + + if (memcmp( ptr, module, 0x1000 )) + { + skip( "modules are not identical (non-PE build?)\n" ); + UnmapViewOfFile( ptr ); + return; + } + perform_relocations( ptr, delta ); + pNtClose = (void *)GetProcAddress( module, "NtClose" ); + if (!memcmp( pNtClose, (char *)pNtClose + delta, 32 )) + { + pNtClose = (void *)((char *)pNtClose + delta); + handle = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( handle != 0, "CreateEventWfailed %u\n", GetLastError() ); + status = pNtClose( handle ); + ok( !status, "NtClose failed %x\n", status ); + status = pNtClose( handle ); + ok( status == STATUS_INVALID_HANDLE, "NtClose failed %x\n", status ); + } + else + { +#ifdef __x86_64__ + ok( 0, "syscall thunk relocated\n" ); +#else + skip( "syscall thunk relocated\n" ); +#endif + } + UnmapViewOfFile( ptr ); +} + START_TEST(virtual) { HMODULE mod; @@ -678,4 +788,5 @@ START_TEST(virtual) test_RtlCreateUserStack(); test_NtMapViewOfSection(); test_user_shared_data(); + test_syscalls(); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 853eb0469b9..eaaf7242883 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2582,6 +2582,12 @@ TEB *virtual_alloc_first_teb(void) exit(1); } +#ifdef __x86_64__ /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ + ptr = (char *)user_shared_data + page_size; + anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); + *(void **)ptr = __wine_syscall_dispatcher; +#endif + NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 62d9844e367..53d4fb2869b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1727,8 +1727,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\t.byte 0xc3\n" ); /* ret */ if (target_platform == PLATFORM_WINDOWS) { - output( "1:\t.byte 0xff,0x14,0x25\n" ); /* 1: callq *(__wine_syscall_dispatcher) */ - output( "\t.long __wine_syscall_dispatcher\n" ); + output( "1:\t.byte 0xff,0x14,0x25\n" ); /* 1: callq *(0x7ffe1000) */ + output( "\t.long 0x7ffe1000\n" ); } else {

1 0

Alexandre Julliard : include: Only define _strnicmp() prototype when needed.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 70102669a8e3cd0311f87e4cbf4f87d45cda37a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70102669a8e3cd0311f87e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 21:40:30 2020 +0100 include: Only define _strnicmp() prototype when needed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index a5c4837837f..a7b0e04aade 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3674,7 +3674,9 @@ NTSYSAPI ULONG64 WINAPI RtlGetExtendedFeaturesMask(CONTEXT_EX*); NTSYSAPI void WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64); #endif +#ifndef __WINE_USE_MSVCRT NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); +#endif /* 32-bit only functions */

1 0

Francois Gouget : user32/tests: Fix the spelling of a win_skip() message.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 9468e7617c91c86e352ec2b16abfa04b94ca2e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9468e7617c91c86e352ec2b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:08 2020 +0100 user32/tests: Fix the spelling of a win_skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ce272ed73f4..1249f8cf5a1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1771,7 +1771,7 @@ static void test_GetMouseMovePointsEx_process(void) if (winstation1 == NULL && GetLastError() == ERROR_ACCESS_DENIED) { - win_skip("not enough priviledges for CreateWindowStation\n"); + win_skip("not enough privileges for CreateWindowStation\n"); CloseDesktop( desk0 ); CloseWindowStation( winstation0 ); return;

1 0

Francois Gouget : ws2_32: Fix the spelling of a comment.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: b344ccd85759f09e5dca739c0872590b4069c629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b344ccd85759f09e5dca739c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:42:54 2020 +0100 ws2_32: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7d810c6d7b2..6cb35bcd135 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7646,7 +7646,7 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size * First set the pointer for aliases, second set the pointers for addresses. * Third fill the addresses indexes, fourth jump aliases names size. * Fifth fill the hostname. - * NOTE: This method is valid for OS version's >= XP. + * NOTE: This method is valid for OS versions >= XP. */ p = (char *)(p_to + 1); p_to->h_aliases = (char **)p;

1 0

Francois Gouget : gdi32/tests: Fix the spelling of an ok() message.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: c4310f694398f14788f16b3ffda1b60683b4dfaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4310f694398f14788f16b3f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:25 2020 +0100 gdi32/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d3ec971dce0..94910ff60fc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5862,7 +5862,7 @@ static void test_GetGlyphOutline_character(void) ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for glyph index 0x3\n"); ret = GetGlyphOutlineW(hdc, 0xFFFF, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); - ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeded\n"); + ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeeded\n"); ret = GetGlyphOutlineW(hdc, 0x10003, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineW for index 0x10003 has failed\n");

1 0

Piotr Caban : msvcrt: Introduce flags field to describe locale stored in thread data.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 4fc2b7293378be93275e316c3940e7d21b5bda09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc2b7293378be93275e316c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:26 2020 +0100 msvcrt: Introduce flags field to describe locale stored in thread data. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 4 ++-- dlls/msvcrt/locale.c | 44 ++++++++++++++++++++------------------------ dlls/msvcrt/main.c | 2 +- dlls/msvcrt/msvcrt.h | 5 ++++- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 08eb4a7ac64..deca9be47fe 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1213,8 +1213,8 @@ static void test_getptd(void) todo_wine ok(ptd->have_locale == 1, "ptd->have_locale = %x\n", ptd->have_locale); p_configthreadlocale(1); todo_wine ok(mbcinfo == ptd->mbcinfo, "ptd->mbcinfo != mbcinfo\n"); - todo_wine ok(locinfo == ptd->locinfo, "ptd->locinfo != locinfo\n"); - todo_wine ok(ptd->have_locale == 3, "ptd->have_locale = %x\n", ptd->have_locale); + ok(locinfo == ptd->locinfo, "ptd->locinfo != locinfo\n"); + ok(ptd->have_locale == 3, "ptd->have_locale = %x\n", ptd->have_locale); ok(p_get_terminate() == ptd->terminate_handler, "ptd->terminate_handler != _get_terminate()\n"); ok(p_get_unexpected() == ptd->unexpected_handler, "ptd->unexpected_handler != _get_unexpected()\n"); } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 0c4211dc197..2a66867928c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -588,7 +588,7 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, static MSVCRT_pthreadlocinfo* CDECL get_locinfo_ptr(void) { thread_data_t *data = msvcrt_get_thread_data(); - if(!data || !data->have_locale) + if(!data || !(data->locale_flags & LOCALE_THREAD)) return &MSVCRT_locale->locinfo; return &data->locinfo; @@ -602,7 +602,7 @@ MSVCRT_pthreadlocinfo CDECL get_locinfo(void) { MSVCRT_pthreadmbcinfo* CDECL get_mbcinfo_ptr(void) { thread_data_t *data = msvcrt_get_thread_data(); - if(!data || !data->have_locale) + if(!data || !(data->locale_flags & LOCALE_THREAD)) return &MSVCRT_locale->mbcinfo; return &data->mbcinfo; @@ -1142,7 +1142,7 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) thread_data_t *data = msvcrt_get_thread_data(); int i; - if(!data || !data->have_locale) + if(!data || !(data->locale_flags & LOCALE_THREAD)) { _lock_locales(); *locale = *MSVCRT_locale; @@ -2101,39 +2101,35 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlo int CDECL _configthreadlocale(int type) { thread_data_t *data = msvcrt_get_thread_data(); - MSVCRT__locale_t locale; int ret; if(!data) return -1; - ret = (data->have_locale ? MSVCRT__ENABLE_PER_THREAD_LOCALE : MSVCRT__DISABLE_PER_THREAD_LOCALE); + 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) { - if(!data->have_locale) { - /* Copy current global locale */ - locale = MSVCRT__create_locale(MSVCRT_LC_ALL, MSVCRT_setlocale(MSVCRT_LC_ALL, NULL)); - if(!locale) - return -1; - - data->locinfo = locale->locinfo; - data->mbcinfo = locale->mbcinfo; - data->have_locale = TRUE; - MSVCRT_free(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__DISABLE_PER_THREAD_LOCALE) { - if(data->have_locale) { - free_locinfo(data->locinfo); - free_mbcinfo(data->mbcinfo); - data->locinfo = MSVCRT_locale->locinfo; - data->mbcinfo = MSVCRT_locale->mbcinfo; - data->have_locale = FALSE; - } - + data->locale_flags = 0; return ret; } diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 0c19f01b440..c47c454b367 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -75,7 +75,7 @@ static inline void msvcrt_free_tls_mem(void) MSVCRT_free(tls->time_buffer); MSVCRT_free(tls->tmpnam_buffer); MSVCRT_free(tls->wtmpnam_buffer); - if(tls->have_locale) { + if(tls->locale_flags & LOCALE_FREE) { free_locinfo(tls->locinfo); free_mbcinfo(tls->mbcinfo); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a815285409e..5881ecc5d04 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -209,6 +209,9 @@ void CDECL __DestructExceptionObject(EXCEPTION_RECORD*); /* TLS data */ extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN; +#define LOCALE_FREE 0x1 +#define LOCALE_THREAD 0x2 + /* Keep in sync with msvcr90/tests/msvcr90.c */ struct __thread_data { DWORD tid; @@ -235,7 +238,7 @@ struct __thread_data { int fpecode; MSVCRT_pthreadmbcinfo mbcinfo; MSVCRT_pthreadlocinfo locinfo; - BOOL have_locale; + int locale_flags; int unk5[1]; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler;

1 0

Piotr Caban : msvcrt: Return thread locale copy in get_locinfo and get_mbcinfo.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: bcd0096d09e0cb0a6a2fb2ec9ffe3f4c72ec341a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd0096d09e0cb0a6a2fb2ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:34 2020 +0100 msvcrt: Return thread locale copy in get_locinfo and get_mbcinfo. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 4 +- dlls/msvcrt/locale.c | 107 +++++++++++++++++++++++++++---------------- 2 files changed, 70 insertions(+), 41 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index deca9be47fe..35967b2831c 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1210,9 +1210,9 @@ static void test_getptd(void) ok(p_fpecode() == &ptd->fpecode, "ptd->fpecode is incorrect\n"); mbcinfo = ptd->mbcinfo; locinfo = ptd->locinfo; - todo_wine ok(ptd->have_locale == 1, "ptd->have_locale = %x\n", ptd->have_locale); + ok(ptd->have_locale == 1, "ptd->have_locale = %x\n", ptd->have_locale); p_configthreadlocale(1); - todo_wine ok(mbcinfo == ptd->mbcinfo, "ptd->mbcinfo != mbcinfo\n"); + ok(mbcinfo == ptd->mbcinfo, "ptd->mbcinfo != mbcinfo\n"); ok(locinfo == ptd->locinfo, "ptd->locinfo != locinfo\n"); ok(ptd->have_locale == 3, "ptd->have_locale = %x\n", ptd->have_locale); ok(p_get_terminate() == ptd->terminate_handler, "ptd->terminate_handler != _get_terminate()\n"); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 82a499c5637..3925678a9fd 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -585,6 +585,22 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp, return TRUE; } +/********************************************************************* + * _lock_locales (UCRTBASE.@) + */ +void CDECL _lock_locales(void) +{ + _lock(_SETLOCALE_LOCK); +} + +/********************************************************************* + * _unlock_locales (UCRTBASE.@) + */ +void CDECL _unlock_locales(void) +{ + _unlock(_SETLOCALE_LOCK); +} + static MSVCRT_pthreadlocinfo* CDECL get_locinfo_ptr(void) { thread_data_t *data = msvcrt_get_thread_data(); @@ -594,18 +610,64 @@ static MSVCRT_pthreadlocinfo* CDECL get_locinfo_ptr(void) { return &data->locinfo; } +static void CDECL grab_locinfo(MSVCRT_pthreadlocinfo locinfo) +{ + int i; + + InterlockedIncrement(&locinfo->refcount); + for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) + { + InterlockedIncrement(locinfo->lc_category[i].refcount); + if(locinfo->lc_category[i].wrefcount) + InterlockedIncrement(locinfo->lc_category[i].wrefcount); + } + if(locinfo->lconv_intl_refcount) + InterlockedIncrement(locinfo->lconv_intl_refcount); + if(locinfo->lconv_num_refcount) + InterlockedIncrement(locinfo->lconv_num_refcount); + if(locinfo->lconv_mon_refcount) + InterlockedIncrement(locinfo->lconv_mon_refcount); + if(locinfo->ctype1_refcount) + InterlockedIncrement(locinfo->ctype1_refcount); + InterlockedIncrement(&locinfo->lc_time_curr->refcount); +} + +static void CDECL update_thread_locale(thread_data_t *data) +{ + if((data->locale_flags & LOCALE_FREE) && ((data->locale_flags & LOCALE_THREAD) || + (data->locinfo == MSVCRT_locale->locinfo && data->mbcinfo == MSVCRT_locale->mbcinfo))) + return; + + if(data->locale_flags & LOCALE_FREE) + { + free_locinfo(data->locinfo); + free_mbcinfo(data->mbcinfo); + } + + _lock_locales(); + data->locinfo = MSVCRT_locale->locinfo; + grab_locinfo(data->locinfo); + _unlock_locales(); + + _lock(_MB_CP_LOCK); + data->mbcinfo = MSVCRT_locale->mbcinfo; + InterlockedIncrement(&data->mbcinfo->refcount); + _unlock(_MB_CP_LOCK); + + data->locale_flags |= LOCALE_FREE; +} + /* INTERNAL: returns threadlocinfo struct */ MSVCRT_pthreadlocinfo CDECL get_locinfo(void) { - return *get_locinfo_ptr(); + thread_data_t *data = msvcrt_get_thread_data(); + update_thread_locale(data); + return data->locinfo; } /* INTERNAL: returns pthreadmbcinfo struct */ MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); - - if(!data || !(data->locale_flags & LOCALE_THREAD)) - return MSVCRT_locale->mbcinfo; - + update_thread_locale(data); return data->mbcinfo; } @@ -1117,26 +1179,9 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) MSVCRT_free(mbcinfo); } -/********************************************************************* - * _lock_locales (UCRTBASE.@) - */ -void CDECL _lock_locales(void) -{ - _lock(_SETLOCALE_LOCK); -} - -/********************************************************************* - * _unlock_locales (UCRTBASE.@) - */ -void CDECL _unlock_locales(void) -{ - _unlock(_SETLOCALE_LOCK); -} - MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) { thread_data_t *data = msvcrt_get_thread_data(); - int i; if(!data || !(data->locale_flags & LOCALE_THREAD)) { @@ -1149,25 +1194,9 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) locale->mbcinfo = data->mbcinfo; } - InterlockedIncrement(&locale->locinfo->refcount); - for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) - { - InterlockedIncrement(locale->locinfo->lc_category[i].refcount); - if(locale->locinfo->lc_category[i].wrefcount) - InterlockedIncrement(locale->locinfo->lc_category[i].wrefcount); - } - if(locale->locinfo->lconv_intl_refcount) - InterlockedIncrement(locale->locinfo->lconv_intl_refcount); - if(locale->locinfo->lconv_num_refcount) - InterlockedIncrement(locale->locinfo->lconv_num_refcount); - if(locale->locinfo->lconv_mon_refcount) - InterlockedIncrement(locale->locinfo->lconv_mon_refcount); - if(locale->locinfo->ctype1_refcount) - InterlockedIncrement(locale->locinfo->ctype1_refcount); - InterlockedIncrement(&locale->locinfo->lc_time_curr->refcount); + grab_locinfo(locale->locinfo); if(locale->locinfo == MSVCRT_locale->locinfo) _unlock_locales(); - InterlockedIncrement(&locale->mbcinfo->refcount); return locale; }

1 0

Piotr Caban : msvcrt: Lock _MB_CP_LOCK lock in setmbcp.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: d5b2c3f233d2a7263f3b79133ce6216fa991c1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5b2c3f233d2a7263f3b7913… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:30 2020 +0100 msvcrt: Lock _MB_CP_LOCK lock in setmbcp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 12 ++++-------- dlls/msvcrt/mbcs.c | 28 ++++++++++++++++++---------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 2a66867928c..82a499c5637 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -599,18 +599,14 @@ MSVCRT_pthreadlocinfo CDECL get_locinfo(void) { return *get_locinfo_ptr(); } -MSVCRT_pthreadmbcinfo* CDECL get_mbcinfo_ptr(void) { +/* INTERNAL: returns pthreadmbcinfo struct */ +MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); if(!data || !(data->locale_flags & LOCALE_THREAD)) - return &MSVCRT_locale->mbcinfo; - - return &data->mbcinfo; -} + return MSVCRT_locale->mbcinfo; -/* INTERNAL: returns pthreadmbcinfo struct */ -MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { - return *get_mbcinfo_ptr(); + return data->mbcinfo; } /* INTERNAL: constructs string returned by setlocale */ diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a920dcea5f1..d4434209a43 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -28,6 +28,7 @@ #include <mbctype.h> #include "msvcrt.h" +#include "mtdll.h" #include "winnls.h" #include "wine/debug.h" @@ -209,9 +210,6 @@ int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) } #endif -/********************************************************************* - * INTERNAL: _setmbcp_l - */ MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *old_mbcinfo) { MSVCRT_threadmbcinfo *mbcinfo; @@ -386,20 +384,30 @@ MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *ol */ int CDECL _setmbcp(int cp) { - MSVCRT_threadmbcinfo **old_mbcinfo = get_mbcinfo_ptr(); + thread_data_t *data = msvcrt_get_thread_data(); MSVCRT_threadmbcinfo *mbcinfo; - mbcinfo = create_mbcinfo(cp, -1, *old_mbcinfo); - if(!mbcinfo) { + mbcinfo = create_mbcinfo(cp, -1, get_mbcinfo()); + if(!mbcinfo) + { *MSVCRT__errno() = MSVCRT_EINVAL; return -1; } - free_mbcinfo(*old_mbcinfo); - *old_mbcinfo = mbcinfo; - - if(mbcinfo == MSVCRT_locale->mbcinfo) + if(data->locale_flags & LOCALE_THREAD) + { + if(data->locale_flags & LOCALE_FREE) + free_mbcinfo(data->mbcinfo); + data->mbcinfo = mbcinfo; + } + else + { + _lock(_MB_CP_LOCK); + free_mbcinfo(MSVCRT_locale->mbcinfo); + MSVCRT_locale->mbcinfo = mbcinfo; memcpy(MSVCRT_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(MSVCRT_mbctype)); + _unlock(_MB_CP_LOCK); + } return 0; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5881ecc5d04..52aafcff869 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1008,7 +1008,6 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) DECLS void CDECL free_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; MSVCRT_pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; -MSVCRT_pthreadmbcinfo* CDECL get_mbcinfo_ptr(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); MSVCRT_threadmbcinfo* create_mbcinfo(int, LCID, MSVCRT_threadmbcinfo*) DECLSPEC_HIDDEN; void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN;

1 0