October 2023 - Wine-Commits

Jacek Caban : wined3d: Remove unused parallel_point_count variable.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 82e670117828ad1475b41e7e036db8f019d94ec6 URL: https://gitlab.winehq.org/wine/wine/-/commit/82e670117828ad1475b41e7e036db8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:39:02 2023 +0200 wined3d: Remove unused parallel_point_count variable. --- dlls/wined3d/glsl_shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9ab3f722d31..1e7a1195f8b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1643,7 +1643,6 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context DWORD point_count = 0; DWORD spot_count = 0; DWORD directional_count = 0; - DWORD parallel_point_count = 0; for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { @@ -1662,7 +1661,6 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context ++directional_count; break; case WINED3D_LIGHT_PARALLELPOINT: - ++parallel_point_count; break; default: FIXME("Unhandled light type %#x.\n", state->light_state.lights[i]->OriginalParms.type);

1 0

Brendan Shanks : winemac.drv: Replace sprintf with snprintf to avoid deprecation warnings.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 26201ca92df4c2b8b01449a61ce864d5084f930d URL: https://gitlab.winehq.org/wine/wine/-/commit/26201ca92df4c2b8b01449a61ce864… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Oct 20 14:48:29 2023 -0700 winemac.drv: Replace sprintf with snprintf to avoid deprecation warnings. --- dlls/winemac.drv/clipboard.c | 2 +- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/macdrv_main.c | 4 ++-- dlls/winemac.drv/mouse.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 91e954d0ab5..ef0c3ae9c25 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -569,7 +569,7 @@ static void *import_html(CFDataRef data, size_t *ret_size) if ((ret = malloc(total))) { char *p = ret; - p += sprintf(p, header, total - 1, len, len + size + 1 /* include the final \n in the data */); + p += snprintf(p, total, header, total - 1, len, len + size + 1 /* include the final \n in the data */); CFDataGetBytes(data, CFRangeMake(0, size), (UInt8*)p); strcpy(p + size, trailer); *ret_size = total; diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index c1963daa56e..bf1daa7a5df 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1361,7 +1361,7 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (!len) { char name[16]; - len = sprintf(name, "Key 0x%02x", vkey); + len = snprintf(name, sizeof(name), "Key 0x%02x", vkey); len = min(len + 1, size); ascii_to_unicode(buffer, name, len); if (len) buffer[--len] = 0; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 54c5ee6c93a..b40bf02f267 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -131,13 +131,13 @@ HKEY open_hkcu_key(const char *name) return 0; sid = ((TOKEN_USER *)sid_data)->User.Sid; - len = sprintf(buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + len = snprintf(buffer, sizeof(buffer), "\\Registry\\User\\S-%u-%u", sid->Revision, (unsigned int)MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4]), MAKEWORD(sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2]))); for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf(buffer + len, "-%u", (unsigned int)sid->SubAuthority[i]); + len += snprintf(buffer + len, sizeof(buffer) - len, "-%u", (unsigned int)sid->SubAuthority[i]); ascii_to_unicode(bufferW, buffer, len); hkcu = reg_open_key(NULL, bufferW, len * sizeof(WCHAR)); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 5c04c71e1dc..2f05a33a8b5 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -187,7 +187,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) else { char buf[16]; - sprintf(buf, "%hu", info->wResID); + snprintf(buf, sizeof(buf), "%hu", info->wResID); asciiz_to_unicode(p, buf); }

1 0

Brendan Shanks : ctapi32: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: e0237f779839e873f1b10e539f8884f2600d3171 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0237f779839e873f1b10e539f8884… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 15:00:13 2023 -0500 ctapi32: Ensure unixlib function tables and enum stay in sync. --- dlls/ctapi32/unixlib.c | 4 ++++ dlls/ctapi32/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/ctapi32/unixlib.c b/dlls/ctapi32/unixlib.c index cdfe6e6eb73..09dde403d60 100644 --- a/dlls/ctapi32/unixlib.c +++ b/dlls/ctapi32/unixlib.c @@ -89,6 +89,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ct_close, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -129,4 +131,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = ct_close, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/ctapi32/unixlib.h b/dlls/ctapi32/unixlib.h index 535c2aeae09..695d5d733d2 100644 --- a/dlls/ctapi32/unixlib.h +++ b/dlls/ctapi32/unixlib.h @@ -60,4 +60,5 @@ enum ctapi_funcs unix_ct_init, unix_ct_data, unix_ct_close, + unix_funcs_count };

1 0

Brendan Shanks : dnsapi: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 4dc31f923b3cca3df5bf253619cf58c9d5c4adb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4dc31f923b3cca3df5bf253619cf58… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 15:16:12 2023 -0500 dnsapi: Ensure unixlib function tables and enum stay in sync. --- dlls/dnsapi/dnsapi.h | 1 + dlls/dnsapi/libresolv.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 89324dd9c29..eff5e3582cf 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -127,6 +127,7 @@ enum unix_funcs unix_get_serverlist, unix_set_serverlist, unix_query, + unix_funcs_count }; #define RESOLV_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index fd645d53fd7..d68ca1fd9bf 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -344,6 +344,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = resolv_query, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -415,6 +417,8 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_resolv_query, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ #endif /* HAVE_RESOLV */

1 0

Jacek Caban : wined3d: Use unsigned type for res_type bit field.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 4a05c6311e81218acc2edbc8564e3bac8486ce95 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a05c6311e81218acc2edbc8564e3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:45:43 2023 +0200 wined3d: Use unsigned type for res_type bit field. Fixes -Wbitfield-constant-conversion when enum is signed, causing WINED3D_GL_RES_TYPE_TEX_RECT value to be truncated to -4. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 806fae6b522..0773c3e34d9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6927,7 +6927,7 @@ const struct wined3d_fragment_pipe_ops arbfp_fragment_pipeline = struct arbfp_blit_type { enum complex_fixup fixup : 4; - enum wined3d_gl_resource_type res_type : 3; + unsigned int res_type : 3; DWORD use_color_key : 1; DWORD padding : 24; };

1 0

Esme Povirk : mscoree: Update Wine Mono to 8.1.0.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 9c1ffb545f350743e71cdfcc0dae5e98324d10ee URL: https://gitlab.winehq.org/wine/wine/-/commit/9c1ffb545f350743e71cdfcc0dae5e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Oct 23 10:06:17 2023 -0500 mscoree: Update Wine Mono to 8.1.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index bcf92efdb80..a2957c3040a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -56,10 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "8.0.0" +#define MONO_VERSION "8.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "75b3f45dca1dc89857fe9e932da78710f64cc6d49ef1ab0c723a177085b4711b" +#define MONO_SHA "0ed3ec533aef79b2f312155931cf7b1080009ac0c5b4c2bcfeb678ac948e0810" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 50ed656a656..dcbb531770b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "8.0.0" +#define WINE_MONO_VERSION "8.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 0df6a6029f9..aaae5671843 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.4 - MONO_VER: 8.0.0 + MONO_VER: 8.1.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0

Akihiro Sagawa : cmd: Reset totals after trailer output.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 30e0deb70e7d3cda36a46b3462c1135aeec266d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/30e0deb70e7d3cda36a46b3462c113… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 23 22:09:18 2023 +0900 cmd: Reset totals after trailer output. Otherwise, sums are inherited between drives. For instance, dir /s z:\tmp c:\windows\system32\drivers\etc shows an incorrect summary for drive c. --- programs/cmd/directory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 4d3ae3f9c7d..709bbb52287 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -937,6 +937,7 @@ void WCMD_directory (WCHAR *args) if (lastDrive != '?') { trailerReqd = FALSE; WCMD_dir_trailer(prevEntry->dirName); + byte_total = file_total = dir_total = 0; } lastDrive = towupper(thisEntry->dirName[0]);

1 0

Zebediah Figura : d3d10core/tests: Avoid POINT sampling exactly halfway between two mip levels.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: e50b5ce778052d29021ca17e192d7db947c0d36e URL: https://gitlab.winehq.org/wine/wine/-/commit/e50b5ce778052d29021ca17e192d7d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 23 20:41:53 2023 -0500 d3d10core/tests: Avoid POINT sampling exactly halfway between two mip levels. This gives different results on llvmpipe. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53213 --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b337c05f056..a8283da9c18 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -7448,10 +7448,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.5f, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.6f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.4f, level_1_colors}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.5f, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.6f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 4.0f, level_2_colors},

1 0

Zebediah Figura : d3d11/tests: Avoid POINT sampling exactly halfway between two mip levels.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 552a46ea78cc8bedc3d012040bfc70ce8d6f4666 URL: https://gitlab.winehq.org/wine/wine/-/commit/552a46ea78cc8bedc3d012040bfc70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 23 20:42:23 2023 -0500 d3d11/tests: Avoid POINT sampling exactly halfway between two mip levels. This gives different results on llvmpipe. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53213 --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3bf3fa44d97..1b33664befd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9830,10 +9830,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.5f, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.6f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.4f, level_1_colors}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.5f, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.6f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 4.0f, level_2_colors},

1 0

Jinoh Kang : ntdll/tests: Use win_skip() for missing APIs in test_query_process_debug_port_custom_dacl.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 4a7bba9087302102129daff4df987b2cc67f4917 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a7bba9087302102129daff4df987b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 21 20:30:28 2023 +0900 ntdll/tests: Use win_skip() for missing APIs in test_query_process_debug_port_custom_dacl. A missing API is a todo in Wine. --- dlls/ntdll/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 3b9bad56ea4..3cedca0d6ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2228,13 +2228,13 @@ static void test_query_process_debug_port_custom_dacl(int argc, char **argv) if (!pDbgUiSetThreadDebugObject) { - skip("DbgUiGetThreadDebugObject not found\n"); + win_skip("DbgUiGetThreadDebugObject not found\n"); return; } if (!pDbgUiGetThreadDebugObject) { - skip("DbgUiSetThreadDebugObject not found\n"); + win_skip("DbgUiSetThreadDebugObject not found\n"); return; }

1 0