wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Jacek Caban : conhost/tests: Don't use inheritable handle for console pipe end.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: c440926547a8c790badce1b9bcdfcea7183ed1a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c440926547a8c790badce1b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 17:27:06 2020 +0200 conhost/tests: Don't use inheritable handle for console pipe end. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 27912aa188..1e2f955072 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1316,7 +1316,7 @@ static HPCON create_pseudo_console(HANDLE *console_pipe_end, HANDLE *child_proce ok(console_pipe != INVALID_HANDLE_VALUE, "CreateNamedPipeW failed: %u\n", GetLastError()); *console_pipe_end = CreateFileW(L"\\\\.\\pipe\\pseudoconsoleconn", GENERIC_READ | GENERIC_WRITE, - 0, &sec_attr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); ok(*console_pipe_end != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); child_pipe = CreateNamedPipeW(L"\\\\.\\pipe\\pseudoconsoleserver", PIPE_ACCESS_DUPLEX,

1 0

Jacek Caban : kernelbase: Duplicate input and output handles to ensure that they are inheritable.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 0e3edfd9422b811bc9b4c90110133fa342ae204e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e3edfd9422b811bc9b4c901… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 17:26:58 2020 +0200 kernelbase: Duplicate input and output handles to ensure that they are inheritable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index ce041020a3..502fbcddaf 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1732,6 +1732,7 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO { SECURITY_ATTRIBUTES inherit_attr = { sizeof(inherit_attr), NULL, TRUE }; struct pseudo_console *pseudo_console; + HANDLE tty_input = NULL, tty_output; HANDLE signal = NULL; WCHAR pipe_name[64]; @@ -1751,9 +1752,15 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO return HRESULT_FROM_WIN32( GetLastError() ); } pseudo_console->signal = CreateFileW( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); - if (pseudo_console->signal != INVALID_HANDLE_VALUE) - pseudo_console->reference = create_pseudo_console( size, input, output, signal, flags, + if (pseudo_console->signal != INVALID_HANDLE_VALUE && + DuplicateHandle( GetCurrentProcess(), input, GetCurrentProcess(), &tty_input, 0, TRUE, DUPLICATE_SAME_ACCESS) && + DuplicateHandle( GetCurrentProcess(), output, GetCurrentProcess(), &tty_output, 0, TRUE, DUPLICATE_SAME_ACCESS)) + { + pseudo_console->reference = create_pseudo_console( size, tty_input, tty_output, signal, flags, &pseudo_console->process ); + NtClose( tty_output ); + } + NtClose( tty_input ); NtClose( signal ); if (!pseudo_console->reference) {

1 0

Jacek Caban : conhost: Improve bound checking in fill_output.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: f3b8ccb2f79c9b4801493898a63a2520bc43afd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b8ccb2f79c9b4801493898… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 17:26:51 2020 +0200 conhost: Improve bound checking in fill_output. Inspired by Pengpeng Dong's patch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ed52838528..61346a3817 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2168,9 +2168,9 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c TRACE( "(%u %u) mode %u\n", params->x, params->y, params->mode ); - dest = screen_buffer->data + params->y * screen_buffer->width + params->x; - if (params->y >= screen_buffer->height) return STATUS_SUCCESS; + dest = screen_buffer->data + min( params->y * screen_buffer->width + params->x, + screen_buffer->height * screen_buffer->width ); if (params->wrap) end = screen_buffer->data + screen_buffer->height * screen_buffer->width;

1 0

Paul Gofman : msvcrt: Implement _mbbtype_l().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: ebe3fe536c6c0eb8d8144e9235ea8d1f88aa5657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe3fe536c6c0eb8d8144e92… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 23 22:56:25 2020 +0300 msvcrt: Implement _mbbtype_l(). Fixes Midnight Castle Succubus. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 45 ++++++++---------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 55 ++++++++++++++++++++++ dlls/ucrtbase/tests/string.c | 19 ++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- include/msvcrt/mbstring.h | 1 + 13 files changed, 105 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebe3fe536c6c0eb8d814…

1 0

Paul Gofman : msvcrt: Implement _mbscmp_l().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 12106c214bd3b84b7b9d6755f8006bed9a586c52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12106c214bd3b84b7b9d6755… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 23 22:54:28 2020 +0300 msvcrt: Implement _mbscmp_l(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 22 +++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 11 +++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- include/msvcrt/mbstring.h | 1 + 12 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index f33d8c8f3d..287c3c105b 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -95,7 +95,7 @@ @ cdecl _mbschr(str long) ucrtbase._mbschr @ stub _mbschr_l @ cdecl _mbscmp(str str) ucrtbase._mbscmp -@ stub _mbscmp_l +@ cdecl _mbscmp_l(str str ptr) ucrtbase._mbscmp_l @ cdecl _mbscoll(str str) ucrtbase._mbscoll @ cdecl _mbscoll_l(str str ptr) ucrtbase._mbscoll_l @ cdecl _mbscpy_s(ptr long str) ucrtbase._mbscpy_s diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d260ff138e..3bbe14613d 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -520,7 +520,7 @@ @ cdecl _o__mbschr(str long) ucrtbase._o__mbschr @ stub _o__mbschr_l @ cdecl _o__mbscmp(str str) ucrtbase._o__mbscmp -@ stub _o__mbscmp_l +@ cdecl _o__mbscmp_l(str str ptr) ucrtbase._o__mbscmp_l @ cdecl _o__mbscoll(str str) ucrtbase._o__mbscoll @ cdecl _o__mbscoll_l(str str ptr) ucrtbase._o__mbscoll_l @ cdecl _o__mbscpy_s(ptr long str) ucrtbase._o__mbscpy_s diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 02cba0e3e7..ec1eb0a771 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1102,7 +1102,7 @@ @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) -@ stub _mbscmp_l +@ cdecl _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy_s(ptr long str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b545ffc25c..f32f8faba9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1459,7 +1459,7 @@ @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) -@ stub _mbscmp_l +@ cdecl _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy_s(ptr long str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 662c097367..82598b74ed 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1469,7 +1469,7 @@ @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) -@ stub _mbscmp_l +@ cdecl _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy_s(ptr long str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bc5c6f7bd9..95ffa62ab5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -774,7 +774,7 @@ @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) -@ stub _mbscmp_l +@ cdecl _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy_s(ptr long str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 38b3912b4a..f2d5616609 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -752,7 +752,7 @@ @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) -@ stub _mbscmp_l +@ cdecl _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy_s(ptr long str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2a42c097b4..abd1f1df05 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -872,13 +872,17 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV } /********************************************************************* - * _mbscmp(MSVCRT.@) + * _mbscmp_l(MSVCRT.@) */ -int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) +int CDECL _mbscmp_l(const unsigned char* str, const unsigned char* cmp, MSVCRT__locale_t locale) { + MSVCRT_pthreadmbcinfo mbcinfo; + if (!str || !cmp) return INT_MAX; - if(get_mbcinfo()->ismbcodepage) + mbcinfo = locale ? locale->mbcinfo : get_mbcinfo(); + + if(mbcinfo->ismbcodepage) { unsigned int strc, cmpc; do { @@ -886,8 +890,8 @@ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) return *cmp ? -1 : 0; if(!*cmp) return 1; - strc = _mbsnextc(str); - cmpc = _mbsnextc(cmp); + strc = _mbsnextc_l(str, locale); + cmpc = _mbsnextc_l(cmp, locale); if(strc != cmpc) return strc < cmpc ? -1 : 1; str +=(strc > 255) ? 2 : 1; @@ -897,6 +901,14 @@ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) return u_strcmp(str, cmp); /* ASCII CP */ } +/********************************************************************* + * _mbscmp(MSVCRT.@) + */ +int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp, MSVCRT__locale_t locale) +{ + return _mbscmp_l(str, cmp, NULL); +} + /********************************************************************* * _mbsnbicoll_l(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9c049455af..6d6767b435 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -717,7 +717,7 @@ @ cdecl _mbschr(str long) # stub _mbschr_l(str long ptr) @ cdecl _mbscmp(str str) -# stub _mbscmp_l(str str ptr) +@ cdecl _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy(ptr str) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c617518988..6517995edd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -115,6 +115,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); static unsigned int (__cdecl *p_mbsnextc_l)(const unsigned char*, _locale_t); +static int (__cdecl *p_mbscmp_l)(const unsigned char*, const unsigned char*, _locale_t); int CDECL __STRINGTOLD(_LDOUBLE*, char**, const char*, int); @@ -3725,6 +3726,15 @@ static void test__mbscmp(void) ret = _mbscmp(b, a); ok(ret == 1, "got %d\n", ret); + + if (!p_mbscmp_l) + { + win_skip("_mbscmp_l tests\n"); + return; + } + + ret = p_mbscmp_l(a, b, NULL); + ok(ret == -1, "got %d\n", ret); } static void test__ismbclx(void) @@ -4458,6 +4468,7 @@ START_TEST(string) p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); p___strncnt = (void*)GetProcAddress(hMsvcrt, "__strncnt"); p_mbsnextc_l = (void*)GetProcAddress(hMsvcrt, "_mbsnextc_l"); + p_mbscmp_l = (void*)GetProcAddress(hMsvcrt, "_mbscmp_l"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ee06053a70..a6c30f9a15 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -614,7 +614,7 @@ @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) -@ stub _mbscmp_l +@ cdecl _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy_s(ptr long str) @@ -1184,7 +1184,7 @@ @ cdecl _o__mbschr(str long) _mbschr @ stub _o__mbschr_l @ cdecl _o__mbscmp(str str) _mbscmp -@ stub _o__mbscmp_l +@ cdecl _o__mbscmp_l(str str ptr) _mbscmp_l @ cdecl _o__mbscoll(str str) _mbscoll @ cdecl _o__mbscoll_l(str str ptr) _mbscoll_l @ cdecl _o__mbscpy_s(ptr long str) _mbscpy_s diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 82bc6f1aee..b3336a2fba 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -65,6 +65,7 @@ int __cdecl _mbsbtype(const unsigned char*,size_t); unsigned char* __cdecl _mbscat(unsigned char*,const unsigned char*); unsigned char* __cdecl _mbschr(const unsigned char*,unsigned int); int __cdecl _mbscmp(const unsigned char*,const unsigned char*); +int __cdecl _mbscmp_l(const unsigned char*,const unsigned char*,_locale_t); int __cdecl _mbscoll(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbscpy(unsigned char*,const unsigned char*); size_t __cdecl _mbscspn(const unsigned char*,const unsigned char*);

1 0

Paul Gofman : msvcrt: Implement _mbsnextc_l().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 082de781f016a43f4ab9545adcf4b1e67b8de75f URL: https://source.winehq.org/git/wine.git/?a=commit;h=082de781f016a43f4ab9545a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 23 22:54:27 2020 +0300 msvcrt: Implement _mbsnextc_l(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 14 +++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 7 +++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- include/msvcrt/mbstring.h | 3 ++- 12 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 84ae0f449b..f33d8c8f3d 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -154,7 +154,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) ucrtbase._mbsnextc -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) ucrtbase._mbsnextc_l @ cdecl _mbsnicmp(str str long) ucrtbase._mbsnicmp @ stub _mbsnicmp_l @ cdecl _mbsnicoll(str str long) ucrtbase._mbsnicoll diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index f9cfe67c1b..d260ff138e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -578,7 +578,7 @@ @ stub _o__mbsncpy_s @ stub _o__mbsncpy_s_l @ cdecl _o__mbsnextc(str) ucrtbase._o__mbsnextc -@ stub _o__mbsnextc_l +@ cdecl _o__mbsnextc_l(str ptr) ucrtbase._o__mbsnextc_l @ cdecl _o__mbsnicmp(str str long) ucrtbase._o__mbsnicmp @ stub _o__mbsnicmp_l @ stub _o__mbsnicoll diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 577fb69b5a..02cba0e3e7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1160,7 +1160,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 97edbec6a7..b545ffc25c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1517,7 +1517,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1aa63de64a..662c097367 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1527,7 +1527,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a31943e4d7..bc5c6f7bd9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -832,7 +832,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ff58757cb8..38b3912b4a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -810,7 +810,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index dc52cf1b8c..2a42c097b4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -393,15 +393,23 @@ int CDECL _getmbcp(void) } /********************************************************************* - * _mbsnextc(MSVCRT.@) + * _mbsnextc_l(MSVCRT.@) */ -unsigned int CDECL _mbsnextc(const unsigned char* str) +unsigned int CDECL _mbsnextc_l(const unsigned char* str, MSVCRT__locale_t locale) { - if(_ismbblead(*str)) + if(_ismbblead_l(*str, locale)) return *str << 8 | str[1]; return *str; } +/********************************************************************* + * _mbsnextc(MSVCRT.@) + */ +unsigned int CDECL _mbsnextc(const unsigned char* str) +{ + return _mbsnextc_l(str, NULL); +} + /********************************************************************* * _mbctolower(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6da32d025d..9c049455af 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -778,7 +778,7 @@ # stub _mbsncpy_s(ptr long str long) # stub _mbsncpy_s_l(ptr long str long ptr) @ cdecl _mbsnextc(str) -# stub _mbsnextc_l(str ptr) +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) # stub _mbsnicmp_l(str str long ptr) @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a08a76fc68..c617518988 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -114,6 +114,7 @@ static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned c static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +static unsigned int (__cdecl *p_mbsnextc_l)(const unsigned char*, _locale_t); int CDECL __STRINGTOLD(_LDOUBLE*, char**, const char*, int); @@ -351,6 +352,11 @@ static void test_mbcp(void) expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */ expect_eq(_mbsnextc(&mbstring[3]), 0x20, int, "%x"); /* single char */ + if (!p_mbsnextc_l) + win_skip("_mbsnextc_l tests\n"); + else + expect_eq(p_mbsnextc_l(mbstring, NULL), 0xb0b1, int, "%x"); + /* _mbclen/_mbslen */ expect_eq(_mbclen(mbstring), 2, int, "%d"); expect_eq(_mbclen(&mbstring[2]), 2, int, "%d"); @@ -4451,6 +4457,7 @@ START_TEST(string) p__memicmp = (void*)GetProcAddress(hMsvcrt, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); p___strncnt = (void*)GetProcAddress(hMsvcrt, "__strncnt"); + p_mbsnextc_l = (void*)GetProcAddress(hMsvcrt, "_mbsnextc_l"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4981d7fbac..ee06053a70 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -673,7 +673,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) @@ -1242,7 +1242,7 @@ @ stub _o__mbsncpy_s @ stub _o__mbsncpy_s_l @ cdecl _o__mbsnextc(str) _mbsnextc -@ stub _o__mbsnextc_l +@ cdecl _o__mbsnextc_l(str ptr) _mbsnextc_l @ cdecl _o__mbsnicmp(str str long) _mbsnicmp @ stub _o__mbsnicmp_l @ stub _o__mbsnicoll diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 80be664aaa..82bc6f1aee 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -90,7 +90,8 @@ size_t __cdecl _mbsnccnt(const unsigned char*,size_t); int __cdecl _mbsncmp(const unsigned char*,const unsigned char*,size_t); int __cdecl _mbsncoll(const unsigned char*,const unsigned char*,size_t); unsigned char* __cdecl _mbsncpy(unsigned char*,const unsigned char*,size_t); -unsigned int __cdecl _mbsnextc (const unsigned char*); +unsigned int __cdecl _mbsnextc(const unsigned char*); +unsigned int __cdecl _mbsnextc_l(const unsigned char*,_locale_t); int __cdecl _mbsnicmp(const unsigned char*,const unsigned char*,size_t); int __cdecl _mbsnicoll(const unsigned char*,const unsigned char*,size_t); unsigned char* __cdecl _mbsninc(const unsigned char*,size_t);

1 0

Henri Verbeet : wined3d: Implement sample masks for the Vulkan adapter.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 69ba059dcb352c3316f5cc1917b2e4e8e5648f47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ba059dcb352c3316f5cc19… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 24 16:19:25 2020 +0330 wined3d: Implement sample masks for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 12 +++++++++--- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index aef2430208..a4f5f317f1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1635,8 +1635,12 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if ((ret = memcmp(&a->rs_desc, &b->rs_desc, sizeof(a->rs_desc)))) return ret; - if ((ret = memcmp(&a->ms_desc, &b->ms_desc, sizeof(a->ms_desc)))) - return ret; + if (a->ms_desc.rasterizationSamples != b->ms_desc.rasterizationSamples) + return a->ms_desc.rasterizationSamples - b->ms_desc.rasterizationSamples; + if (a->ms_desc.alphaToCoverageEnable != b->ms_desc.alphaToCoverageEnable) + return a->ms_desc.alphaToCoverageEnable - b->ms_desc.alphaToCoverageEnable; + if (a->sample_mask != b->sample_mask) + return a->sample_mask - b->sample_mask; if ((ret = memcmp(&a->ds_desc, &b->ds_desc, sizeof(a->ds_desc)))) return ret; @@ -1710,6 +1714,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->rs_desc.lineWidth = 1.0f; key->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; + key->ms_desc.pSampleMask = &key->sample_mask; key->ds_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; key->ds_desc.maxDepthBounds = 1.0f; @@ -2020,10 +2025,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte } if (key->ms_desc.rasterizationSamples != context_vk->sample_count - || isStateDirty(&context_vk->c, STATE_BLEND)) + || isStateDirty(&context_vk->c, STATE_BLEND) || isStateDirty(&context_vk->c, STATE_SAMPLE_MASK)) { key->ms_desc.rasterizationSamples = context_vk->sample_count; key->ms_desc.alphaToCoverageEnable = state->blend_state && state->blend_state->desc.alpha_to_coverage; + key->sample_mask = state->sample_mask; update = true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24a9212ae0..b0bf863d21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2386,6 +2386,7 @@ struct wined3d_graphics_pipeline_key_vk VkVertexInputBindingDescription bindings[MAX_ATTRIBS]; VkViewport viewport; VkRect2D scissor; + VkSampleMask sample_mask; VkPipelineColorBlendAttachmentState blend_attachments[WINED3D_MAX_RENDER_TARGETS]; VkPipelineVertexInputDivisorStateCreateInfoEXT divisor_desc;

1 0

Paul Gofman : wined3d: Track SRV to RTV aliasing on sub resource level.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 61e02c5e4f20de6c82342a2ffaa001150bd7c56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=61e02c5e4f20de6c82342a2f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 24 15:15:12 2020 +0300 wined3d: Track SRV to RTV aliasing on sub resource level. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 70 +++++++++++++++-- dlls/wined3d/device.c | 11 +-- dlls/wined3d/resource.c | 1 + dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 169 ++++++++++++++++++++++++++++++++++++++++- 5 files changed, 238 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61e02c5e4f20de6c8234…

1 0

Paul Gofman : wined3d: Don't check for readonly depth / stencil in context_preload_texture().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 774e4b2ea39c3a4c6c004cc454d8202864587fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=774e4b2ea39c3a4c6c004cc4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 24 15:15:11 2020 +0300 wined3d: Don't check for readonly depth / stencil in context_preload_texture(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- dlls/wined3d/device.c | 5 ++++- dlls/wined3d/wined3d_private.h | 13 ------------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3a263e1f6b..08c6e27922 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -347,7 +347,8 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) + if (texture->resource.rtv_bind_count_device || (state->fb.depth_stencil + && state->fb.depth_stencil->resource == &texture->resource)) context->uses_fbo_attached_resources = 1; wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c6affe594..8a69132784 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1952,6 +1952,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wi static void wined3d_device_set_shader_resource_view(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_shader_resource_view *view) { + const struct wined3d_rendertarget_view *dsv; struct wined3d_shader_resource_view *prev; if (idx >= MAX_SHADER_RESOURCE_VIEWS) @@ -1964,7 +1965,9 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic if (view == prev) return; - if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource, view->format)) + if (view && (view->resource->rtv_bind_count_device + || ((dsv = device->state.fb.depth_stencil) + && dsv->resource == view->resource && wined3d_dsv_srv_conflict(dsv, view->format)))) { WARN("Application is trying to bind resource which is attached as render target.\n"); view = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45ed232099..61bde16501 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5973,19 +5973,6 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi || (srv_format->green_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } -static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, - const struct wined3d_resource *resource, const struct wined3d_format *srv_format) -{ - const struct wined3d_rendertarget_view *dsv; - - if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (dsv = state->fb.depth_stencil) && dsv->resource == resource - && wined3d_dsv_srv_conflict(dsv, srv_format)) - return TRUE; - - return resource->rtv_bind_count_device; -} - static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) { ++rtv->resource->rtv_bind_count_device;

1 0

Paul Gofman : wined3d: Track resource binding as render target.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 1b8ccaab47dadd0beb1f55118b40ab905304908e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b8ccaab47dadd0beb1f5511… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 24 15:15:10 2020 +0300 wined3d: Track resource binding as render target. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3fce04673a..3c6affe594 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1060,6 +1060,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_swapchain_desc *swapchain_desc; DWORD clear_flags = 0; + unsigned int i; HRESULT hr; TRACE("device %p, swapchain %p.\n", device, swapchain); @@ -1096,6 +1097,10 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str } device->swapchains[0] = swapchain; + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; @@ -4849,13 +4854,19 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3D_OK; if (view) + { wined3d_rendertarget_view_incref(view); + wined3d_rtv_bind_count_inc(view); + } device->state.fb.render_targets[view_idx] = view; wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ if (prev) + { + wined3d_rtv_bind_count_dec(prev); wined3d_rendertarget_view_decref(prev); + } wined3d_unbind_srv_for_rtv(device, view, FALSE); @@ -4888,7 +4899,6 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view, TRUE); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ed1f13381..45ed232099 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3936,7 +3936,8 @@ struct wined3d_resource { LONG ref; LONG bind_count; - LONG srv_bind_count_device; + uint32_t srv_bind_count_device; + uint32_t rtv_bind_count_device; LONG map_count; LONG access_count; struct wined3d_device *device; @@ -5975,23 +5976,24 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { - struct wined3d_rendertarget_view * const *rts = &state->fb.render_targets[0]; const struct wined3d_rendertarget_view *dsv; - unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) && (dsv = state->fb.depth_stencil) && dsv->resource == resource && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; - if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) - return FALSE; + return resource->rtv_bind_count_device; +} - for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) - if (rts[i] && rts[i]->resource == resource) - return TRUE; +static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) +{ + ++rtv->resource->rtv_bind_count_device; +} - return FALSE; +static inline void wined3d_rtv_bind_count_dec(struct wined3d_rendertarget_view *rtv) +{ + --rtv->resource->rtv_bind_count_device; } static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *vp, float *min_z, float *max_z)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020