- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Remove the no longer used "sampler" field of struct wined3d_texture.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: b186455cfad2ecd041da231af354f0f9a4a841cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b186455cfad2ecd041da231af354f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 18:55:52 2023 -0600 wined3d: Remove the no longer used "sampler" field of struct wined3d_texture. --- dlls/wined3d/cs.c | 21 ++------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 96207bcc525..6822f467276 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1498,8 +1498,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (op->texture) { - if (InterlockedIncrement(&op->texture->resource.bind_count) == 1) - op->texture->sampler = op->stage; + InterlockedIncrement(&op->texture->resource.bind_count); if (texture_binding_might_invalidate_ps(op->texture, prev, d3d_info)) device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); @@ -1519,23 +1518,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (prev) { - if (InterlockedDecrement(&prev->resource.bind_count) && prev->sampler == op->stage) - { - unsigned int i; - - /* Search for other stages the texture is bound to. Shouldn't - * happen if applications bind textures to a single stage only. */ - TRACE("Searching for other stages the texture is bound to.\n"); - for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) - { - if (cs->state.textures[i] == prev) - { - TRACE("Texture is also bound to stage %u.\n", i); - prev->sampler = i; - break; - } - } - } + InterlockedDecrement(&prev->resource.bind_count); if (!op->texture && op->stage < d3d_info->ffp_fragment_caps.max_blend_stages) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10b9d3c3a73..4f7cacda858 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3329,7 +3329,6 @@ struct wined3d_texture unsigned int sysmem_count; float pow2_matrix[16]; unsigned int lod; - DWORD sampler; uint32_t flags; DWORD update_map_binding;

1 0

Zebediah Figura : wined3d: Introduce a texture_binding_might_invalidate_ps() helper.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 1e968480eb16abfa64247f681a7771fce03b25a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e968480eb16abfa64247f681a7771… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 31 15:54:36 2022 -0600 wined3d: Introduce a texture_binding_might_invalidate_ps() helper. Make a complex conditional a bit easier to read. --- dlls/wined3d/cs.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3004f308843..44739fc0ac7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1454,6 +1454,34 @@ void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_cont wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } +static bool texture_binding_might_invalidate_ps(struct wined3d_texture *texture, + struct wined3d_texture *prev, const struct wined3d_d3d_info *d3d_info) +{ + const struct wined3d_format *old_format, *new_format; + unsigned int old_caps, new_caps; + + if (!prev) + return true; + + if (wined3d_texture_gl(texture)->target != wined3d_texture_gl(prev)->target) + return true; + + old_format = prev->resource.format; + new_format = texture->resource.format; + old_caps = prev->resource.format_caps; + new_caps = texture->resource.format_caps; + if ((old_caps & WINED3D_FORMAT_CAP_SHADOW) != (new_caps & WINED3D_FORMAT_CAP_SHADOW)) + return true; + + if (is_same_fixup(old_format->color_fixup, new_format->color_fixup)) + return false; + + if (can_use_texture_swizzle(d3d_info, new_format) && can_use_texture_swizzle(d3d_info, old_format)) + return false; + + return true; +} + static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) { const struct wined3d_d3d_info *d3d_info = &cs->c.device->adapter->d3d_info; @@ -1466,18 +1494,10 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (op->texture) { - const struct wined3d_format *new_format = op->texture->resource.format; - const struct wined3d_format *old_format = prev ? prev->resource.format : NULL; - unsigned int old_fmt_caps = prev ? prev->resource.format_caps : 0; - unsigned int new_fmt_caps = op->texture->resource.format_caps; - if (InterlockedIncrement(&op->texture->resource.bind_count) == 1) op->texture->sampler = op->stage; - if (!prev || wined3d_texture_gl(op->texture)->target != wined3d_texture_gl(prev)->target - || (!is_same_fixup(new_format->color_fixup, old_format->color_fixup) - && !(can_use_texture_swizzle(d3d_info, new_format) && can_use_texture_swizzle(d3d_info, old_format))) - || (new_fmt_caps & WINED3D_FORMAT_CAP_SHADOW) != (old_fmt_caps & WINED3D_FORMAT_CAP_SHADOW)) + if (texture_binding_might_invalidate_ps(op->texture, prev, d3d_info)) device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); if (!prev && op->stage < d3d_info->ffp_fragment_caps.max_blend_stages)

1 0

Zebediah Figura : wined3d: Check the wined3d resource type and usage instead of the GL target in texture_binding_might_invalidate_ps().
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: fecb3b608b4c8ad1f4b40f46ff48117affacf599 URL: https://gitlab.winehq.org/wine/wine/-/commit/fecb3b608b4c8ad1f4b40f46ff4811… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 31 15:59:03 2022 -0600 wined3d: Check the wined3d resource type and usage instead of the GL target in texture_binding_might_invalidate_ps(). --- dlls/wined3d/cs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 44739fc0ac7..96207bcc525 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1457,13 +1457,17 @@ void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_cont static bool texture_binding_might_invalidate_ps(struct wined3d_texture *texture, struct wined3d_texture *prev, const struct wined3d_d3d_info *d3d_info) { + unsigned int old_usage, new_usage, old_caps, new_caps; const struct wined3d_format *old_format, *new_format; - unsigned int old_caps, new_caps; if (!prev) return true; - if (wined3d_texture_gl(texture)->target != wined3d_texture_gl(prev)->target) + /* 1.x pixel shaders need to be recompiled based on the resource type. */ + old_usage = prev->resource.usage; + new_usage = texture->resource.usage; + if (texture->resource.type != prev->resource.type + || ((old_usage & WINED3DUSAGE_LEGACY_CUBEMAP) != (new_usage & WINED3DUSAGE_LEGACY_CUBEMAP))) return true; old_format = prev->resource.format;

1 0

Bartosz Kosiorek : msvcrt: Add _mblen_l implementation.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 707198babe16d7a87090027810c4c506d05af5d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/707198babe16d7a87090027810c4c5… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Nov 7 23:06:30 2023 +0100 msvcrt: Add _mblen_l implementation. --- 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 | 31 ++++++++++++++++++++++--------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 307d00e11e5..f4baf442b53 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1094,7 +1094,7 @@ @ cdecl _mbctoupper(long) @ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype -@ stub _mblen_l +@ cdecl _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) @ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index baf10ae48a4..e9bdf422024 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1451,7 +1451,7 @@ @ cdecl _mbctoupper(long) @ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype -@ stub _mblen_l +@ cdecl _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) @ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8fa160170d5..13dacc15744 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1462,7 +1462,7 @@ @ cdecl _mbctoupper(long) @ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype -@ stub _mblen_l +@ cdecl _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) @ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2b2949cdc66..561c3774260 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1302,7 +1302,7 @@ @ cdecl _malloc_crt(long) msvcr120._malloc_crt # extern _mbcasemap @ extern _mbctype msvcr120._mbctype -@ stub _mblen_l +@ cdecl _mblen_l(str long ptr) msvcr120._mblen_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcr120._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcr120._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcr120._mbstrlen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9f92ba36a9f..91781c9c9e4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -766,7 +766,7 @@ @ cdecl _mbctoupper(long) @ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype -@ stub _mblen_l +@ cdecl _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) @ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8d647d6e907..2af41f8aea2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -744,7 +744,7 @@ @ cdecl _mbctoupper(long) @ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype -@ stub _mblen_l +@ cdecl _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) @ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cc006765662..9b52170d4e9 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2984,21 +2984,34 @@ unsigned char* CDECL _mbspbrk(const unsigned char *str, const unsigned char *acc */ /********************************************************************* - * mblen(MSVCRT.@) + * _mblen_l(MSVCRT.@) * REMARKS * Unlike most of the multibyte string functions this function uses * the locale codepage, not the codepage set by _setmbcp */ -int CDECL mblen(const char* str, size_t size) +int CDECL _mblen_l(const char* str, size_t size, _locale_t locale) { - if (str && *str && size) - { - if(get_locinfo()->mb_cur_max == 1) - return 1; /* ASCII CP */ + pthreadlocinfo locinfo; - return !isleadbyte((unsigned char)*str) ? 1 : (size>1 ? 2 : -1); - } - return 0; + if (!str || !*str || !size) + return 0; + + if (locale) + locinfo = locale->locinfo; + else + locinfo = get_locinfo(); + + if (locinfo->mb_cur_max == 1) + return 1; /* ASCII CP */ + return !_isleadbyte_l((unsigned char)*str, locale) ? 1 : (size > 1 ? 2 : -1); +} + +/********************************************************************* + * mblen(MSVCRT.@) + */ +int CDECL mblen(const char* str, size_t size) +{ + return _mblen_l(str, size, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 11b65d869dc..f54a437692f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -711,7 +711,7 @@ @ cdecl _mbctoupper(long) @ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype -# stub _mblen_l(str long ptr) +@ cdecl _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) @ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4bb7f4148c7..7cf9b01aa4f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -609,7 +609,7 @@ @ cdecl _mbctombb_l(long ptr) @ cdecl _mbctoupper(long) @ cdecl _mbctoupper_l(long ptr) -@ stub _mblen_l +@ cdecl _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) @ cdecl _mbsbtype_l(str long ptr) @ cdecl _mbscat_s(ptr long str) @@ -1179,7 +1179,7 @@ @ cdecl _o__mbctombb_l(long ptr) _mbctombb_l @ cdecl _o__mbctoupper(long) _mbctoupper @ cdecl _o__mbctoupper_l(long ptr) _mbctoupper_l -@ stub _o__mblen_l +@ cdecl _o__mblen_l(str long ptr) _mblen_l @ cdecl _o__mbsbtype(str long) _mbsbtype @ cdecl _o__mbsbtype_l(str long ptr) _mbsbtype_l @ cdecl _o__mbscat_s(ptr long str) _mbscat_s

1 0

Bartosz Kosiorek : msvcrt: Add _mbsset_l implementation.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 8bb0692ff607fb4f57b392984131b19d8f1fb820 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bb0692ff607fb4f57b392984131b1… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Nov 7 23:06:30 2023 +0100 msvcrt: Add _mbsset_l implementation. --- 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 | 46 +++++++++++++++++++++++++++++++-------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 30fbd397131..307d00e11e5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1180,7 +1180,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) -@ stub _mbsset_l +@ cdecl _mbsset_l(ptr long ptr) @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index aaff43ea736..baf10ae48a4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1537,7 +1537,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) -@ stub _mbsset_l +@ cdecl _mbsset_l(ptr long ptr) @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index df0ea4c24da..8fa160170d5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1548,7 +1548,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) -@ stub _mbsset_l +@ cdecl _mbsset_l(ptr long ptr) @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 687a73b5d8a..9f92ba36a9f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -852,7 +852,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) -@ stub _mbsset_l +@ cdecl _mbsset_l(ptr long ptr) @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 38ffcc7ca22..8d647d6e907 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -830,7 +830,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) -@ stub _mbsset_l +@ cdecl _mbsset_l(ptr long ptr) @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e1aa5ab2d6f..cc006765662 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2205,27 +2205,45 @@ int CDECL _mbsbtype(const unsigned char *str, size_t count) return _mbsbtype_l(str, count, NULL); } + /********************************************************************* - * _mbsset(MSVCRT.@) + * _mbsset_l(MSVCRT.@) */ -unsigned char* CDECL _mbsset(unsigned char* str, unsigned int c) +unsigned char* CDECL _mbsset_l(unsigned char* str, unsigned int c, _locale_t locale) { - unsigned char* ret = str; + unsigned char* ret = str; + pthreadmbcinfo mbcinfo; - if(!get_mbcinfo()->ismbcodepage || c < 256) - return u__strset(str, c); /* ASCII CP or SB char */ + if (!MSVCRT_CHECK_PMT(str)) + return NULL; - c &= 0xffff; /* Strip high bits */ + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); - while(str[0] && str[1]) - { - *str++ = c >> 8; - *str++ = c & 0xff; - } - if(str[0]) - str[0] = '\0'; /* FIXME: OK to shorten? */ + if (!mbcinfo->ismbcodepage || c < 256) + return u__strset(str, c); /* ASCII CP or SB char */ + + c &= 0xffff; /* Strip high bits */ - return ret; + while (str[0] && str[1]) + { + *str++ = c >> 8; + *str++ = c & 0xff; + } + if (str[0]) + str[0] = '\0'; /* FIXME: OK to shorten? */ + + return ret; +} + +/********************************************************************* + * _mbsset(MSVCRT.@) + */ +unsigned char* CDECL _mbsset(unsigned char* str, unsigned int c) +{ + return _mbsset_l(str, c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a52016e6298..11b65d869dc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -801,7 +801,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) -# stub _mbsset_l(ptr long ptr) +@ cdecl _mbsset_l(ptr long ptr) # stub _mbsset_s(ptr long long) # stub _mbsset_s_l(ptr long long ptr) @ cdecl _mbsspn(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1f99c65ef05..4bb7f4148c7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -696,7 +696,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) -@ stub _mbsset_l +@ cdecl _mbsset_l(ptr long ptr) @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) @@ -1265,7 +1265,7 @@ @ cdecl _o__mbsrev(str) _mbsrev @ cdecl _o__mbsrev_l(str ptr) _mbsrev_l @ cdecl _o__mbsset(ptr long) _mbsset -@ stub _o__mbsset_l +@ cdecl _o__mbsset_l(ptr long ptr) _mbsset_l @ stub _o__mbsset_s @ stub _o__mbsset_s_l @ cdecl _o__mbsspn(str str) _mbsspn

1 0

Alexandre Julliard : winevulkan: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 0b63da6aab69c5ab34a00fa9cc629411c3a2b1e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b63da6aab69c5ab34a00fa9cc6294… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 11:11:55 2023 +0100 winevulkan: Remove DECLSPEC_HIDDEN usage. --- dlls/winevulkan/make_vulkan | 11 ++--- dlls/winevulkan/vulkan_loader.h | 6 +-- dlls/winevulkan/vulkan_private.h | 16 +++---- dlls/winevulkan/vulkan_thunks.h | 90 ++++++++++++++++++++-------------------- 4 files changed, 59 insertions(+), 64 deletions(-)

1 0

Alexandre Julliard : opengl32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 6ecd967d48d8b92ab58f51a891250a6d9ca2c879 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ecd967d48d8b92ab58f51a891250a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 11:11:11 2023 +0100 opengl32: Remove DECLSPEC_HIDDEN usage. --- dlls/opengl32/make_opengl | 22 ++++---- dlls/opengl32/private.h | 2 +- dlls/opengl32/thunks.c | 34 ++++++------ dlls/opengl32/unix_private.h | 6 +-- dlls/opengl32/unix_thunks.c | 124 +++++++++++++++++++++---------------------- dlls/opengl32/unix_wgl.c | 56 +++++++++---------- 6 files changed, 122 insertions(+), 122 deletions(-)

1 0

Bartosz Kosiorek : msvcrt: Add __iswcsymf implementation.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 8f30305049ded06fc89f61a93dd442c8e1024881 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f30305049ded06fc89f61a93dd442… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Nov 7 23:06:28 2023 +0100 msvcrt: Add __iswcsymf implementation. --- 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/ctype.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6e0148d1b6b..de6265dbeff 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -599,7 +599,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __iswcsym(long) -@ stub __iswcsymf +@ cdecl __iswcsymf(long) # extern __lconv @ cdecl __lconv_init() @ cdecl -arch=i386 -norelay __libm_sse2_acos() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c92c984748f..8db709f894f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -947,7 +947,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __iswcsym(long) -@ stub __iswcsymf +@ cdecl __iswcsymf(long) @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind # extern __lconv @ cdecl __lconv_init() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5c525f8d1af..6aae69fdea4 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -938,7 +938,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __iswcsym(long) -@ stub __iswcsymf +@ cdecl __iswcsymf(long) @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind # extern __lconv @ cdecl __lconv_init() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1b11b90da92..2b2949cdc66 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -915,7 +915,7 @@ @ cdecl __iscsym(long) msvcr120.__iscsym @ cdecl __iscsymf(long) msvcr120.__iscsymf @ cdecl __iswcsym(long) msvcr120.__iswcsym -@ stub __iswcsymf +@ cdecl __iswcsymf(long) msvcr120.__iswcsymf @ stdcall -arch=arm __jump_unwind(ptr ptr) msvcr120.__jump_unwind # extern __lconv @ cdecl __lconv_init() msvcr120.__lconv_init diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 22fdab9bacd..509343870a4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -238,7 +238,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __iswcsym(long) -@ stub __iswcsymf +@ cdecl __iswcsymf(long) # extern __lc_clike @ extern __lc_codepage MSVCRT___lc_codepage @ extern __lc_collate_cp MSVCRT___lc_collate_cp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 67f6cc77c46..119aa34c55f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -227,7 +227,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __iswcsym(long) -@ stub __iswcsymf +@ cdecl __iswcsymf(long) # extern __lc_clike @ extern __lc_codepage MSVCRT___lc_codepage @ extern __lc_collate_cp MSVCRT___lc_collate_cp diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7e12841c91f..a1805324c1f 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -460,6 +460,14 @@ int CDECL __iswcsym(wint_t c) return (iswalnum(c) || c == '_'); } +/********************************************************************* + * __iswcsymf (MSVCRT.@) + */ +int CDECL __iswcsymf(wint_t c) +{ + return (iswalpha(c) || c == '_'); +} + /********************************************************************* * _toupper_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f010f3eee37..7e02dd203c6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -100,7 +100,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __iswcsym(long) -@ stub __iswcsymf +@ cdecl __iswcsymf(long) @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind @ cdecl -arch=i386 -norelay __libm_sse2_acos() @ cdecl -arch=i386 -norelay __libm_sse2_acosf()

1 0

Bartosz Kosiorek : msvcrt: Add __iswcsym implementation.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: f82871e76838b3d73eb34d6ef4d732e17a043af5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f82871e76838b3d73eb34d6ef4d732… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Nov 7 23:06:26 2023 +0100 msvcrt: Add __iswcsym implementation. --- 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/ctype.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5796f353d9c..6e0148d1b6b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -598,7 +598,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stub __iswcsym +@ cdecl __iswcsym(long) @ stub __iswcsymf # extern __lconv @ cdecl __lconv_init() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cd54513a59e..c92c984748f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -946,7 +946,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stub __iswcsym +@ cdecl __iswcsym(long) @ stub __iswcsymf @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind # extern __lconv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1bb81f3f257..5c525f8d1af 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -937,7 +937,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stub __iswcsym +@ cdecl __iswcsym(long) @ stub __iswcsymf @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind # extern __lconv diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 591a25f3cce..1b11b90da92 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -914,7 +914,7 @@ @ cdecl __isascii(long) msvcr120.__isascii @ cdecl __iscsym(long) msvcr120.__iscsym @ cdecl __iscsymf(long) msvcr120.__iscsymf -@ stub __iswcsym +@ cdecl __iswcsym(long) msvcr120.__iswcsym @ stub __iswcsymf @ stdcall -arch=arm __jump_unwind(ptr ptr) msvcr120.__jump_unwind # extern __lconv diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9dbe665cd02..22fdab9bacd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -237,7 +237,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stub __iswcsym +@ cdecl __iswcsym(long) @ stub __iswcsymf # extern __lc_clike @ extern __lc_codepage MSVCRT___lc_codepage diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 391be34a624..67f6cc77c46 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -226,7 +226,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stub __iswcsym +@ cdecl __iswcsym(long) @ stub __iswcsymf # extern __lc_clike @ extern __lc_codepage MSVCRT___lc_codepage diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 5a7d3450eda..7e12841c91f 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -452,6 +452,14 @@ int CDECL __iscsymf(int c) return (c < 127 && (isalpha(c) || c == '_')); } +/********************************************************************* + * __iswcsym (MSVCRT.@) + */ +int CDECL __iswcsym(wint_t c) +{ + return (iswalnum(c) || c == '_'); +} + /********************************************************************* * _toupper_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8b0420987de..f010f3eee37 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -99,7 +99,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stub __iswcsym +@ cdecl __iswcsym(long) @ stub __iswcsymf @ stdcall -arch=arm __jump_unwind(ptr ptr) ntdll.__jump_unwind @ cdecl -arch=i386 -norelay __libm_sse2_acos()

1 0

Bartosz Kosiorek : msvcrt: Add _mbsrev_l implementation.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 08c603a417ed99d0f089680beb3b3531bd65587b URL: https://gitlab.winehq.org/wine/wine/-/commit/08c603a417ed99d0f089680beb3b35… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Nov 7 23:06:29 2023 +0100 msvcrt: Add _mbsrev_l implementation. --- 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 | 64 +++++++++++++++++++++++++++++++-------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- 8 files changed, 53 insertions(+), 27 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3c901f0345b..30fbd397131 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1178,7 +1178,7 @@ @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) -@ stub _mbsrev_l +@ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) @ stub _mbsset_l @ stub _mbsset_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b633d20e713..aaff43ea736 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1535,7 +1535,7 @@ @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) -@ stub _mbsrev_l +@ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) @ stub _mbsset_l @ stub _mbsset_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a5fdb346323..df0ea4c24da 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1546,7 +1546,7 @@ @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) -@ stub _mbsrev_l +@ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) @ stub _mbsset_l @ stub _mbsset_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d842d4362f1..687a73b5d8a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -850,7 +850,7 @@ @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) -@ stub _mbsrev_l +@ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) @ stub _mbsset_l @ stub _mbsset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2334b07957a..38ffcc7ca22 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -828,7 +828,7 @@ @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) -@ stub _mbsrev_l +@ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) @ stub _mbsset_l @ stub _mbsset_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cb48fac6fb6..e1aa5ab2d6f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -160,6 +160,11 @@ static inline unsigned char *u_strrchr( const unsigned char *s, unsigned char x return (unsigned char*) strrchr( (const char*)s, x ); } +static inline unsigned char* u__strrev(unsigned char *str) +{ + return (unsigned char*)_strrev((char *)str); +} + static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) { return (unsigned char*) _strset( (char*)s, c); @@ -2848,52 +2853,73 @@ size_t CDECL _mbscspn(const unsigned char* str, const unsigned char* cmp) } /********************************************************************* - * _mbsrev (MSVCRT.@) + * _mbsrev_l (MSVCRT.@) */ -unsigned char* CDECL _mbsrev(unsigned char* str) +unsigned char* CDECL _mbsrev_l(unsigned char* str, _locale_t locale) { - int i, len = _mbslen(str); - unsigned char *p, *temp=malloc(len*2); + int i, len; + unsigned char *p, *temp; + pthreadmbcinfo mbcinfo; + + if (!MSVCRT_CHECK_PMT(str)) + return NULL; + + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if (!mbcinfo->ismbcodepage) + return u__strrev(str); - if(!temp) + len = _mbslen_l(str, locale); + temp = malloc(len * 2); + if (!temp) return str; /* unpack multibyte string to temp buffer */ - p=str; - for(i=0; i<len; i++) + p = str; + for (i = 0; i < len; i++) { - if (_ismbblead(*p)) + if (_ismbblead_l(*p, locale)) { - temp[i*2]=*p++; - temp[i*2+1]=*p++; + temp[i * 2] = *p++; + temp[i * 2 + 1] = *p++; } else { - temp[i*2]=*p++; - temp[i*2+1]=0; + temp[i * 2] = *p++; + temp[i * 2 + 1] = 0; } } /* repack it in the reverse order */ - p=str; - for(i=len-1; i>=0; i--) + p = str; + for (i = len - 1; i >= 0; i--) { - if(_ismbblead(temp[i*2])) + if (_ismbblead_l(temp[i * 2], locale)) { - *p++=temp[i*2]; - *p++=temp[i*2+1]; + *p++ = temp[i * 2]; + *p++ = temp[i * 2 + 1]; } else { - *p++=temp[i*2]; + *p++ = temp[i * 2]; } } free(temp); - return str; } +/********************************************************************* + * _mbsrev (MSVCRT.@) + */ +unsigned char* CDECL _mbsrev(unsigned char* str) +{ + return _mbsrev_l(str, NULL); +} + /********************************************************************* * _mbspbrk_l (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b9947d4e885..a52016e6298 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -799,7 +799,7 @@ @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) -# stub _mbsrev_l(str ptr) +@ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) # stub _mbsset_l(ptr long ptr) # stub _mbsset_s(ptr long long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e0174dd897c..1f99c65ef05 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -694,7 +694,7 @@ @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) -@ stub _mbsrev_l +@ cdecl _mbsrev_l(str ptr) @ cdecl _mbsset(ptr long) @ stub _mbsset_l @ stub _mbsset_s @@ -1263,7 +1263,7 @@ @ cdecl _o__mbsrchr(str long) _mbsrchr @ cdecl _o__mbsrchr_l(str long ptr) _mbsrchr_l @ cdecl _o__mbsrev(str) _mbsrev -@ stub _o__mbsrev_l +@ cdecl _o__mbsrev_l(str ptr) _mbsrev_l @ cdecl _o__mbsset(ptr long) _mbsset @ stub _o__mbsset_l @ stub _o__mbsset_s

1 0