- Wine-Commits - list.winehq.org

Akihiro Sagawa : vkd3d-shader/hlsl: Add radians() function.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: e49362713042c458c520359094a1b774c56760d4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e49362713042c458c520359094a1b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 16 19:54:19 2023 +0900 vkd3d-shader/hlsl: Add radians() function. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 17 +++++++++++++++++ tests/hlsl/angle-unit.shader_test | 12 ++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2666194a..7d589819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,6 +46,7 @@ vkd3d_cross_tests = \ vkd3d_shader_tests = \ tests/hlsl/abs.shader_test \ tests/hlsl/all.shader_test \ + tests/hlsl/angle-unit.shader_test \ tests/hlsl/any.shader_test \ tests/hlsl/arithmetic-float-uniform.shader_test \ tests/hlsl/arithmetic-float.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5e0d48d3..a9ff41aa 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3341,6 +3341,22 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return !!add_pow_expr(ctx, params->instrs, params->args[0], params->args[1], loc); } +static bool intrinsic_radians(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *rad; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + /* 1 degree = pi/180 rad = 0.0174532925f rad */ + if (!(rad = hlsl_new_float_constant(ctx, 0.0174532925f, loc))) + return false; + hlsl_block_add_instr(params->instrs, rad); + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, rad, loc); +} + static bool intrinsic_reflect(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3869,6 +3885,7 @@ intrinsic_functions[] = {"mul", 2, true, intrinsic_mul}, {"normalize", 1, true, intrinsic_normalize}, {"pow", 2, true, intrinsic_pow}, + {"radians", 1, true, intrinsic_radians}, {"reflect", 2, true, intrinsic_reflect}, {"round", 1, true, intrinsic_round}, {"rsqrt", 1, true, intrinsic_rsqrt}, diff --git a/tests/hlsl/angle-unit.shader_test b/tests/hlsl/angle-unit.shader_test new file mode 100644 index 00000000..6e0538f9 --- /dev/null +++ b/tests/hlsl/angle-unit.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +uniform float4 a; + +float4 main() : sv_target +{ + return radians(a); +} + +[test] +uniform 0 float4 0.0 30.0 150.0 180.0 +draw quad +probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265)

1 0

Bartosz Kosiorek : msvcrt: Fix _mbsspn_l implementation.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: c94671324ea2a3c9185da0850a2be213d13fdcfb URL: https://gitlab.winehq.org/wine/wine/-/commit/c94671324ea2a3c9185da0850a2be2… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Nov 11 23:23:44 2023 +0100 msvcrt: Fix _mbsspn_l implementation. --- dlls/msvcrt/mbcs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 385274a44a4..1a595a44ced 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2791,6 +2791,9 @@ size_t CDECL _mbsspn_l(const unsigned char* string, { const unsigned char *p, *q; + if (!MSVCRT_CHECK_PMT(string && set)) + return 0; + for (p = string; *p; p++) { for (q = set; *q; q++)

1 0

Jacek Caban : ole32/tests: Remove unused variable.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 1bd4bcaa4a524d5bcfc2f768d150e417dc28b032 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bd4bcaa4a524d5bcfc2f768d150e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:35:19 2023 +0100 ole32/tests: Remove unused variable. --- dlls/ole32/tests/moniker.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9c583d27c47..75d24681ab5 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1144,13 +1144,12 @@ static IParseDisplayName ParseDisplayName = { &ParseDisplayName_Vtbl }; static int count_moniker_matches(IBindCtx * pbc, IEnumMoniker * spEM) { IMoniker * spMoniker; - int monCnt=0, matchCnt=0; + int matchCnt = 0; while ((IEnumMoniker_Next(spEM, 1, &spMoniker, NULL)==S_OK)) { HRESULT hr; WCHAR * szDisplayn; - monCnt++; hr=IMoniker_GetDisplayName(spMoniker, pbc, NULL, &szDisplayn); if (SUCCEEDED(hr)) {

1 0

Bartosz Kosiorek : msvcrt: Add _mbsspnp_l implementation.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 65f7d5ec484111c27abcec6811d5a92aa4bbd7bf URL: https://gitlab.winehq.org/wine/wine/-/commit/65f7d5ec484111c27abcec6811d5a9… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Nov 11 23:32:38 2023 +0100 msvcrt: Add _mbsspnp_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 | 15 +++++++++++++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f4baf442b53..79a201f4c17 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1186,7 +1186,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e9bdf422024..6a6d38db187 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1543,7 +1543,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 13dacc15744..13d7e401133 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1554,7 +1554,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91781c9c9e4..5b253b88234 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -858,7 +858,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2af41f8aea2..df989581d5e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -836,7 +836,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1a595a44ced..e6c0e944255 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2828,13 +2828,24 @@ size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) return _mbsspn_l(string, set, NULL); } +/********************************************************************* + * _mbsspnp_l (MSVCRT.@) + */ +unsigned char* CDECL _mbsspnp_l(const unsigned char* string, const unsigned char* set, _locale_t locale) +{ + if (!MSVCRT_CHECK_PMT(string && set)) + return 0; + + string += _mbsspn_l(string, set, locale); + return *string ? (unsigned char*)string : NULL; +} + /********************************************************************* * _mbsspnp (MSVCRT.@) */ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) { - string += _mbsspn( string, set ); - return *string ? (unsigned char*)string : NULL; + return _mbsspnp_l(string, set, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f54a437692f..72392a1847b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -807,7 +807,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -# stub _mbsspnp_l(str str ptr) +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) # stub _mbsstr_l(str str ptr) @ cdecl _mbstok(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7cf9b01aa4f..60ebe06ea82 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -702,7 +702,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) @@ -1271,7 +1271,7 @@ @ cdecl _o__mbsspn(str str) _mbsspn @ cdecl _o__mbsspn_l(str str ptr) _mbsspn_l @ cdecl _o__mbsspnp(str str) _mbsspnp -@ stub _o__mbsspnp_l +@ cdecl _o__mbsspnp_l(str str ptr) _mbsspnp_l @ cdecl _o__mbsstr(str str) _mbsstr @ stub _o__mbsstr_l @ cdecl _o__mbstok(str str) _mbstok

1 0

Tim Clem : msvcrt: Pass INT_MAX as the length in implementations of the _mbscoll family.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: adfb58f17d492c5451fdb5dfcf111303b9d1eaad URL: https://gitlab.winehq.org/wine/wine/-/commit/adfb58f17d492c5451fdb5dfcf1113… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Nov 16 12:01:59 2023 -0800 msvcrt: Pass INT_MAX as the length in implementations of the _mbscoll family. A length of -1 has no special meaning for the mbsn*coll functions, and since it is > INT_MAX, it will eventually trigger _invalid_parameter in _strnicmp_l in newer versions of msvcrt. --- dlls/msvcrt/mbcs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9b52170d4e9..385274a44a4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1118,7 +1118,7 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si */ int CDECL _mbsicoll_l(const unsigned char *str1, const unsigned char *str2, _locale_t locale) { - return _mbsnbicoll_l(str1, str2, -1, locale); + return _mbsnbicoll_l(str1, str2, INT_MAX, locale); } /********************************************************************* @@ -1138,7 +1138,7 @@ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) return CompareStringA(get_mbcinfo()->mblcid, NORM_IGNORECASE, (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; #else - return _mbsnbicoll_l(str, cmp, -1, NULL); + return _mbsnbicoll_l(str, cmp, INT_MAX, NULL); #endif } @@ -1164,7 +1164,7 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz */ int CDECL _mbscoll_l(const unsigned char *str1, const unsigned char *str2, _locale_t locale) { - return _mbsnbcoll_l(str1, str2, -1, locale); + return _mbsnbcoll_l(str1, str2, INT_MAX, locale); } /********************************************************************* @@ -1184,7 +1184,7 @@ int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp) return CompareStringA(get_mbcinfo()->mblcid, 0, (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; #else - return _mbsnbcoll_l(str, cmp, -1, NULL); + return _mbsnbcoll_l(str, cmp, INT_MAX, NULL); #endif }

1 0

Tim Clem : winemac.drv: Move surface-related logs to the bitblt channel.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 7c45c7c5ebb59237d568a4e5b38626422e670b63 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c45c7c5ebb59237d568a4e5b38626… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Nov 17 10:17:24 2023 -0800 winemac.drv: Move surface-related logs to the bitblt channel. The logs in this file are very noisy. x11drv uses the bitblt channel for its analogous messages. --- dlls/winemac.drv/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 5306e3b619f..8b238ff4853 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -29,7 +29,7 @@ #include "macdrv.h" #include "winuser.h" -WINE_DEFAULT_DEBUG_CHANNEL(macdrv); +WINE_DEFAULT_DEBUG_CHANNEL(bitblt); /* only for use on sanitized BITMAPINFO structures */

1 0

Paul Gofman : gdiplus: Round width and height in gdip_format_string().
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 5415eb7c3747063b2b92692c987eebceb0107207 URL: https://gitlab.winehq.org/wine/wine/-/commit/5415eb7c3747063b2b92692c987eeb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 16 21:37:15 2023 -0600 gdiplus: Round width and height in gdip_format_string(). --- dlls/gdiplus/graphics.c | 4 ++-- dlls/gdiplus/tests/graphics.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 371629a5bef..cc8411d54f7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5179,8 +5179,8 @@ GpStatus gdip_format_string(HDC hdc, if (!format) format = &default_drawstring_format; - nwidth = rect->Width; - nheight = rect->Height; + nwidth = (int)(rect->Width + 0.005f); + nheight = (int)(rect->Height + 0.005f); if (ignore_empty_clip) { if (!nwidth) nwidth = INT_MAX; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index de174257994..d71bc78c2ae 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4770,7 +4770,7 @@ static void test_measure_string(void) set_rect_empty(&rect); rect.Height = height; - rect.Width = width_2 - 0.05; + rect.Width = width_2 - 0.006; set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); @@ -4781,6 +4781,19 @@ static void test_measure_string(void) expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + set_rect_empty(&rect); + rect.Height = height; + rect.Width = width_2 - 0.004; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(2, glyphs); + expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(width_2, bounds.Width, 0.01); + expectf(height, bounds.Height); + /* Default (Near) alignment */ rect.X = 5.0; rect.Y = 5.0;

1 0

Jacek Caban : msi/tests: Initialize pathkey in test_installprops.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 93668319dd63add97036fbb79b5745c699117313 URL: https://gitlab.winehq.org/wine/wine/-/commit/93668319dd63add97036fbb79b5745… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:30:11 2023 +0100 msi/tests: Initialize pathkey in test_installprops. It could be used uninitialized on early no access return. --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3d7569499e5..75bb330db9d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5583,7 +5583,7 @@ static void test_installprops(void) CHAR path[MAX_PATH], buf[MAX_PATH]; DWORD size, type; LANGID langid; - HKEY hkey1, hkey2, pathkey; + HKEY hkey1, hkey2, pathkey = NULL; int res; UINT r; REGSAM access = KEY_ALL_ACCESS;

1 0

Zebediah Figura : wined3d: Trigger constant update when an SRV requiring NPOT fixup is bound.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: 60e4722bcfeb7c528f466a925acdc05b200e0994 URL: https://gitlab.winehq.org/wine/wine/-/commit/60e4722bcfeb7c528f466a925acdc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 16:40:10 2023 -0500 wined3d: Trigger constant update when an SRV requiring NPOT fixup is bound. Ported from state_sampler(). This is currently relevant to the case where a d3d11 device is created with a 9.x feature level—this will have resources bound via SRVs [and will therefore go through wined3d_context_gl_bind_shader_resources() rather than state_sampler()] but need not support ARB_texture_non_power_of_two. The NPOT non-requirement is explicitly called out in the d3d11 documentation, and because we need some degree of emulation for conditional NPOT textures, we need to hook that up for feature level 9.x d3d11 devices as well. Looking forward, d3d 1-9 will be normalized to creating internal SRVs and binding those through the d3d10+ path, so this will also be necessary for that reason. --- dlls/wined3d/context_gl.c | 12 ++++++------ dlls/wined3d/view.c | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 57fd182d926..bdea2879a51 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4290,12 +4290,6 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, context->shader_update_mask &= 1u << WINED3D_SHADER_TYPE_COMPUTE; } - if (context->constant_update_mask) - { - device->shader_backend->shader_load_constants(device->shader_priv, context, state); - context->constant_update_mask = 0; - } - if (context->update_shader_resource_bindings) { for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) @@ -4317,6 +4311,12 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); + if (context->constant_update_mask) + { + device->shader_backend->shader_load_constants(device->shader_priv, context, state); + context->constant_update_mask = 0; + } + context->last_was_blit = FALSE; context->last_was_ffp_blit = FALSE; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5729d5909e6..4b0ccea7bb2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1266,6 +1266,10 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); wined3d_sampler_gl_bind(sampler_gl, unit, texture_gl, context_gl); + + /* Trigger shader constant reloading (for NP2 texcoord fixup) */ + if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) + context_gl->c.constant_update_mask |= WINED3D_SHADER_CONST_PS_NP2_FIXUP; } /* Context activation is done by the caller. */

1 0

Jacek Caban : gdiplus: Remove unused variable.
by Alexandre Julliard Nov. 17, 2023

Nov. 17, 2023

Module: wine Branch: master Commit: e3709b0c9d0bdacfef9c837672d63677c69d7531 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3709b0c9d0bdacfef9c837672d636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:38:31 2023 +0100 gdiplus: Remove unused variable. --- dlls/gdiplus/pen.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 05acd54b36d..b463ca05f9b 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -629,7 +629,6 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, INT count) { INT i; - REAL sum = 0; TRACE("(%p, %p, %d)\n", pen, dash, count); @@ -640,7 +639,6 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, return OutOfMemory; for(i = 0; i < count; i++){ - sum += dash[i]; if(dash[i] <= 0.0) return InvalidParameter; }

1 0