October 2023 - Wine-commits

Akihiro Sagawa : cmd: Reset totals after trailer output.
by Alexandre Julliard 24 Oct '23

24 Oct '23

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

Jacek Caban : wined3d: Use return type to return result from read_dword.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 947060bfcc381d41843348652623b0e4350a9462 URL: https://gitlab.winehq.org/wine/wine/-/commit/947060bfcc381d41843348652623b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:36:58 2023 +0200 wined3d: Use return type to return result from read_dword. Avoid implicit casts from enum pointers. --- dlls/wined3d/shader_sm4.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f76bd693b3b..4af1a5b43ba 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1853,10 +1853,12 @@ struct aon9_header unsigned int byte_code_offset; }; -static void read_dword(const char **ptr, unsigned int *d) +static unsigned int read_dword(const char **ptr) { - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); + unsigned int ret; + memcpy(&ret, *ptr, sizeof(ret)); + *ptr += sizeof(ret); + return ret; } static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) @@ -1872,7 +1874,7 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { - read_dword(ptr, &d); + d = read_dword(ptr); WARN("\t0x%08x\n", d); } } @@ -1906,7 +1908,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int return E_INVALIDARG; } - read_dword(&ptr, &count); + count = read_dword(&ptr); TRACE("%u elements.\n", count); skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */ @@ -1931,24 +1933,24 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int unsigned int name_offset; if (has_stream_index) - read_dword(&ptr, &e[i].stream_idx); + e[i].stream_idx = read_dword(&ptr); else e[i].stream_idx = 0; - read_dword(&ptr, &name_offset); + name_offset = read_dword(&ptr); if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) { WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); heap_free(e); return E_INVALIDARG; } - read_dword(&ptr, &e[i].semantic_idx); - read_dword(&ptr, &e[i].sysval_semantic); - read_dword(&ptr, &e[i].component_type); - read_dword(&ptr, &e[i].register_idx); - read_dword(&ptr, &e[i].mask); + e[i].semantic_idx = read_dword(&ptr); + e[i].sysval_semantic = read_dword(&ptr); + e[i].component_type = read_dword(&ptr); + e[i].register_idx = read_dword(&ptr); + e[i].mask = read_dword(&ptr); if (has_min_precision) - read_dword(&ptr, &e[i].min_precision); + e[i].min_precision = read_dword(&ptr); else e[i].min_precision = 0;

1 0

Jacek Caban : wined3d: Remove unused parallel_point_count variable.
by Alexandre Julliard 24 Oct '23

24 Oct '23

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

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

24 Oct '23

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

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

24 Oct '23

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 : makedep: Replace sprintf with snprintf to avoid a deprecation warning on macOS.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: c17d1adb6ef961ce557408141791b910945b74ed URL: https://gitlab.winehq.org/wine/wine/-/commit/c17d1adb6ef961ce557408141791b9… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 14:02:21 2023 -0500 makedep: Replace sprintf with snprintf to avoid a deprecation warning on macOS. --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8495d93d8c6..e35de8a00f3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3898,7 +3898,7 @@ static FILE *create_temp_file( const char *orig ) for (i = 0; i < 100; i++) { - sprintf( name, "%s.tmp%08x", orig, id ); + snprintf( name, strlen(orig) + 13, "%s.tmp%08x", orig, id ); if ((fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0666 )) != -1) { ret = fdopen( fd, "w" );

1 0

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

24 Oct '23

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 24 Oct '23

24 Oct '23

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

Brendan Shanks : wpcap: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 2c487406ae52a3b50a2bd7895f2b50e7344ca096 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c487406ae52a3b50a2bd7895f2b50… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 20:19:00 2023 -0500 wpcap: Ensure unixlib function tables and enum stay in sync. --- dlls/wpcap/unixlib.c | 4 ++++ dlls/wpcap/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 55069fac79e..4f5c2337b10 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -498,6 +498,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = wrap_tstamp_type_val_to_name, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -961,6 +963,8 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_tstamp_type_val_to_name, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ #endif /* HAVE_PCAP_PCAP_H */ diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 668658089f3..d13d62a97aa 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -379,4 +379,5 @@ enum pcap_funcs unix_tstamp_type_name_to_val, unix_tstamp_type_val_to_description, unix_tstamp_type_val_to_name, + unix_funcs_count };

1 0

Brendan Shanks : winscard: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 24 Oct '23

24 Oct '23

Module: wine Branch: master Commit: 2e2f9bdb65c237d2e4f9b6bf560708b489195ec6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e2f9bdb65c237d2e4f9b6bf560708… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 20:52:37 2023 -0500 winscard: Ensure unixlib function tables and enum stay in sync. --- dlls/winscard/unixlib.c | 4 ++++ dlls/winscard/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index d332b404a58..f1228b0eef6 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -354,6 +354,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_set_attrib, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -705,4 +707,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_scard_set_attrib, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index ecb1b40ef68..7dda417705f 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -184,4 +184,5 @@ enum winscard_funcs unix_scard_control, unix_scard_get_attrib, unix_scard_set_attrib, + unix_funcs_count };

1 0