October 2019 - Wine-commits

Piotr Caban : msvcrt: Add _mbsspn_l implementation.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: de8e6b6a283f3f0148d8195c33964632921fa1ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8e6b6a283f3f0148d8195c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:29:05 2019 +0100 msvcrt: Add _mbsspn_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 | 16 ++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 20 insertions(+), 12 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 3f60bb4162..059e366aea 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 @@ -178,7 +178,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) ucrtbase._mbsspn -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) ucrtbase._mbsspn_l @ cdecl _mbsspnp(str str) ucrtbase._mbsspnp @ stub _mbsspnp_l @ cdecl _mbsstr(str str) ucrtbase._mbsstr diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f3647ea267..b59e8cf5cc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1184,7 +1184,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 343f2bd3c9..0697029962 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1541,7 +1541,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9938b1ff46..07ce01c90e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1551,7 +1551,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8e59d320f0..1e03b4d4d9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -856,7 +856,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5e8fba1c87..a8369cb6c6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -834,7 +834,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index fe47e55eae..ce98749e9f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2021,11 +2021,11 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) return 0; } - /********************************************************************* - * _mbsspn (MSVCRT.@) + * _mbsspn_l (MSVCRT.@) */ -MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) +MSVCRT_size_t CDECL _mbsspn_l(const unsigned char* string, + const unsigned char* set, MSVCRT__locale_t locale) { const unsigned char *p, *q; @@ -2033,7 +2033,7 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se { for (q = set; *q; q++) { - if (_ismbblead(*q)) + if (_ismbblead_l(*q, locale)) { /* duplicate a bug in native implementation */ if (!q[1]) break; @@ -2055,6 +2055,14 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se return p - string; } +/********************************************************************* + * _mbsspn (MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) +{ + return _mbsspn_l(string, set, NULL); +} + /********************************************************************* * _mbsspnp (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2d9f273df9..e4fad75c18 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -802,7 +802,7 @@ # stub _mbsset_s(ptr long long) # stub _mbsset_s_l(ptr long long ptr) @ cdecl _mbsspn(str str) -# stub _mbsspn_l(str str ptr) +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) # stub _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index fc391b8d81..7dfa9147d7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -697,7 +697,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str)

1 0

Piotr Caban : msvcrt: Add _mbscspn_l implementation.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 225dad5d0d52792841f7220e2129085a7a6dd60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=225dad5d0d52792841f7220e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:29:09 2019 +0100 msvcrt: Add _mbscspn_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 | 39 +++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 18 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 56 insertions(+), 17 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 059e366aea..f25dfb7d8f 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 @@ -101,7 +101,7 @@ @ cdecl _mbscpy_s(ptr long str) ucrtbase._mbscpy_s @ cdecl _mbscpy_s_l(ptr long str ptr) ucrtbase._mbscpy_s_l @ cdecl _mbscspn(str str) ucrtbase._mbscspn -@ stub _mbscspn_l +@ cdecl _mbscspn_l(str str ptr) ucrtbase._mbscspn_l @ cdecl _mbsdec(ptr ptr) ucrtbase._mbsdec @ stub _mbsdec_l @ cdecl _mbsdup(str) ucrtbase._mbsdup diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b59e8cf5cc..63c3a9d8a0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1108,7 +1108,7 @@ @ cdecl _mbscpy_s(ptr long str) @ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) -@ stub _mbscspn_l +@ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l @ cdecl _mbsicmp(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0697029962..366c771746 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1465,7 +1465,7 @@ @ cdecl _mbscpy_s(ptr long str) @ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) -@ stub _mbscspn_l +@ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l @ cdecl _mbsicmp(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 07ce01c90e..07ff5abdff 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1475,7 +1475,7 @@ @ cdecl _mbscpy_s(ptr long str) @ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) -@ stub _mbscspn_l +@ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l @ cdecl _mbsicmp(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1e03b4d4d9..14ed7f3553 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -780,7 +780,7 @@ @ cdecl _mbscpy_s(ptr long str) @ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) -@ stub _mbscspn_l +@ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l @ cdecl _mbsicmp(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a8369cb6c6..acb976a7b0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -758,7 +758,7 @@ @ cdecl _mbscpy_s(ptr long str) @ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) -@ stub _mbscspn_l +@ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l @ cdecl _mbsicmp(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ce98749e9f..6a62909128 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -156,11 +156,6 @@ static inline unsigned char *u__strnset( unsigned char *s, unsigned char c, MSVC return (unsigned char*) MSVCRT__strnset( (char*)s, c, len ); } -static inline MSVCRT_size_t u_strcspn( const unsigned char *s, const unsigned char *rej ) -{ - return strcspn( (const char *)s, (const char*)rej ); -} - /********************************************************************* * __p__mbctype (MSVCRT.@) */ @@ -2073,13 +2068,39 @@ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* } /********************************************************************* - * _mbscspn(MSVCRT.@) + * _mbscspn_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbscspn_l(const unsigned char* str, + const unsigned char* cmp, MSVCRT__locale_t locale) +{ + const unsigned char *p, *q; + + for (p = str; *p; p++) + { + for (q = cmp; *q; q++) + { + if (_ismbblead_l(*q, locale)) + { + /* duplicate a bug in native implementation */ + if (!q[1]) return 0; + + if (p[0] == q[0] && p[1] == q[1]) + return p - str; + q++; + } + else if (p[0] == q[0]) + return p - str; + } + } + return p - str; +} + +/********************************************************************* + * _mbscspn (MSVCRT.@) */ MSVCRT_size_t CDECL _mbscspn(const unsigned char* str, const unsigned char* cmp) { - if (get_mbcinfo()->ismbcodepage) - FIXME("don't handle double character case\n"); - return u_strcspn(str, cmp); + return _mbscspn_l(str, cmp, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e4fad75c18..b3b9cca0b9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -724,7 +724,7 @@ @ cdecl _mbscpy_s(ptr long str) @ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) -# stub _mbscspn_l(str str ptr) +@ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) # stub _mbsdec_l(ptr ptr ptr) @ cdecl _mbsdup(str) MSVCRT__strdup diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0da7c52809..f83130fc26 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -553,6 +553,13 @@ static void test_mbsspn( void) ret=_mbsspn( str1, empty); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); + ret=_mbscspn( str1, set); + ok( ret==0, "_mbscspn returns %d should be 0\n", ret); + ret=_mbscspn( str2, set); + ok( ret==4, "_mbscspn returns %d should be 4\n", ret); + ret=_mbscspn( str1, empty); + ok( ret==8, "_mbscspn returns %d should be 8\n", ret); + _setmbcp( 932); ret=_mbsspn( mbstr, mbset1); ok( ret==8, "_mbsspn returns %d should be 8\n", ret); @@ -565,6 +572,17 @@ static void test_mbsspn( void) ret=_mbsspn( mbstr, mbset3); ok( ret==14, "_mbsspn returns %d should be 14\n", ret); + ret=_mbscspn( mbstr, mbset1); + ok( ret==0, "_mbscspn returns %d should be 0\n", ret); + ret=_mbscspn( mbstr, mbset2); + ok( ret==0, "_mbscspn returns %d should be 0\n", ret); + ret=_mbscspn( mbstr+8, mbset1); + ok( ret==2, "_mbscspn returns %d should be 2\n", ret); + ret=_mbscspn( mbstr+8, mbset2); + ok( ret==0, "_mbscspn returns %d should be 0\n", ret); + ret=_mbscspn( mbstr, mbset3); + ok( ret==0, "_mbscspn returns %d should be 0\n", ret); + _setmbcp( cp); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7dfa9147d7..a262cc6345 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -620,7 +620,7 @@ @ cdecl _mbscpy_s(ptr long str) @ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) -@ stub _mbscspn_l +@ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l @ stub _mbsdup(str)

1 0

Piotr Caban : msvcrt: Don't use strstr from C-library.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: df6057365335757b027efc69e192d54a2eb274d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df6057365335757b027efc69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:29:15 2019 +0100 msvcrt: Don't use strstr from C-library. 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/msvcrt.h | 1 + dlls/msvcrt/string.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msvcrt/tests/string.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6a62909128..526ae9b9b5 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1211,7 +1211,7 @@ unsigned char* CDECL _mbscpy( unsigned char *dst, const unsigned char *src ) */ unsigned char * CDECL _mbsstr(const unsigned char *haystack, const unsigned char *needle) { - return (unsigned char *)strstr( (const char *)haystack, (const char *)needle ); + return (unsigned char *)MSVCRT_strstr( (const char *)haystack, (const char *)needle ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4bf26fbe9a..bfc084425f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1176,6 +1176,7 @@ int __cdecl MSVCRT__stricmp(const char*, const char*); int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +char* __cdecl MSVCRT_strstr(const char*, const char*); unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 038463c319..4ae523cece 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2005,7 +2005,42 @@ int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) */ char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle) { - return strstr(haystack, needle); + MSVCRT_size_t i, j, len, needle_len, lps_len; + BYTE lps[256]; + + needle_len = MSVCRT_strlen(needle); + if (!needle_len) return (char*)haystack; + lps_len = needle_len > ARRAY_SIZE(lps) ? ARRAY_SIZE(lps) : needle_len; + + lps[0] = 0; + len = 0; + i = 1; + while (i < lps_len) + { + if (needle[i] == needle[len]) lps[i++] = ++len; + else if (len) len = lps[len-1]; + else lps[i++] = 0; + } + + i = j = 0; + while (haystack[i]) + { + while (j < lps_len && haystack[i] && haystack[i] == needle[j]) + { + i++; + j++; + } + + if (j == needle_len) return (char*)haystack + i - j; + else if (j) + { + if (j == ARRAY_SIZE(lps) && !MSVCRT_strncmp(haystack + i, needle + j, needle_len - j)) + return (char*)haystack + i - j; + j = lps[j-1]; + } + else if (haystack[i]) i++; + } + return NULL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f83130fc26..05d7a4f28b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3897,6 +3897,39 @@ static void test_C_locale(void) } } +static void test_strstr(void) +{ + static char long_str[1024]; + const struct { + const char *haystack; + const char *needle; + int off; + } tests[] = { + { "", "", 0 }, + { "", "a", -1 }, + { "a", "", 0 }, + { "aabc", "abc", 1 }, + { "aaaa", "aaaa", 0 }, + { "simple", "simple", 0 }, + { "aaaaxaaaaxaaaa", "aaaaa", -1 }, + { "aaaaxaaaaxaaaaa", "aaaaa", 10 }, + { "abcabcdababcdabcdabde", "abcdabd", 13 }, + { "abababababcabababcababbba", "abababcaba", 4 }, + { long_str, long_str+1, 0 } + }; + const char *r, *exp; + int i; + + memset(long_str, 'a', sizeof(long_str)-1); + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + r = strstr(tests[i].haystack, tests[i].needle); + exp = tests[i].off == -1 ? NULL : tests[i].haystack + tests[i].off; + ok(r == exp, "%d) strstr returned %p, expected %p\n", i, r, exp); + } +} + START_TEST(string) { char mem[100]; @@ -4036,4 +4069,5 @@ START_TEST(string) test__tcsnicoll(); test___strncnt(); test_C_locale(); + test_strstr(); }

1 0

Andrew Eikum : dxgi: Sort reported output modes.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: eb2028fa90c41d3b7b8b4f924cd86059c5ba1e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb2028fa90c41d3b7b8b4f92… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 28 17:17:18 2019 +0330 dxgi: Sort reported output modes. Sekiro: Shadows Die Twice depends on this for its mode switching. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 29 +++++++++++++++++++++++++++++ dlls/dxgi/tests/dxgi.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index abe1aef950..a66628cc60 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -75,6 +75,25 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output return hr; } +static int dxgi_mode_desc_compare(const void *l, const void *r) +{ + const DXGI_MODE_DESC *left = l, *right = r; + int a, b; + + if (left->Width != right->Width) + return left->Width - right->Width; + + if (left->Height != right->Height) + return left->Height - right->Height; + + a = left->RefreshRate.Numerator * right->RefreshRate.Denominator; + b = right->RefreshRate.Numerator * left->RefreshRate.Denominator; + if (a != b) + return a - b; + + return 0; +} + enum dxgi_mode_struct_version { DXGI_MODE_STRUCT_VERSION_0, @@ -151,6 +170,16 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, } wined3d_mutex_unlock(); + switch (struct_version) + { + case DXGI_MODE_STRUCT_VERSION_0: + qsort(modes, *mode_count, sizeof(DXGI_MODE_DESC), dxgi_mode_desc_compare); + break; + case DXGI_MODE_STRUCT_VERSION_1: + qsort(modes, *mode_count, sizeof(DXGI_MODE_DESC1), dxgi_mode_desc_compare); + break; + } + return S_OK; } diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a7517c8b0a..cbb5806e2d 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1153,12 +1153,13 @@ static void test_parents(void) static void test_output(void) { + unsigned int mode_count, mode_count_comp, i, last_height, last_width; + double last_refresh_rate; IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; IDXGIOutput *output; ULONG refcount; - UINT mode_count, mode_count_comp, i; DXGI_MODE_DESC *modes; if (!(device = create_device(0))) @@ -1227,9 +1228,38 @@ static void test_output(void) ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); + last_width = last_height = 0; + last_refresh_rate = 0.; for (i = 0; i < mode_count; i++) { - ok(modes[i].Height && modes[i].Width, "Proper mode was expected\n"); + double refresh_rate = modes[i].RefreshRate.Numerator / (double)modes[i].RefreshRate.Denominator; + + ok(modes[i].Width && modes[i].Height, "Mode %u: Invalid dimensions %ux%u.\n", + i, modes[i].Width, modes[i].Height); + + ok(modes[i].Width >= last_width, + "Mode %u: Modes should have been sorted, width %u < %u.\n", i, modes[i].Width, last_width); + if (modes[i].Width != last_width) + { + last_width = modes[i].Width; + last_height = 0; + last_refresh_rate = 0.; + continue; + } + + ok(modes[i].Height >= last_height, + "Mode %u: Modes should have been sorted, height %u < %u.\n", i, modes[i].Height, last_height); + if (modes[i].Height != last_height) + { + last_height = modes[i].Height; + last_refresh_rate = 0.; + continue; + } + + ok(refresh_rate >= last_refresh_rate, + "Mode %u: Modes should have been sorted, refresh rate %f < %f.\n", i, refresh_rate, last_refresh_rate); + if (refresh_rate != last_refresh_rate) + last_refresh_rate = refresh_rate; } mode_count += 5;

1 0

Hans Leidekker : msi/tests: Add missing UnpublishFeatures actions.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 4f7bd33a838afca7086e993a9be7fa2d8dbdb5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7bd33a838afca7086e993a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 28 14:54:29 2019 +0100 msi/tests: Add missing UnpublishFeatures actions. Reported by Sven Baars. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47992 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 22 ++++++++++++++++++++-- dlls/msi/tests/install.c | 16 +++++++++++----- dlls/msi/tests/msi.c | 6 +++--- dlls/msi/tests/patch.c | 1 + 4 files changed, 35 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f7bd33a838afca7086e…

1 0

Jacek Caban : vbscript: Move sign expression to a separated rule.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: aa95d8a9bcc39fe66fc80eac3b359d05fbc3c83d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa95d8a9bcc39fe66fc80eac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:39:38 2019 +0100 vbscript: Move sign expression to a separated rule. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8ecdf47c08..000ab5bf33 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -126,7 +126,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression ExpressionNl_opt %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression -%type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression +%type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression SignExpression %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList @@ -369,15 +369,18 @@ MultiplicativeExpression { $$ = new_binary_expression(ctx, EXPR_DIV, $1, $3); CHECK_ERROR; } ExpExpression - : UnaryExpression { $$ = $1; } - | ExpExpression '^' UnaryExpression { $$ = new_binary_expression(ctx, EXPR_EXP, $1, $3); CHECK_ERROR; } + : SignExpression { $$ = $1; } + | ExpExpression '^' SignExpression { $$ = new_binary_expression(ctx, EXPR_EXP, $1, $3); CHECK_ERROR; } + +SignExpression + : UnaryExpression { $$ = $1; } + | '-' SignExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } + | '+' SignExpression { $$ = $2; } UnaryExpression : LiteralExpression { $$ = $1; } | CallExpression { $$ = $1; } | tNEW Identifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } - | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } - | '+' UnaryExpression { $$ = $2; } CallExpression : PrimaryExpression { $$ = $1; }

1 0

Jacek Caban : vbscript: Introduce separated struct for call expressions.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: fab9c49a6a34ddab32516c4091d89bb9a75c9b11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fab9c49a6a34ddab32516c40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:39:49 2019 +0100 vbscript: Introduce separated struct for call expressions. Instead of storing arguments in member expression struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 47 ++++++++++++++++++++++----------- dlls/vbscript/parse.h | 12 ++++++--- dlls/vbscript/parser.y | 69 ++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 95 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fab9c49a6a34ddab3251…

1 0

Jacek Caban : vbscript: Allow any unary expression after call keyword.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: f9bf6f0e1f69c7fc67fa55fc52985dda6f54e5e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9bf6f0e1f69c7fc67fa55fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:39:59 2019 +0100 vbscript: Allow any unary expression after call keyword. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index aca167d193..0a6bee4351 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -187,7 +187,7 @@ Statement SimpleStatement : MemberExpression ArgumentList_opt { $$ = new_call_statement(ctx, FALSE, &new_call_expression(ctx, &$1->expr, $2)->expr); CHECK_ERROR; } - | tCALL MemberExpression Arguments_opt { $$ = new_call_statement(ctx, TRUE, &new_call_expression(ctx, &$2->expr, $3)->expr); CHECK_ERROR; } + | tCALL UnaryExpression { $$ = new_call_statement(ctx, TRUE, $2); CHECK_ERROR; } | MemberExpression Arguments_opt '=' Expression { $$ = new_assign_statement(ctx, &new_call_expression(ctx, &$1->expr, $2)->expr, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; }

1 0

Jacek Caban : vbcript: Allow any call expression in call and assign statements.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: c3dde3bd3d90068a4fe44b2ea047b9fd4778f409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3dde3bd3d90068a4fe44b2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:10 2019 +0100 vbcript: Allow any call expression in call and assign statements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 55 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0a6bee4351..b577c2146e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -44,6 +44,7 @@ static expression_t *new_new_expression(parser_ctx_t*,const WCHAR*); static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); static call_expression_t *new_call_expression(parser_ctx_t*,expression_t*,expression_t*); +static call_expression_t *make_call_expression(parser_ctx_t*,expression_t*,expression_t*); static void *new_statement(parser_ctx_t*,statement_type_t,size_t); static statement_t *new_call_statement(parser_ctx_t*,BOOL,expression_t*); @@ -130,7 +131,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression SignExpression %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression -%type <expression> Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList +%type <expression> Arguments Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList %type <boolean> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl @@ -186,10 +187,11 @@ Statement | SimpleStatement ':' { $$ = $1; } SimpleStatement - : MemberExpression ArgumentList_opt { $$ = new_call_statement(ctx, FALSE, &new_call_expression(ctx, &$1->expr, $2)->expr); CHECK_ERROR; } + : CallExpression ArgumentList_opt { call_expression_t *call_expr = make_call_expression(ctx, $1, $2); CHECK_ERROR; + $$ = new_call_statement(ctx, FALSE, &call_expr->expr); CHECK_ERROR; }; | tCALL UnaryExpression { $$ = new_call_statement(ctx, TRUE, $2); CHECK_ERROR; } - | MemberExpression Arguments_opt '=' Expression - { $$ = new_assign_statement(ctx, &new_call_expression(ctx, &$1->expr, $2)->expr, $4); CHECK_ERROR; } + | CallExpression '=' Expression + { $$ = new_assign_statement(ctx, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } | tWHILE Expression StSep StatementsNl_opt tWEND @@ -289,12 +291,16 @@ CaseClausules | tCASE ExpressionList StSep StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } -Arguments_opt - : EmptyBrackets_opt { $$ = NULL; } +Arguments + : tEMPTYBRACKETS { $$ = NULL; } | '(' ArgumentList ')' { $$ = $2; } +Arguments_opt + : /* empty */ { $$ = NULL; } + | Arguments { $$ = $1; } + ArgumentList_opt - : EmptyBrackets_opt { $$ = NULL; } + : /* empty */ { $$ = NULL; } | ArgumentList { $$ = $1; } ArgumentList @@ -384,8 +390,10 @@ UnaryExpression | tNEW Identifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } CallExpression - : PrimaryExpression { $$ = $1; } - | MemberExpression Arguments_opt { $$ = &new_call_expression(ctx, &$1->expr, $2)->expr; CHECK_ERROR; } + : PrimaryExpression { $$ = $1; } + | MemberExpression { $$ = &$1->expr; } + | CallExpression Arguments { call_expression_t *expr = new_call_expression(ctx, $1, $2); CHECK_ERROR; + $$ = &expr->expr; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } @@ -691,6 +699,35 @@ static call_expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *e return call_expr; } +static call_expression_t *make_call_expression(parser_ctx_t *ctx, expression_t *callee_expr, expression_t *arguments) +{ + call_expression_t *call_expr; + + if(callee_expr->type == EXPR_MEMBER) + return new_call_expression(ctx, callee_expr, arguments); + if(callee_expr->type != EXPR_CALL) { + FIXME("Unhandled for expr type %u\n", callee_expr->type); + ctx->hres = E_FAIL; + return NULL; + } + call_expr = (call_expression_t*)callee_expr; + if(!call_expr->args) { + call_expr->args = arguments; + }else if(call_expr->args->next) { + FIXME("Invalid syntax: invalid use of parentheses for arguments\n"); + ctx->hres = E_FAIL; + return NULL; + }else if(arguments->type != EXPR_NOARG) { + FIXME("Invalid syntax: missing comma\n"); + ctx->hres = E_FAIL; + return NULL; + }else { + call_expr->args->next = arguments->next; + } + + return call_expr; +} + static expression_t *new_new_expression(parser_ctx_t *ctx, const WCHAR *identifier) { string_expression_t *expr;

1 0

Jacek Caban : vbscript: Support non-member calls in compiler.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 25248362ea670fa077d7f41af9bb67622bd8430f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25248362ea670fa077d7f41a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:18 2019 +0100 vbscript: Support non-member calls in compiler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 13 +++++++++---- dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/vbscript.h | 4 +++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 8309e5819c..0cbdae6e19 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -453,17 +453,22 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t static HRESULT compile_call_expression(compile_ctx_t *ctx, call_expression_t *expr, BOOL ret_val) { unsigned arg_cnt = 0; + expression_t *call; HRESULT hres; hres = compile_args(ctx, expr->args, &arg_cnt); if(FAILED(hres)) return hres; - if(expr->call_expr->type == EXPR_MEMBER) - return compile_member_expression(ctx, (member_expression_t*)expr->call_expr, arg_cnt, ret_val); + call = expr->call_expr; + if(call->type == EXPR_MEMBER) + return compile_member_expression(ctx, (member_expression_t*)call, arg_cnt, ret_val); - FIXME("non-member call expression\n"); - return E_NOTIMPL; + hres = compile_expression(ctx, call); + if(FAILED(hres)) + return hres; + + return push_instr_uint(ctx, ret_val ? OP_vcall : OP_vcallv, arg_cnt); } static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t *expr, vbsop_t op) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index fee3e72959..d8ed679788 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -635,6 +635,18 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT interp_vcall(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_vcallv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) { const BSTR identifier = ctx->instr->arg1.bstr; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 71f42aaff9..0382a80290 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -220,7 +220,7 @@ typedef enum { X(assign_ident, 1, ARG_BSTR, ARG_UINT) \ X(assign_member, 1, ARG_BSTR, ARG_UINT) \ X(bool, 1, ARG_INT, 0) \ - X(catch, 1, ARG_ADDR, ARG_UINT) \ + X(catch, 1, ARG_ADDR, ARG_UINT) \ X(case, 0, ARG_ADDR, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ @@ -271,6 +271,8 @@ typedef enum { X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \ X(val, 1, 0, 0) \ + X(vcall, 1, ARG_UINT, 0) \ + X(vcallv, 1, ARG_UINT, 0) \ X(xor, 1, 0, 0) typedef enum {

1 0