November 2023 - Wine-Commits

Anton Baskanov : amstream: Use correct index in MediaStreamFilter's IEnumPins::Next().
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: a69c7a8aa09f88ce88e67e7192c9a59117c7d9fe URL: https://gitlab.winehq.org/wine/wine/-/commit/a69c7a8aa09f88ce88e67e7192c9a5… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 27 17:06:02 2023 +0700 amstream: Use correct index in MediaStreamFilter's IEnumPins::Next(). --- dlls/amstream/filter.c | 2 +- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index c1c97630bb9..0ca0f2e2a1c 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -94,7 +94,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, for (i = 0; i < count && enum_pins->index < enum_pins->count; ++i) { - IPin_AddRef(pins[i] = enum_pins->pins[i]); + IPin_AddRef(pins[i] = enum_pins->pins[enum_pins->index]); enum_pins->index++; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e75bddfc7d1..f1e17ef49cf 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1921,13 +1921,13 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); ref = get_refcount(filter); ok(ref == 4, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pin1); - todo_wine ok(ref == 5, "Got unexpected refcount %ld.\n", ref); + ok(ref == 5, "Got unexpected refcount %ld.\n", ref); IPin_Release(pins[0]); hr = IEnumPins_Next(enum1, 1, pins, NULL); @@ -1945,7 +1945,7 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, &count); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(count == 1, "Got count %lu.\n", count); - todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); hr = IEnumPins_Reset(enum1); @@ -1984,7 +1984,7 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum2, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); IEnumPins_Release(enum2);

1 0

Rémi Bernon : win32u: Remove unnecessary config_key lazy initializations.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 8e4c196c14779194b42f2c235c8f421c0d2f94c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e4c196c14779194b42f2c235c8f42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 19:12:36 2023 +0100 win32u: Remove unnecessary config_key lazy initializations. --- dlls/win32u/sysparams.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 471403440b6..d0fb0f6415a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -565,8 +565,7 @@ static BOOL adapter_get_registry_settings( const struct adapter *adapter, DEVMOD mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; - else if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_REGISTRY_SETTINGS, mode ); @@ -585,7 +584,6 @@ static BOOL adapter_set_registry_settings( const struct adapter *adapter, const mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { @@ -614,8 +612,7 @@ static BOOL adapter_get_current_settings( const struct adapter *adapter, DEVMODE mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; - else if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode ); @@ -634,7 +631,6 @@ static BOOL adapter_set_current_settings( const struct adapter *adapter, const D mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else {

1 0

Rémi Bernon : win32u: Initialize sysparams before winstation.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 7175d8855af8bdf30440c15e60681ea9df9e0382 URL: https://gitlab.winehq.org/wine/wine/-/commit/7175d8855af8bdf30440c15e60681e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 19:05:38 2023 +0100 win32u: Initialize sysparams before winstation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55843 --- dlls/win32u/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 396e2285797..1fb5044b2e5 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -249,8 +249,8 @@ DLGPROC get_dialog_proc( DLGPROC ret, BOOL ansi ) static void init_user(void) { gdi_init(); - winstation_init(); sysparams_init(); + winstation_init(); register_desktop_class(); }

1 0

Zhiyi Zhang : ntdll: Fix an out-of-bounds read (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 1ab1c9708745b9cbf5f9540cd799ebff654362d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ab1c9708745b9cbf5f9540cd799eb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:26:58 2023 +0800 ntdll: Fix an out-of-bounds read (Coverity). class FileRenameInformationEx to FileKnownFolderInformation could cause an out-of-bounds read of info_sizes. --- dlls/ntdll/unix/file.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 98e50082904..ee68e4dee9b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4264,7 +4264,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { - static const size_t info_sizes[] = + static const size_t info_sizes[FileMaximumInformation] = { 0, sizeof(FILE_DIRECTORY_INFORMATION), /* FileDirectoryInformation */ @@ -4331,6 +4331,18 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, 0, /* FileHardLinkFullIdInformation */ 0, /* FileIdExtdBothDirectoryInformation */ 0, /* FileDispositionInformationEx */ + 0, /* FileRenameInformationEx */ + 0, /* FileRenameInformationExBypassAccessCheck */ + 0, /* FileDesiredStorageClassInformation */ + 0, /* FileStatInformation */ + 0, /* FileMemoryPartitionInformation */ + 0, /* FileStatLxInformation */ + 0, /* FileCaseSensitiveInformation */ + 0, /* FileLinkInformationEx */ + 0, /* FileLinkInformationExBypassAccessCheck */ + 0, /* FileStorageReserveIdInformation */ + 0, /* FileCaseSensitiveInformationForceAccessCheck */ + 0, /* FileKnownFolderInformation */ }; struct stat st;

1 0

Zhiyi Zhang : wbemprox: Fix a memory leak (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: a2fdae65a173668186a828447688fa2404a3ac49 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2fdae65a173668186a828447688fa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:07:41 2023 +0800 wbemprox: Fix a memory leak (Coverity). When LsaLookupSids() fails with STATUS_NONE_MAPPED or STATUS_SOME_NOT_MAPPED, the memory returned by the domain parameter should be freed. --- dlls/wbemprox/builtin.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e751299e4e6..31df1f5c920 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3982,6 +3982,7 @@ static enum fill_status fill_sid( struct table *table, const struct expr *cond ) const WCHAR *str; struct record_sid *rec; UINT len; + NTSTATUS status; if (!(str = find_sid_str( cond ))) return FILL_STATUS_FAILED; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -3996,10 +3997,12 @@ static enum fill_status fill_sid( struct table *table, const struct expr *cond ) LocalFree( sid ); return FILL_STATUS_FAILED; } - if (LsaLookupSids( handle, 1, &sid, &domain, &name )) + if ((status = LsaLookupSids( handle, 1, &sid, &domain, &name ))) { LocalFree( sid ); LsaClose( handle ); + if (status == STATUS_NONE_MAPPED || status == STATUS_SOME_NOT_MAPPED) + LsaFreeMemory( domain ); return FILL_STATUS_FAILED; }

1 0

Nikolay Sivov : oleaut32: Always reset return type for VarMod().
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 5e9663c064cbfdc39dac885b1954d351141ee349 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e9663c064cbfdc39dac885b1954d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 26 23:32:46 2023 +0100 oleaut32: Always reset return type for VarMod(). --- dlls/oleaut32/tests/vartest.c | 7 +++++++ dlls/oleaut32/variant.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c2b5b4113d7..4751070827c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3518,8 +3518,15 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected hres = pVarMod( left, right, &result ); ok_(__FILE__,line)( hres == expres, "wrong result %lx/%lx\n", hres, expres ); if (hres == S_OK) + { ok_(__FILE__,line)( is_expected_variant( &result, expected ), "got %s expected %s\n", variantstr(&result), variantstr(expected) ); + } + else + { + ok_(__FILE__,line)( V_VT(&result) == VT_EMPTY, "Unexpected type %d.\n", V_VT(&result) ); + ok_(__FILE__,line)( V_I4(&result) == 0x12345, "Unexpected value %ld.\n", V_I4(&result) ); + } } #define VARMOD(vt1,vt2,val1,val2,rvt,rval) \ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 9e1fefe9705..bb1e83e9b7e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5410,6 +5410,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) VariantInit(&tempRight); VariantInit(&lv); VariantInit(&rv); + V_VT(result) = VT_EMPTY; TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result);

1 0

Zhiyi Zhang : ntdll: Fix a memory leak (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 2146a4428933b3f582ac533de3393ae9075627d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2146a4428933b3f582ac533de3393a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:00:15 2023 +0800 ntdll: Fix a memory leak (Coverity). --- dlls/ntdll/unix/security.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 76a5cc3f253..3f66d959373 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -87,7 +87,10 @@ NTSTATUS WINAPI NtCreateToken( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIB } if (primary_group == -1) + { + free( objattr ); return STATUS_INVALID_PRIMARY_GROUP; + } groups_info = malloc( groups_size ); if (!groups_info)

1 0

Nikolay Sivov : oleaut32: Fully initialize VarMod() return value for Empty % x case.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: bda6decd473f0dd5a32ed6fe4a6cc55ab7a14bad URL: https://gitlab.winehq.org/wine/wine/-/commit/bda6decd473f0dd5a32ed6fe4a6cc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 26 23:29:32 2023 +0100 oleaut32: Fully initialize VarMod() return value for Empty % x case. --- dlls/oleaut32/tests/vartest.c | 3 ++- dlls/oleaut32/variant.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index cf93e4cd5fc..c2b5b4113d7 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3513,7 +3513,8 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected VARIANT result; HRESULT hres; - memset( &result, 0, sizeof(result) ); + V_VT(&result) = 15; + V_I4(&result) = 0x12345; hres = pVarMod( left, right, &result ); ok_(__FILE__,line)( hres == expres, "wrong result %lx/%lx\n", hres, expres ); if (hres == S_OK) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b3c96b18c2b..9e1fefe9705 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5499,6 +5499,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) if(V_VT(left) == VT_EMPTY) { V_VT(result) = VT_I4; + V_I4(result) = 0; rc = S_OK; goto end; }

1 0

Zhiyi Zhang : ntdll: Fix an out-of-bounds write (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: aeda480e2a0a1b83dc738c3419b3827fd70ac197 URL: https://gitlab.winehq.org/wine/wine/-/commit/aeda480e2a0a1b83dc738c3419b382… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:17:34 2023 +0800 ntdll: Fix an out-of-bounds write (Coverity). --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a6f1382a5fa..5516831a7b7 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -874,7 +874,7 @@ static void fill_performance_core_info(void) for(i = beg; i <= end; i++) { - if (i / 32 > performance_cores_capacity) + if (i / 32 >= performance_cores_capacity) { p = realloc(performance_cores, performance_cores_capacity * 2 * sizeof(ULONG)); if (!p) goto done;

1 0

Zhiyi Zhang : wined3d: Fix a use after free (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 7391352a39ac8af37bd76620b51646791b812279 URL: https://gitlab.winehq.org/wine/wine/-/commit/7391352a39ac8af37bd76620b51646… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 22:27:42 2023 +0800 wined3d: Fix a use after free (Coverity). s is freed in set_window_state_thread(). --- dlls/wined3d/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c30c43734c0..8a02847c840 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2199,8 +2199,6 @@ static void set_window_state(struct wined3d_window_state *s) * messages. */ if (window_tid == tid) { - set_window_state_thread(s); - /* Deus Ex: Game of the Year Edition removes WS_EX_TOPMOST after changing resolutions in * exclusive fullscreen mode. Tests show that WS_EX_TOPMOST will be restored when a ~1.5s * timer times out */ @@ -2211,6 +2209,8 @@ static void set_window_state(struct wined3d_window_state *s) else KillTimer(s->window, WINED3D_WINDOW_TOPMOST_TIMER_ID); } + + set_window_state_thread(s); } else if ((thread = CreateThread(NULL, 0, set_window_state_thread, s, 0, NULL))) {

1 0