February 2019 - Wine-commits

Piotr Caban : msvcrt: Add _ismbbtrail_l implementation.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 790f97cb3080bbec2794f608893f4b4176887e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=790f97cb3080bbec2794f608… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 14 14:35:02 2019 +0100 msvcrt: Add _ismbbtrail_l implementation. 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 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 16 +++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 24 insertions(+), 10 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 1c987d0..31ccd0f 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 @@ -23,7 +23,7 @@ @ cdecl _ismbbpunct(long) ucrtbase._ismbbpunct @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) ucrtbase._ismbbtrail -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) ucrtbase._ismbbtrail_l @ cdecl _ismbcalnum(long) ucrtbase._ismbcalnum @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) ucrtbase._ismbcalpha diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c4574c6..5e30c77 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -973,7 +973,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 59ed703..8f35f48 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1319,7 +1319,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4e25c68..49b3327 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1322,7 +1322,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0b..e3323dd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1225,7 +1225,7 @@ @ cdecl _ismbbpunct(long) msvcr120._ismbbpunct @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) msvcr120._ismbbtrail -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) msvcr120._ismbbtrail_l @ cdecl _isnan(double) msvcr120._isnan @ cdecl -arch=x86_64 _isnanf(float) msvcr120._isnanf @ cdecl _isprint_l(long ptr) msvcr120._isprint_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c9863d9..c1b3d8b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -645,7 +645,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b686122..3da8fdf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -623,7 +623,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d00c31a..d470f10 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1551,13 +1551,27 @@ int CDECL _ismbblead(unsigned int c) return _ismbblead_l(c, NULL); } +/********************************************************************* + * _ismbbtrail_l(MSVCRT.@) + */ +int CDECL _ismbbtrail_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + return (mbcinfo->mbctype[(c&0xff) + 1] & _M2) != 0; +} /********************************************************************* * _ismbbtrail(MSVCRT.@) */ int CDECL _ismbbtrail(unsigned int c) { - return (get_mbcinfo()->mbctype[(c&0xff) + 1] & _M2) != 0; + return _ismbbtrail_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2a74d51..0154998 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -594,7 +594,7 @@ @ stub _ismbbpunct(long) # stub _ismbbpunct_l(long ptr) @ cdecl _ismbbtrail(long) -# stub _ismbbtrail_l(long ptr) +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) # stub _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2d1d8da..021d9b2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -461,7 +461,7 @@ @ stub _ismbbpunct(long) @ stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -@ stub _ismbbtrail_l +@ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) @ stub _ismbcalnum_l @ cdecl _ismbcalpha(long)

1 0

Piotr Caban : msvcrt: Add _ismbclegal_l implementation.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 64453ea28b866fe614b8ff19ee5530fd2f10dbe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64453ea28b866fe614b8ff19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 14 14:35:07 2019 +0100 msvcrt: Add _ismbclegal_l implementation. 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 +- 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 | 10 +++++++++- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 17 insertions(+), 9 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 31ccd0f..f83af10 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 @@ -45,7 +45,7 @@ @ cdecl _ismbcl2(long) ucrtbase._ismbcl2 @ stub _ismbcl2_l @ cdecl _ismbclegal(long) ucrtbase._ismbclegal -@ stub _ismbclegal_l +@ cdecl _ismbclegal_l(long ptr) ucrtbase._ismbclegal_l @ cdecl _ismbclower(long) ucrtbase._ismbclower @ stub _ismbclower_l @ cdecl _ismbcprint(long) ucrtbase._ismbcprint diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5e30c77..b3bccf6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -993,7 +993,7 @@ @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) -@ stub _ismbclegal_l +@ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) @ stub _ismbclower_l @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8f35f48..77e1a37 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1339,7 +1339,7 @@ @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) -@ stub _ismbclegal_l +@ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) @ stub _ismbclower_l @ stub _ismbcprint(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 49b3327..5d26417 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1344,7 +1344,7 @@ @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) -@ stub _ismbclegal_l +@ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) @ stub _ismbclower_l @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c1b3d8b..87cb490 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -665,7 +665,7 @@ @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) -@ stub _ismbclegal_l +@ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) @ stub _ismbclower_l @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3da8fdf..2bc27d4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -643,7 +643,7 @@ @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) -@ stub _ismbclegal_l +@ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) @ stub _ismbclower_l @ cdecl _ismbcprint(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d470f10..4b2d742 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1575,11 +1575,19 @@ int CDECL _ismbbtrail(unsigned int c) } /********************************************************************* + * _ismbclegal_l(MSVCRT.@) + */ +int CDECL _ismbclegal_l(unsigned int c, MSVCRT__locale_t locale) +{ + return _ismbblead_l(HIBYTE(c), locale) && _ismbbtrail_l(LOBYTE(c), locale); +} + +/********************************************************************* * _ismbclegal(MSVCRT.@) */ int CDECL _ismbclegal(unsigned int c) { - return _ismbblead(HIBYTE(c)) && _ismbbtrail(LOBYTE(c)); + return _ismbclegal_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0154998..73bc468 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -614,7 +614,7 @@ @ stub _ismbcl2(long) # stub _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) -# stub _ismbclegal_l(long ptr) +@ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) # stub _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 021d9b2..c013492 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -483,7 +483,7 @@ @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) -@ stub _ismbclegal_l +@ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) @ stub _ismbclower_l @ cdecl _ismbcprint(long)

1 0

Piotr Caban : msvcrt: Validate character in _ismbcl0.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 622c218cb2802278045a0f864952eb0075318a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=622c218cb2802278045a0f86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 14 14:35:19 2019 +0100 msvcrt: Validate character in _ismbcl0. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/tests/string.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 4b2d742..a0ce73f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2560,7 +2560,7 @@ int CDECL _ismbcl0(unsigned int c) if(get_mbcinfo()->mbcodepage == 932) { /* JIS non-Kanji */ - return (c >= 0x8140 && c <= 0x889e); + return _ismbclegal(c) && c >= 0x8140 && c <= 0x889e; } return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d0cc51b..4574ea7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3288,6 +3288,9 @@ static void test__ismbclx(void) ret = _ismbcl0(0x8140); ok(ret, "got %d\n", ret); + ret = _ismbcl0(0x817f); + ok(!ret, "got %d\n", ret); + _setmbcp(cp); }

1 0

Nikolay Sivov : msvcrt: Add _ismbcl0_l().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 2d89bccfc37f1b4ceb778109c4217b7404640a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d89bccfc37f1b4ceb778109… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 14 14:35:32 2019 +0100 msvcrt: Add _ismbcl0_l(). Signed-off-by: Nikolay Sivov <nsivov(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 +- 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 | 27 +++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 29 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 f83af10..9fe80de 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 @@ -39,7 +39,7 @@ @ cdecl _ismbckata(long) ucrtbase._ismbckata @ stub _ismbckata_l @ cdecl _ismbcl0(long) ucrtbase._ismbcl0 -@ stub _ismbcl0_l +@ cdecl _ismbcl0_l(long ptr) ucrtbase._ismbcl0_l @ cdecl _ismbcl1(long) ucrtbase._ismbcl1 @ stub _ismbcl1_l @ cdecl _ismbcl2(long) ucrtbase._ismbcl2 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b3bccf6..25bd7d9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -987,7 +987,7 @@ @ cdecl _ismbckata(long) @ stub _ismbckata_l @ cdecl _ismbcl0(long) -@ stub _ismbcl0_l +@ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) @ stub _ismbcl1_l @ stub _ismbcl2(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 77e1a37..f5d1135 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1333,7 +1333,7 @@ @ cdecl _ismbckata(long) @ stub _ismbckata_l @ cdecl _ismbcl0(long) -@ stub _ismbcl0_l +@ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) @ stub _ismbcl1_l @ stub _ismbcl2(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5d26417..e229dd1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1338,7 +1338,7 @@ @ cdecl _ismbckata(long) @ stub _ismbckata_l @ cdecl _ismbcl0(long) -@ stub _ismbcl0_l +@ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) @ stub _ismbcl1_l @ stub _ismbcl2(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 87cb490..a0430f2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -659,7 +659,7 @@ @ cdecl _ismbckata(long) @ stub _ismbckata_l @ cdecl _ismbcl0(long) -@ stub _ismbcl0_l +@ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) @ stub _ismbcl1_l @ stub _ismbcl2(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2bc27d4..0eff774 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -637,7 +637,7 @@ @ cdecl _ismbckata(long) @ stub _ismbckata_l @ cdecl _ismbcl0(long) -@ stub _ismbcl0_l +@ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) @ stub _ismbcl1_l @ stub _ismbcl2(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a0ce73f..ea9a308 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2551,16 +2551,31 @@ unsigned int CDECL _mbctokata(unsigned int c) return c; } +/********************************************************************* + * _ismbcl0_l (MSVCRT.@) + */ +int CDECL _ismbcl0_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(mbcinfo->mbcodepage == 932) + { + /* JIS non-Kanji */ + return _ismbclegal(c) && c >= 0x8140 && c <= 0x889e; + } + + return 0; +} /********************************************************************* * _ismbcl0 (MSVCRT.@) */ int CDECL _ismbcl0(unsigned int c) { - if(get_mbcinfo()->mbcodepage == 932) - { - /* JIS non-Kanji */ - return _ismbclegal(c) && c >= 0x8140 && c <= 0x889e; - } - return 0; + return _ismbcl0_l(c, NULL); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 73bc468..c9182ae 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -608,7 +608,7 @@ @ cdecl _ismbckata(long) # stub _ismbckata_l(long ptr) @ cdecl _ismbcl0(long) -# stub _ismbcl0_l(long ptr) +@ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) # stub _ismbcl1_l(long ptr) @ stub _ismbcl2(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c013492..156d546 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -477,7 +477,7 @@ @ cdecl _ismbckata(long) @ stub _ismbckata_l @ cdecl _ismbcl0(long) -@ stub _ismbcl0_l +@ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) @ stub _ismbcl1_l @ stub _ismbcl2(long)

1 0

Nikolay Sivov : msvcrt: Add _ismbcl1_l().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 1b86a06ff8b67eece4e795a868fd6b3fd36d43fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b86a06ff8b67eece4e795a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 14 14:35:40 2019 +0100 msvcrt: Add _ismbcl1_l(). Signed-off-by: Nikolay Sivov <nsivov(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 +- 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 | 21 +++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 29 insertions(+), 8 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 9fe80de..270e2c2 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 @@ -41,7 +41,7 @@ @ cdecl _ismbcl0(long) ucrtbase._ismbcl0 @ cdecl _ismbcl0_l(long ptr) ucrtbase._ismbcl0_l @ cdecl _ismbcl1(long) ucrtbase._ismbcl1 -@ stub _ismbcl1_l +@ cdecl _ismbcl1_l(long ptr) ucrtbase._ismbcl1_l @ cdecl _ismbcl2(long) ucrtbase._ismbcl2 @ stub _ismbcl2_l @ cdecl _ismbclegal(long) ucrtbase._ismbclegal diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 25bd7d9..e9fdbff 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -989,7 +989,7 @@ @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) -@ stub _ismbcl1_l +@ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f5d1135..dc1fa1d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1335,7 +1335,7 @@ @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) -@ stub _ismbcl1_l +@ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e229dd1..5d05b3d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1340,7 +1340,7 @@ @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) -@ stub _ismbcl1_l +@ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a0430f2..ec1cd22 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -661,7 +661,7 @@ @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) -@ stub _ismbcl1_l +@ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0eff774..78f1768 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -639,7 +639,7 @@ @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) -@ stub _ismbcl1_l +@ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ea9a308..9174214 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2579,3 +2579,24 @@ int CDECL _ismbcl0(unsigned int c) { return _ismbcl0_l(c, NULL); } + +/********************************************************************* + * _ismbcl1_l (MSVCRT.@) + */ +int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(mbcinfo->mbcodepage == 932) + { + /* JIS level-1 */ + return _ismbclegal(c) && c >= 0x889f && c <= 0x9872; + } + + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c9182ae..b6b7882 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -610,7 +610,7 @@ @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) -# stub _ismbcl1_l(long ptr) +@ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) # stub _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 156d546..8387521 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -479,7 +479,7 @@ @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) @ stub _ismbcl1(long) -@ stub _ismbcl1_l +@ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l @ cdecl _ismbclegal(long)

1 0

Nikolay Sivov : msvcrt: Add _ismbcl1().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 698b26a432ff8ce036014adc041efb08a63d6367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=698b26a432ff8ce036014adc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 14 14:35:45 2019 +0100 msvcrt: Add _ismbcl1(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46644 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e9fdbff..202042d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -988,7 +988,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index dc1fa1d..1f4bfe3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1334,7 +1334,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5d05b3d..7e03eb1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1339,7 +1339,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index e1b373f..629dce9 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -382,7 +382,7 @@ @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 24bd681..f0009be 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -377,7 +377,7 @@ @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ec1cd22..7dc4ea8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -660,7 +660,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 78f1768..16a2473 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -638,7 +638,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9174214..909ea46 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2600,3 +2600,11 @@ int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale) return 0; } + +/********************************************************************* + * _ismbcl1 (MSVCRT.@) + */ +int CDECL _ismbcl1(unsigned int c) +{ + return _ismbcl1_l(c, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6b7882..1f9ad64 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -609,7 +609,7 @@ # stub _ismbckata_l(long ptr) @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) # stub _ismbcl2_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4574ea7..53fbfd3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3275,11 +3275,17 @@ static void test__ismbclx(void) ret = _ismbcl0(0); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0); + ok(!ret, "got %d\n", ret); + cp = _setmbcp(1252); ret = _ismbcl0(0x8140); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0x889f); + ok(!ret, "got %d\n", ret); + _setmbcp(932); ret = _ismbcl0(0); @@ -3291,6 +3297,15 @@ static void test__ismbclx(void) ret = _ismbcl0(0x817f); ok(!ret, "got %d\n", ret); + ret = _ismbcl1(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl1(0x889f); + ok(ret, "got %d\n", ret); + + ret = _ismbcl1(0x88fd); + ok(!ret, "got %d\n", ret); + _setmbcp(cp); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8387521..db894a0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -478,7 +478,7 @@ @ stub _ismbckata_l @ cdecl _ismbcl0(long) @ cdecl _ismbcl0_l(long ptr) -@ stub _ismbcl1(long) +@ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) @ stub _ismbcl2_l

1 0

Alexandre Julliard : ntdll: Return the kernel process start address from __wine_kernel_init().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 42df4dccd578d0f7f635d7b6eaf9ddedf7c65987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42df4dccd578d0f7f635d7b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 16:45:03 2019 +0100 ntdll: Return the kernel process start address from __wine_kernel_init(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 4 ++-- dlls/ntdll/loader.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index df2d0d6..ad257a0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1336,7 +1336,7 @@ static void set_process_name( int argc, char *argv[] ) * * Wine initialisation: load and start the main exe file. */ -void CDECL __wine_kernel_init(void) +void * CDECL __wine_kernel_init(void) { static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR dotW[] = {'.',0}; @@ -1458,7 +1458,7 @@ void CDECL __wine_kernel_init(void) if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ - LdrInitializeThunk( start_process_wrapper, 0, 0, 0 ); + return start_process_wrapper; error: ExitProcess( GetLastError() ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6becb44..d6b8950 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3386,8 +3386,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, WINE_MODREF *wm; PEB *peb = NtCurrentTeb()->Peb; - kernel32_start_process = kernel_start; - /* allocate the modref for the main exe (if not already done) */ wm = get_modref( peb->ImageBaseAddress ); assert( wm ); @@ -3558,7 +3556,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - void (* DECLSPEC_NORETURN CDECL init_func)(void); + void * (CDECL *init_func)(void); thread_init(); @@ -3584,5 +3582,8 @@ void __wine_process_init(void) MESSAGE( "wine: could not find __wine_kernel_init in kernel32.dll, status %x\n", status ); exit(1); } - init_func(); + + kernel32_start_process = init_func(); + + LdrInitializeThunk( NULL, 0, 0, 0 ); }

1 0

Józef Kucia : vkd3d: Avoid using VK_WHOLE_SIZE for uniform buffer descriptors.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: 22330b541446b62f10ef7d03dff709318420757a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22330b541446b62f10ef7d0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:32 2019 +0100 vkd3d: Avoid using VK_WHOLE_SIZE for uniform buffer descriptors. It is invalid to use VK_WHOLE_SIZE when a buffer is larger than maxUniformBufferRange. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 22a568f..4a9f7c4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3404,7 +3404,8 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, gpu_address); buffer_info.buffer = resource->u.vk_buffer; buffer_info.offset = gpu_address - resource->gpu_address; - buffer_info.range = VK_WHOLE_SIZE; + buffer_info.range = resource->desc.Width - buffer_info.offset; + buffer_info.range = min(buffer_info.range, vk_info->device_limits.maxUniformBufferRange); if (vk_info->KHR_push_descriptor) {

1 0

Józef Kucia : vkd3d-shader: Add support for OpenGL tessellation shaders.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: c333fddaf922a51d3fd56c09b7acfe73ce7cf9cd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c333fddaf922a51d3fd56c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:33 2019 +0100 vkd3d-shader: Add support for OpenGL tessellation shaders. In DXBC tessellator parameters are specified in hull shaders. In OpenGL, even in SPIR-V, tessellator parameters must be specified in the tessellation evaluation shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 27 +++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 41 +++++++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 17 ------------- 3 files changed, 60 insertions(+), 25 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 679abfe..fef058c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -33,6 +33,7 @@ enum vkd3d_shader_structure_type VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_DOMAIN_SHADER_COMPILE_ARGUMENTS, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -195,6 +196,32 @@ struct vkd3d_shader_compile_arguments unsigned int output_swizzle_count; }; +enum vkd3d_tessellator_output_primitive +{ + VKD3D_TESSELLATOR_OUTPUT_POINT = 1, + VKD3D_TESSELLATOR_OUTPUT_LINE = 2, + VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, + VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, +}; + +enum vkd3d_tessellator_partitioning +{ + VKD3D_TESSELLATOR_PARTITIONING_INTEGER = 1, + VKD3D_TESSELLATOR_PARTITIONING_POW2 = 2, + VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, + VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, +}; + +/* Extends vkd3d_shader_compile_arguments. */ +struct vkd3d_shader_domain_shader_compile_arguments +{ + enum vkd3d_shader_structure_type type; + const void *next; + + enum vkd3d_tessellator_output_primitive output_primitive; + enum vkd3d_tessellator_output_primitive partitioning; +}; + int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface_info *shader_interface_info, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 97963e9..6ba169f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4856,6 +4856,9 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co enum vkd3d_tessellator_domain domain = instruction->declaration.tessellator_domain; SpvExecutionMode mode; + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && vkd3d_dxbc_compiler_is_opengl_target(compiler)) + return; + switch (domain) { case VKD3D_TESSELLATOR_DOMAIN_LINE: @@ -4875,12 +4878,14 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } -static void vkd3d_dxbc_compiler_emit_dcl_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) +static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_tessellator_output_primitive primitive) { - enum vkd3d_tessellator_output_primitive primitive = instruction->declaration.tessellator_output_primitive; SpvExecutionMode mode; + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && vkd3d_dxbc_compiler_is_opengl_target(compiler)) + return; + switch (primitive) { case VKD3D_TESSELLATOR_OUTPUT_POINT: @@ -4902,12 +4907,14 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_output_primitive(struct vkd vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } -static void vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) +static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_tessellator_partitioning partitioning) { - enum vkd3d_tessellator_partitioning partitioning = instruction->declaration.tessellator_partitioning; SpvExecutionMode mode; + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && vkd3d_dxbc_compiler_is_opengl_target(compiler)) + return; + switch (partitioning) { case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: @@ -7426,10 +7433,12 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); break; case VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE: - vkd3d_dxbc_compiler_emit_dcl_tessellator_output_primitive(compiler, instruction); + vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, + instruction->declaration.tessellator_output_primitive); break; case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING: - vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(compiler, instruction); + vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, + instruction->declaration.tessellator_partitioning); break; case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); @@ -7775,6 +7784,8 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) { + const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + const struct vkd3d_shader_domain_shader_compile_arguments *ds_args; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; vkd3d_spirv_build_op_function_end(builder); @@ -7782,6 +7793,20 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL) vkd3d_dxbc_compiler_emit_hull_shader_main(compiler); + if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) + { + if (compile_args && (ds_args = vkd3d_find_struct(compile_args->next, DOMAIN_SHADER_COMPILE_ARGUMENTS))) + { + vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_args->output_primitive); + vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_args->partitioning); + } + else if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) + { + ERR("vkd3d_shader_domain_shader_compile_arguments are required for " + "OpenGL tessellation evaluation shader.\n"); + } + } + if (compiler->epilogue_function_id) vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ba5875c..40d46b3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -464,23 +464,6 @@ enum vkd3d_tessellator_domain VKD3D_TESSELLATOR_DOMAIN_QUAD = 3, }; -enum vkd3d_tessellator_output_primitive -{ - VKD3D_TESSELLATOR_OUTPUT_POINT = 1, - VKD3D_TESSELLATOR_OUTPUT_LINE = 2, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, -}; - -enum vkd3d_tessellator_partitioning -{ - VKD3D_TESSELLATOR_PARTITIONING_INTEGER = 1, - VKD3D_TESSELLATOR_PARTITIONING_POW2 = 2, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, -}; - - #define VKD3DSI_NONE 0x0 #define VKD3DSI_TEXLD_PROJECT 0x1 #define VKD3DSI_INDEXED_DYNAMIC 0x4

1 0

Józef Kucia : vkd3d: Avoid passing invalid viewport to Vulkan.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: vkd3d Branch: master Commit: 70822141b73eaf699d2696f4c7cc9a5b72a22be6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=70822141b73eaf699d2696f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 14 12:22:34 2019 +0100 vkd3d: Avoid passing invalid viewport to Vulkan. Needs more tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4a9f7c4..7457ae3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2953,6 +2953,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo vk_viewports[i].height = -viewports[i].Height; vk_viewports[i].minDepth = viewports[i].MinDepth; vk_viewports[i].maxDepth = viewports[i].MaxDepth; + + if (!vk_viewports[i].width || !vk_viewports[i].height) + { + FIXME("Invalid viewport %u, ignoring RSSetViewports().\n", i); + return; + } } vk_procs = &list->device->vk_procs;

1 0