October 2019 - Wine-Commits

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

Oct. 28, 2019

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

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_texture().
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: e43d91f85f3a959878e98ac76babfda87d1bdf21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e43d91f85f3a959878e98ac7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:07 2019 -0500 wined3d: Introduce wined3d_stateblock_set_texture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 870d916345..fe49fd6754 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1486,6 +1486,28 @@ void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock stateblock->changed.textureState[stage] |= 1u << state; } +void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, + UINT stage, struct wined3d_texture *texture) +{ + TRACE("stateblock %p, stage %u, texture %p.\n", stateblock, stage, texture); + + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= ARRAY_SIZE(stateblock->stateblock_state.textures)) + { + WARN("Ignoring invalid stage %u.\n", stage); + return; + } + + if (texture) + wined3d_texture_incref(texture); + if (stateblock->stateblock_state.textures[stage]) + wined3d_texture_decref(stateblock->stateblock_state.textures[stage]); + stateblock->stateblock_state.textures[stage] = texture; + stateblock->changed.textures |= 1u << stage; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6fba7b5661..d0ba31bf4e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -266,6 +266,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) +@ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e328386d6f..a567cfd2f1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2674,6 +2674,7 @@ void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stat enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); +void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock,

1 0

Piotr Caban : ucrtbase: Implement %G format for strftime.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: f65c426776d91765130c2ebcda2c65140d56cb8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65c426776d91765130c2ebc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:28:54 2019 +0100 ucrtbase: Implement %G format for strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 9 +++++++++ dlls/ucrtbase/tests/misc.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 588f724cf7..8f4d64b361 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1196,6 +1196,15 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; + case 'G': + tmp = 1900 + mstm->tm_year; + if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0) + tmp--; + else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp)) + tmp++; + if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) + return 0; + break; #endif case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index da2e7d34ca..9cfe532560 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -138,6 +138,7 @@ static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); +static struct tm* (__cdecl *p__gmtime32)(const __time32_t*); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); @@ -509,6 +510,7 @@ static BOOL init(void) p_errno = (void*)GetProcAddress(module, "_errno"); p_asctime = (void*)GetProcAddress(module, "asctime"); p_strftime = (void*)GetProcAddress(module, "strftime"); + p__gmtime32 = (void*)GetProcAddress(module, "_gmtime32"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); @@ -904,6 +906,7 @@ static void test_strftime(void) const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; char bufA[256]; size_t retA; + int i; retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch); ok(retA == 2, "expected 2, got %d\n", (int)retA); @@ -964,6 +967,27 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%G", &epoch); + ok(retA == 4, "expected 4, got %d\n", (int)retA); + ok(!strcmp(bufA, "1970"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%G", &tm1); + ok(retA == 4, "expected 4, got %d\n", (int)retA); + ok(!strcmp(bufA, "2016"), "got %s\n", bufA); + + for(i=0; i<14; i++) + { + __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; + struct tm tm = *p__gmtime32(&t); + + retA = p_strftime(bufA, sizeof(bufA), "%G", &tm); + ok(retA == 4, "%d) retA = %d\n", i, (int)retA); + if (i <= 8) + ok(!strcmp(bufA, "1971"), "%d) got %s, expected 1971\n", i, bufA); + else + ok(!strcmp(bufA, "1972"), "%d) got %s, expected 1972\n", i, bufA); + } } static LONG* get_failures_counter(HANDLE *map)

1 0

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

Oct. 28, 2019

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

Piotr Caban : msvcrt: Add _mbscspn_l implementation.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

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 Oct. 28, 2019

Oct. 28, 2019

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 Oct. 28, 2019

Oct. 28, 2019

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

Piotr Caban : msvcrt: Don't use strcspn from C-library.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 69ea905674c98d2587171182ef980656f1d272fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ea905674c98d2587171182… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:29:01 2019 +0100 msvcrt: Don't use strcspn from C-library. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 16 +++++++++++++++- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 92228a0da6..038463c319 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2047,7 +2047,21 @@ int __cdecl MSVCRT__memicmp(const char *s1, const char *s2, MSVCRT_size_t len) */ MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) { - return strcspn( str, reject ); + BOOL rejects[256]; + const char *p; + + memset(rejects, 0, sizeof(rejects)); + + p = reject; + while(*p) + { + rejects[(unsigned char)*p] = TRUE; + p++; + } + + p = str; + while(*p && !rejects[(unsigned char)*p]) p++; + return p - str; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 573289d77b..0da7c52809 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -159,6 +159,29 @@ static void test_swab( void ) { ok(memcmp(to,expected3,testsize) == 0, "Testing small size %d returned '%*.*s'\n", testsize, testsize, testsize, to); } +static void test_strcspn(void) +{ + static const struct { + const char *str; + const char *rej; + int ret; + } tests[] = { + { "test", "a", 4 }, + { "test", "e", 1 }, + { "test", "", 4 }, + { "", "a", 0 }, + { "a\xf1", "\xf1", 1 } + }; + int r, i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = strcspn(tests[i].str, tests[i].rej); + ok(r == tests[i].ret, "strcspn(\"%s\", \"%s\") = %d, expected %d\n", + tests[i].str, tests[i].rej, r, tests[i].ret); + } +} + #if 0 /* use this to generate more tests */ static void test_codepage(int cp) @@ -3935,6 +3958,7 @@ START_TEST(string) /* run tolower tests first */ test_tolower(); test_swab(); + test_strcspn(); test_mbcp(); test_mbsspn(); test_mbsspnp();

1 0

Roman Pišl : rstrtmgr: Add RM_FILTER_ACTION definition.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: a5d441c19fbcea0eb4ab63cd966178cf209840e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d441c19fbcea0eb4ab63cd… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 27 11:16:46 2019 +0100 rstrtmgr: Add RM_FILTER_ACTION definition. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/restartmanager.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/restartmanager.h b/include/restartmanager.h index 9ee066d11d..ca5f9be71b 100644 --- a/include/restartmanager.h +++ b/include/restartmanager.h @@ -49,6 +49,12 @@ typedef enum _RM_REBOOT_REASON { RmRebootReasonDetectedSelf = 0x0010 } RM_REBOOT_REASON; +typedef enum _RM_FILTER_ACTION { + RmInvalidFilterAction = 0x0000, + RmNoRestart = 0x0001, + RmNoShutdown = 0x0002 +} RM_FILTER_ACTION; + typedef struct { DWORD dwProcessId; FILETIME ProcessStartTime;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetTexture().
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 6f97c24b6e343884fb837651fe784aa181d6a505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f97c24b6e343884fb837651… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:09 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetTexture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 63bf5f4fa2..6b6f5edfbc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2135,8 +2135,11 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag texture_impl = unsafe_impl_from_IDirect3DBaseTexture8(texture); wined3d_mutex_lock(); - wined3d_device_set_texture(device->wined3d_device, stage, + wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); + if (!device->recording) + wined3d_device_set_texture(device->wined3d_device, stage, + texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0