December 2020 - Wine-commits

Nikolay Sivov : sxs: Query context that contains the GUID in SxsLookupClrGuid().
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: c7ba8b7aa49f9938b24f55a7c3cd049c27d73aad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7ba8b7aa49f9938b24f55a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 7 10:27:56 2020 +0300 sxs: Query context that contains the GUID in SxsLookupClrGuid(). This restores pre-2cfc85dc55d403a7fcb885a62bb28f8d73498c2d logic; activation/deactivation still happens, and user context in this case is returned from FindActCtxSectionGuid(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50139 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 7150f55c33e..cd1d0f7bb56 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -135,14 +135,20 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff if (flags & SXS_LOOKUP_CLR_GUID_FIND_SURROGATE) { - if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + { flags &= ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS; + } } if (!retval && (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) { - if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + { flags &= ~SXS_LOOKUP_CLR_GUID_FIND_SURROGATE; + } } if (!retval) @@ -151,7 +157,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff goto out; } - retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, + retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); if (!retval && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { @@ -159,7 +165,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff } assembly_info = heap_alloc(bytes_assembly_info); - if (!(retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, + if (!(retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info))) { @@ -225,6 +231,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff SetLastError(0); out: + ReleaseActCtx(guid_info.hActCtx); if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) DeactivateActCtx(0, cookie);

1 0

Alexandre Julliard : gdi32: Always let the Freetype driver fixup the AA flags.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 5f701914705cf6437502f8e593971294815125b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f701914705cf6437502f8e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 7 12:46:28 2020 +0100 gdi32: Always let the Freetype driver fixup the AA flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50127 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9fa0f45ec4b..858f5ef675f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3761,9 +3761,9 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) font = select_font( &lf, dcmat, can_use_bitmap ); - if (font && !*aa_flags) + if (font) { - *aa_flags = font->aa_flags; + if (!*aa_flags) *aa_flags = font->aa_flags; if (!*aa_flags) { if (lf.lfQuality == CLEARTYPE_QUALITY || lf.lfQuality == CLEARTYPE_NATURAL_QUALITY)

1 0

Paul Gofman : ntdll/tests: Add a broken result for Win7u in test_extended_context().
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: c073b1ad407ec285843c179221f1c9d0ccb0d375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c073b1ad407ec285843c1792… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 7 14:41:45 2020 +0300 ntdll/tests: Add a broken result for Win7u in test_extended_context(). Fixes test failures on w7u testbot machines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3451a7d6465..eb03ee64bac 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7634,9 +7634,10 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(xs->Mask == (sizeof(void *) == 4 ? 4 : 0), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (sizeof(void *) == 4 ? 4 : 0) || broken(sizeof(void *) == 4 && !xs->Mask) /* Win7u */, + "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (sizeof(void *) == 4 ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), + ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); bret = ResumeThread(thread);

1 0

Paul Gofman : ntdll: Restore non-volatile registers in call_user_exception_dispatcher() on x86_64.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 183a8cf380ae2d95c8d694604e930965aae12f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=183a8cf380ae2d95c8d69460… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 7 13:39:49 2020 +0300 ntdll: Restore non-volatile registers in call_user_exception_dispatcher() on x86_64. Required to correctly restore non-volatile registers during unwind. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 58 +++++++++++++++++++++++++++++++++++------ dlls/ntdll/unix/signal_x86_64.c | 46 ++++++++++++++++++++------------ 2 files changed, 80 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=183a8cf380ae2d95c8d6…

1 0

Hans Leidekker : setupapi: Handle NULL source filename in build_filepathsW.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: fac1e40aaf0726a3e328a922cb496927548190cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac1e40aaf0726a3e328a922… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 17:53:01 2020 +0100 setupapi: Handle NULL source filename in build_filepathsW. Source filename is NULL for files to be deleted. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 7ed66c298d3..dc718cc66fc 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -152,7 +152,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) unsigned int src_len = 1, dst_len = 1; WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target; - if (op->src_file[0] != '@') + if (!op->src_file || op->src_file[0] != '@') { if (op->media) src_len += lstrlenW(op->media->root) + 1; if (op->src_path) src_len += lstrlenW(op->src_path) + 1; @@ -174,7 +174,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) paths->Target = target = HeapAlloc( GetProcessHeap(), 0, dst_len ); } if (!source || !target) return FALSE; - if (op->src_file[0] != '@') + if (!op->src_file || op->src_file[0] != '@') concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); else lstrcpyW( source, op->src_file );

1 0

Alexandre Julliard : Wine release 6.0-rc1
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: website Branch: master Commit: 3dd2b11dce22424abd2ca78d2082aff3b5ca51f5 URL: https://source.winehq.org/git/website.git/?a=commit;h=3dd2b11dce22424abd2ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:36:20 2020 +0100 Wine release 6.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020120401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020120401.xml b/news/en/2020120401.xml new file mode 100644 index 00000000..dc3ba288 --- /dev/null +++ b/news/en/2020120401.xml @@ -0,0 +1,17 @@ +<news> +<date>December 4, 2020</date> +<title>Wine 6.0-rc1 Released</title> +<body> + The Wine development release 6.0-rc1 is now available. + This is the first release candidate for the upcoming Wine 6.0. It marks the beginning of the yearly code freeze period. Please give this release a good testing to help us make 6.0 as good as possible. + <a href="{$root}/announce/6.0-rc1">What's new</a> in this release: +<ul> + <li>Gecko engine update.</li> + <li>WindowsCodecs and QCap libraries converted to PE.</li> + <li>Faster font initialization at process start.</li> + <li>Support for named pipes with empty names.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Piotr Caban : msvcrt: Remove non-needed function declarations from msvcrt.h.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 79e950bb7989809f62573e3209f2cb1bc0852d6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e950bb7989809f62573e32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:22 2020 +0100 msvcrt: Remove non-needed function declarations from msvcrt.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 1 + dlls/msvcrt/exit.c | 1 + dlls/msvcrt/mbcs.c | 3 ++- dlls/msvcrt/msvcrt.h | 48 ----------------------------------------------- dlls/msvcrt/scanf.c | 1 + include/msvcrt/mbctype.h | 1 + include/msvcrt/mbstring.h | 1 + 7 files changed, 7 insertions(+), 49 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 53b97914cda..91aaaf5ff18 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -22,6 +22,7 @@ */ #include <corecrt_io.h> +#include <mbctype.h> #include <stdarg.h> #include <stdlib.h> #include <direct.h> diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 492bcbf7b21..323d205b1bd 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -17,6 +17,7 @@ * 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 <conio.h> #include <process.h> #include <signal.h> #include <stdio.h> diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cef67e71d47..03af50d8b01 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <limits.h> #include <mbctype.h> +#include <mbstring.h> #include "msvcrt.h" #include "mtdll.h" @@ -577,7 +578,7 @@ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cu /********************************************************************* * _mbclen(MSVCRT.@) */ -unsigned int CDECL _mbclen(const unsigned char* str) +size_t CDECL _mbclen(const unsigned char* str) { return _ismbblead(*str) ? 2 : 1; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cdb35456ecb..28feb7d90df 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -296,27 +296,6 @@ extern FILE MSVCRT__iob[]; #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) -int __cdecl MSVCRT_iswdigit(wint_t); - -int __cdecl MSVCRT__fgetc_nolock(FILE*); -int __cdecl MSVCRT__fputc_nolock(int,FILE*); -int __cdecl MSVCRT__ungetc_nolock(int,FILE*); -wint_t __cdecl MSVCRT__fgetwc_nolock(FILE*); -wint_t __cdecl MSVCRT__fputwc_nolock(wint_t,FILE*); -wint_t __cdecl MSVCRT__ungetwc_nolock(wint_t, FILE*); -int __cdecl MSVCRT__fseeki64_nolock(FILE*,__int64,int); -__int64 __cdecl MSVCRT__ftelli64(FILE* file); -__int64 __cdecl MSVCRT__ftelli64_nolock(FILE*); -size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,FILE*); -int __cdecl MSVCRT__fclose_nolock(FILE*); -int __cdecl MSVCRT__fflush_nolock(FILE*); -FILE* __cdecl MSVCRT__iob_func(void); -__time32_t __cdecl MSVCRT__time32(__time32_t*); -__time64_t __cdecl MSVCRT__time64(__time64_t*); -FILE* __cdecl MSVCRT__fdopen(int, const char *); - #define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 @@ -329,33 +308,6 @@ void free_locinfo(pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; -int __cdecl _getch(void); -int __cdecl _ismbblead(unsigned int); -int __cdecl _ismbblead_l(unsigned int, _locale_t); -int __cdecl _ismbclegal(unsigned int c); -int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); -void __cdecl MSVCRT__searchenv(const char*,const char*,char*); -char* __cdecl _strset(char*,int); -int __cdecl _ungetch(int); -int __cdecl _cputs(const char*); -int WINAPIV _cprintf(const char*,...); -int WINAPIV _cwprintf(const wchar_t*,...); -char*** __cdecl MSVCRT___p__environ(void); -int* __cdecl __p___mb_cur_max(void); -wchar_t*** __cdecl MSVCRT___p__wenviron(void); -char* __cdecl MSVCRT__strdate(char* date); -char* __cdecl MSVCRT__strtime(char* date); -int __cdecl _setmbcp(int); -void __cdecl MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); -int __cdecl MSVCRT__towupper_l(wint_t,_locale_t); -int __cdecl MSVCRT__towlower_l(wint_t,_locale_t); -int __cdecl MSVCRT_strcmp(const char*, const char*); -char* __cdecl MSVCRT__itoa(int, char*, int); - -float __cdecl MSVCRT_floorf( float x ); -double __cdecl MSVCRT_sqrt( double x ); -float __cdecl MSVCRT_sqrtf( float x ); - enum fpmod { FP_ROUND_ZERO, /* only used when dropped part contains only zeros */ FP_ROUND_DOWN, diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8ada1cccfa5..988cbd0920d 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -23,6 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <conio.h> #include <stdarg.h> #include <limits.h> #include <math.h> diff --git a/include/msvcrt/mbctype.h b/include/msvcrt/mbctype.h index d821041ea16..a7a85135133 100644 --- a/include/msvcrt/mbctype.h +++ b/include/msvcrt/mbctype.h @@ -68,6 +68,7 @@ _ACRTIMP int __cdecl _setmbcp(int); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index fa35fcd1e42..1de3307326f 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -113,6 +113,7 @@ _ACRTIMP errno_t __cdecl _mbsupr_s(unsigned char*, size_t); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*);

1 0

Piotr Caban : msvcrt: Use _configthreadlocale arguments definition from public header.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: a7b9948f396a904b43851105f14e86455ebae703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b9948f396a904b43851105… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:25 2020 +0100 msvcrt: Use _configthreadlocale arguments definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 3 --- include/msvcrt/locale.h | 12 ++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 39ab6dadc84..ba98d31d719 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2052,12 +2052,12 @@ int CDECL _configthreadlocale(int type) thread_data_t *data = msvcrt_get_thread_data(); int ret; - ret = (data->locale_flags & LOCALE_THREAD ? MSVCRT__ENABLE_PER_THREAD_LOCALE : - MSVCRT__DISABLE_PER_THREAD_LOCALE); + ret = (data->locale_flags & LOCALE_THREAD ? _ENABLE_PER_THREAD_LOCALE : + _DISABLE_PER_THREAD_LOCALE); - if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) + if(type == _ENABLE_PER_THREAD_LOCALE) data->locale_flags |= LOCALE_THREAD; - else if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) + else if(type == _DISABLE_PER_THREAD_LOCALE) data->locale_flags &= ~LOCALE_THREAD; else if(type) ret = -1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 28feb7d90df..d86056f4c05 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -296,9 +296,6 @@ extern FILE MSVCRT__iob[]; #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) -#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 -#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 - _locale_t CDECL get_current_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; void CDECL free_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index ee0d99b8e7e..d2963813475 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -68,6 +68,18 @@ struct lconv struct tm; +#ifndef _CONFIG_LOCALE_SWT +#define _CONFIG_LOCALE_SWT + +#define _ENABLE_PER_THREAD_LOCALE 0x1 +#define _DISABLE_PER_THREAD_LOCALE 0x2 +#define _ENABLE_PER_THREAD_LOCALE_GLOBAL 0x10 +#define _DISABLE_PER_THREAD_LOCALE_GLOBAL 0x20 +#define _ENABLE_PER_THREAD_LOCALE_NEW 0x100 +#define _DISABLE_PER_THREAD_LOCALE_NEW 0x200 + +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Piotr Caban : msvcrt: Remove separate long double math funtions.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 93cdf1ada01248185c323332a90b3747e08d46cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=93cdf1ada01248185c323332… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:29 2020 +0100 msvcrt: Remove separate long double math funtions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 50 ++++++------ dlls/msvcrt/math.c | 195 -------------------------------------------- dlls/ucrtbase/ucrtbase.spec | 92 ++++++++++----------- 3 files changed, 71 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93cdf1ada01248185c32…

1 0

Alexandre Julliard : msvcrt: Fix _wstat() spec entry.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: d44f54340570c699a17dbbee55021c6ba0ea1bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44f54340570c699a17dbbee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 16:45:45 2020 +0100 msvcrt: Fix _wstat() spec entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 26f02721ede..2851c42d7c8 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -665,7 +665,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 579fda550f4..6a60a7d5827 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -661,7 +661,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e2b61403321..6f256a2d58e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1218,7 +1218,7 @@ @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index c3d7a338b1b..503a13180ba 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -620,7 +620,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) @ cdecl _wstrtime(ptr)

1 0