November 2020 - Wine-commits

Francois Gouget : dssenh/tests: Fix the spelling of a skip() message.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: ce03715db3bcabeb597e2a9a92cccb921d0a91f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce03715db3bcabeb597e2a9a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:13 2020 +0100 dssenh/tests: Fix the spelling of a skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index e9c62cb99de..4d33fc86cd8 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -702,7 +702,7 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); if (!result) { - skip("skipping ciper modes tests\n"); + skip("skipping cipher mode tests\n"); return; } ok(result, "Expected a derived key.\n");

1 0

Francois Gouget : qmgr/tests: Fix the spelling of an ok() message.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: ed2b42727f5c53b1c44eb8c7805c5e44b23c2f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed2b42727f5c53b1c44eb8c7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:18 2020 +0100 qmgr/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/qmgr/tests/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 71da89facad..edf1ef7e592 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -888,7 +888,7 @@ START_TEST(job) */ hres = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(hres)) { - ok(0, "CoInitializeEx faied: %0x\n", hres); + ok(0, "CoInitializeEx failed: %0x\n", hres); return; }

1 0

Francois Gouget : ole32/tests: Add a trailing linefeed to an ok() message.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: d529e13c5b1553ceee12e90b1a97ea8bb8e205e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d529e13c5b1553ceee12e90b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:40:33 2020 +0100 ole32/tests: Add a trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5d44cd5a0ba..2e5006463da 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2775,7 +2775,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); hr = CoWaitForMultipleHandles(0, 200, 1, &thread, &index); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish"); + ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish\n"); CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL);

1 0

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

25 Nov '20

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 25 Nov '20

25 Nov '20

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

Francois Gouget : dxgi/tests: Fix the grammar in a comment.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: e76c522ad9f4f03c0439cd4984f15a20d424c36a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76c522ad9f4f03c0439cd49… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:38 2020 +0100 dxgi/tests: Fix the grammar in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e6c8e0eb8c4..3c3a57806a4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4534,7 +4534,7 @@ static void test_swapchain_parameters(void) * the draw on the screen right away (Aero on or off doesn't matter), but * Present with DXGI_PRESENT_DO_NOT_SEQUENCE will show the modifications. * - * Note that if the application doesn't have focused creating a fullscreen + * Note that if the application doesn't have focus creating a fullscreen * swapchain returns DXGI_STATUS_OCCLUDED and we get a windowed swapchain, * so use the Windowed property of the swapchain that was actually created. */ expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_READ_ONLY;

1 0

Piotr Caban : msvcrt: Fix C locale lc_time_curr refconting.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 6e70b04c68183b4b08b7bbb60abacf9ca9fa3819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e70b04c68183b4b08b7bbb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:09 2020 +0100 msvcrt: Fix C locale lc_time_curr refconting. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5971882229c..0c4211dc197 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1099,8 +1099,8 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) MSVCRT_free((void*)locinfo->pcumap); } - if(locinfo->lc_time_curr && locinfo->lc_time_curr != &cloc_time_data - && !InterlockedDecrement(&locinfo->lc_time_curr->refcount)) + if(locinfo->lc_time_curr && !InterlockedDecrement(&locinfo->lc_time_curr->refcount) + && locinfo->lc_time_curr != &cloc_time_data) MSVCRT_free(locinfo->lc_time_curr); if(InterlockedDecrement(&locinfo->refcount)) @@ -1932,8 +1932,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME])) { copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_TIME); locinfo->lc_time_curr = old_locinfo->lc_time_curr; - if(locinfo->lc_time_curr != &cloc_time_data) - InterlockedIncrement(&locinfo->lc_time_curr->refcount); + InterlockedIncrement(&locinfo->lc_time_curr->refcount); } else if(lcid[MSVCRT_LC_TIME]) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME], locinfo, MSVCRT_LC_TIME)) { @@ -1952,6 +1951,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } locinfo->lc_time_curr = &cloc_time_data; + InterlockedIncrement(&locinfo->lc_time_curr->refcount); } return locinfo;

1 0

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

25 Nov '20

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: Lock _MB_CP_LOCK lock in setmbcp.
by Alexandre Julliard 25 Nov '20

25 Nov '20

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

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

25 Nov '20

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