May 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : windows.gaming.input: Implement IRampForceEffect_SetParameters(WithEnvelope).
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 081a2891267aa65b4e8e5eb50d8d6b663a701b46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081a2891267aa65b4e8e5eb5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 16:00:55 2022 +0200 windows.gaming.input: Implement IRampForceEffect_SetParameters(WithEnvelope). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 6 +--- dlls/windows.gaming.input/force_feedback.c | 9 +++++- dlls/windows.gaming.input/provider.idl | 13 +++++++++ dlls/windows.gaming.input/ramp_effect.c | 47 ++++++++++++++++++++++++++---- 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 8d06cdda3d8..acd12f22401 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5604,7 +5604,6 @@ static void test_windows_gaming_input(void) .report_id = 10, .report_len = 6, .report_buf = {10,0x01,0xc8,0x00,0x20,0x03}, - .todo = TRUE, }, /* set envelope */ { @@ -5612,14 +5611,13 @@ static void test_windows_gaming_input(void) .report_id = 8, .report_len = 8, .report_buf = {8,0x01,0x19,0x4c,0x14,0x00,0x3c,0x00}, - .todo = TRUE, }, /* update effect */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, - .report_buf = {3,0x01,0x05,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, + .report_buf = {3,0x01,0x05,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0xce,0x00,0x00,0x00}, .wine_only = TRUE, .todo = TRUE, }, @@ -6399,11 +6397,9 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); hr = IRampForceEffect_SetParameters( ramp_effect, direction, end_direction, duration ); - todo_wine ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); hr = IRampForceEffect_SetParametersWithEnvelope( ramp_effect, direction, end_direction, 0.1, 0.2, 0.3, delay, attack_duration, duration, release_duration, 1 ); - todo_wine ok( hr == S_OK, "SetParametersWithEnvelope returned %#lx\n", hr ); IRampForceEffect_Release( ramp_effect ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index ce30db14cd9..2ed272916c9 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -131,7 +131,14 @@ static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl * break; case WineForceFeedbackEffectType_Ramp: - FIXME("stub!\n"); + impl->repeat_count = params.ramp.repeat_count; + impl->ramp_force.lStart = round( params.ramp.gain * params.ramp.start_vector.X * 10000 ); + impl->ramp_force.lEnd = round( params.ramp.gain * params.ramp.end_vector.X * 10000 ); + impl->params.dwDuration = params.ramp.duration.Duration / 10; + impl->params.dwStartDelay = params.ramp.start_delay.Duration / 10; + impl->directions[0] = round( -params.ramp.start_vector.X * 10000 ); + impl->directions[1] = round( -params.ramp.start_vector.Y * 10000 ); + impl->directions[2] = round( -params.ramp.start_vector.Z * 10000 ); break; case WineForceFeedbackEffectType_Periodic_SineWave: diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl index 16d394e7afa..3baac4fe77d 100644 --- a/dlls/windows.gaming.input/provider.idl +++ b/dlls/windows.gaming.input/provider.idl @@ -38,6 +38,7 @@ namespace Windows.Gaming.Input.Custom { typedef struct WineGameControllerState WineGameControllerState; typedef struct WineGameControllerVibration WineGameControllerVibration; typedef struct WineConstantEffectParameters WineConstantEffectParameters; + typedef struct WineRampEffectParameters WineRampEffectParameters; typedef struct WineForceFeedbackEffectEnvelope WineForceFeedbackEffectEnvelope; typedef union WineForceFeedbackEffectParameters WineForceFeedbackEffectParameters; interface IWineGameControllerProvider; @@ -100,6 +101,17 @@ namespace Windows.Gaming.Input.Custom { FLOAT gain; }; + struct WineRampEffectParameters + { + WineForceFeedbackEffectType type; + Windows.Foundation.Numerics.Vector3 start_vector; + Windows.Foundation.Numerics.Vector3 end_vector; + Windows.Foundation.TimeSpan duration; + Windows.Foundation.TimeSpan start_delay; + UINT32 repeat_count; + FLOAT gain; + }; + struct WineForceFeedbackEffectEnvelope { FLOAT attack_gain; @@ -112,6 +124,7 @@ namespace Windows.Gaming.Input.Custom { { WineForceFeedbackEffectType type; WineConstantEffectParameters constant; + WineRampEffectParameters ramp; }; [ diff --git a/dlls/windows.gaming.input/ramp_effect.c b/dlls/windows.gaming.input/ramp_effect.c index 0a719b3e2a6..a498942cabe 100644 --- a/dlls/windows.gaming.input/ramp_effect.c +++ b/dlls/windows.gaming.input/ramp_effect.c @@ -99,9 +99,23 @@ static HRESULT WINAPI effect_GetTrustLevel( IRampForceEffect *iface, TrustLevel static HRESULT WINAPI effect_SetParameters( IRampForceEffect *iface, Vector3 start_vector, Vector3 end_vector, TimeSpan duration ) { - FIXME( "iface %p, start_vector %s, end_vector %s, duration %I64u stub!\n", iface, + WineForceFeedbackEffectParameters params = + { + .ramp = + { + .type = WineForceFeedbackEffectType_Ramp, + .start_vector = start_vector, + .end_vector = end_vector, + .duration = duration, + .repeat_count = 1, + }, + }; + struct ramp_effect *impl = impl_from_IRampForceEffect( iface ); + + TRACE( "iface %p, start_vector %s, end_vector %s, duration %I64u.\n", iface, debugstr_vector3( &start_vector ), debugstr_vector3( &end_vector ), duration.Duration ); - return E_NOTIMPL; + + return IWineForceFeedbackEffectImpl_put_Parameters( impl->IWineForceFeedbackEffectImpl_inner, params, NULL ); } static HRESULT WINAPI effect_SetParametersWithEnvelope( IRampForceEffect *iface, Vector3 start_vector, Vector3 end_vector, FLOAT attack_gain, @@ -109,11 +123,34 @@ static HRESULT WINAPI effect_SetParametersWithEnvelope( IRampForceEffect *iface, TimeSpan attack_duration, TimeSpan sustain_duration, TimeSpan release_duration, UINT32 repeat_count ) { - FIXME( "iface %p, start_vector %s, end_vector %s, attack_gain %f, sustain_gain %f, release_gain %f, start_delay %I64u, attack_duration %I64u, " - "sustain_duration %I64u, release_duration %I64u, repeat_count %u stub!\n", iface, debugstr_vector3( &start_vector ), debugstr_vector3( &end_vector ), + WineForceFeedbackEffectParameters params = + { + .ramp = + { + .type = WineForceFeedbackEffectType_Ramp, + .start_vector = start_vector, + .end_vector = end_vector, + .duration = {attack_duration.Duration + sustain_duration.Duration + release_duration.Duration}, + .start_delay = start_delay, + .repeat_count = repeat_count, + .gain = sustain_gain, + }, + }; + WineForceFeedbackEffectEnvelope envelope = + { + .attack_gain = attack_gain, + .release_gain = release_gain, + .attack_duration = attack_duration, + .release_duration = release_duration, + }; + struct ramp_effect *impl = impl_from_IRampForceEffect( iface ); + + TRACE( "iface %p, start_vector %s, end_vector %s, attack_gain %f, sustain_gain %f, release_gain %f, start_delay %I64u, attack_duration %I64u, " + "sustain_duration %I64u, release_duration %I64u, repeat_count %u.\n", iface, debugstr_vector3( &start_vector ), debugstr_vector3( &end_vector ), attack_gain, sustain_gain, release_gain, start_delay.Duration, attack_duration.Duration, sustain_duration.Duration, release_duration.Duration, repeat_count ); - return E_NOTIMPL; + + return IWineForceFeedbackEffectImpl_put_Parameters( impl->IWineForceFeedbackEffectImpl_inner, params, &envelope ); } static const struct IRampForceEffectVtbl effect_vtbl =

1 0

Rémi Bernon : dinput: Make sure converted direction values are always positive.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 11cb3bbf6908261458e8b6c0ad44f7daab8b9266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11cb3bbf6908261458e8b6c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 29 15:58:40 2022 +0200 dinput: Make sure converted direction values are always positive. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 1 + dlls/dinput/tests/force_feedback.c | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 07cf2e6158d..1f4b300be74 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2307,6 +2307,7 @@ static void convert_directions_to_spherical( const DIEFFECT *in, DIEFFECT *out ) for (j = 1; j < i; ++j) tmp = sqrt( tmp * tmp + in->rglDirection[j] * in->rglDirection[j] ); tmp = atan2( in->rglDirection[i], tmp ); out->rglDirection[i - 1] = tmp * 18000 / M_PI; + if (out->rglDirection[i - 1] < 0) out->rglDirection[i - 1] += 36000; } if (in->cAxes) out->rglDirection[in->cAxes - 1] = 0; out->cAxes = in->cAxes; diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 05b0ad9c427..c471a80de00 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5476,20 +5476,11 @@ static void test_windows_gaming_input(void) .report_buf = {8,0x01,0x4c,0x7f,0x28,0x00,0x50,0x00}, }, /* update effect */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 18, - .report_buf = {3,0x01,0x02,0x08,0x78,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0xce,0x00,0x00,0x00}, - .wine_only = TRUE, - .todo = TRUE, - }, { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, .report_buf = {3,0x01,0x02,0x08,0x78,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, - .todo = TRUE, }, }; struct hid_expect expect_create_condition[] = @@ -5554,20 +5545,11 @@ static void test_windows_gaming_input(void) .report_buf = {8,0x01,0x19,0x4c,0x14,0x00,0x3c,0x00}, }, /* update effect */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 18, - .report_buf = {3,0x01,0x04,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0x7f,0xce,0x00,0x00,0x00}, - .wine_only = TRUE, - .todo = TRUE, - }, { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, .report_buf = {3,0x01,0x04,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0x7f,0x4e,0x01,0x00,0x00}, - .todo = TRUE, }, }; struct hid_expect expect_create_ramp[] = @@ -5601,20 +5583,11 @@ static void test_windows_gaming_input(void) .report_buf = {8,0x01,0x19,0x4c,0x14,0x00,0x3c,0x00}, }, /* update effect */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 18, - .report_buf = {3,0x01,0x05,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0xce,0x00,0x00,0x00}, - .wine_only = TRUE, - .todo = TRUE, - }, { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, .report_buf = {3,0x01,0x05,0x08,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, - .todo = TRUE, }, }; struct hid_expect expect_effect_start =

1 0

Fabian Maurer : kernel32: Prevent null pointer dereference in WritePrivateProfileStructW.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: f391e9cf1ed597dd2d427ebef240b6c4244e2201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f391e9cf1ed597dd2d427ebe… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 16 19:29:10 2022 +0200 kernel32: Prevent null pointer dereference in WritePrivateProfileStructW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49285 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 5 +++++ dlls/kernel32/tests/profile.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index e70874fa36f..bf1a9170896 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -2044,9 +2044,14 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, LPWSTR outstring, p; DWORD sum = 0; + TRACE("(%s %s %p %u %s)\n", debugstr_w(section), debugstr_w(key), buf, bufsize, debugstr_w(filename)); + if (!section && !key && !buf) /* flush the cache */ return WritePrivateProfileStringW( NULL, NULL, NULL, filename ); + if (!buf) + return WritePrivateProfileStringW(section, key, NULL, filename); + /* allocate string buffer for hex chars + checksum hex char + '\0' */ outstring = HeapAlloc( GetProcessHeap(), 0, (bufsize*2 + 2 + 1) * sizeof(WCHAR) ); p = outstring; diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 71d945f81df..18e12690f18 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1109,6 +1109,7 @@ static void test_WritePrivateProfileString(void) static void test_profile_struct(void) { static const char expect_data[] = "[s]\r\nkey=616261637573006F\r\n"; + static const char expect_data_empty[] = "[s]\r\n"; char buffer[20]; BOOL ret; @@ -1173,6 +1174,11 @@ static void test_profile_struct(void) ok(!ret, "expected failure\n"); todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %lu\n", GetLastError()); + /* Test deleting struct */ + ret = WritePrivateProfileStructA("s", "key", NULL, sizeof("abacus"), "./winetest.ini"); + ok(ret, "got error %lu\n", GetLastError()); + ok(check_file_data("./winetest.ini", expect_data_empty), "file doesn't match\n"); + ret = DeleteFileA("./winetest.ini"); ok(ret, "got error %lu\n", GetLastError()); }

1 0

Brendan Shanks : include: Add __WINE_DEALLOC attribute and use it for allocation functions.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: eb55f64d525e7e10c3ac178becd3ae7565560011 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb55f64d525e7e10c3ac178b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Apr 29 09:04:09 2022 -0700 include: Add __WINE_DEALLOC attribute and use it for allocation functions. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 16 ++++++++-------- include/objbase.h | 4 ++-- include/oleauto.h | 6 +++--- include/rpcndr.h | 10 +++++----- include/winbase.h | 18 +++++++++--------- include/wincrypt.h | 4 ++-- include/winnt.h | 6 ++++++ include/winternl.h | 3 ++- 8 files changed, 37 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb55f64d525e7e10c3ac…

1 0

Rémi Bernon : dinput/tests: Remove IAsyncOperation reference count checks.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 0c6f463fe10aa554c67891e30ce338f73662bccb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c6f463fe10aa554c67891e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 18 09:59:29 2022 +0200 dinput/tests: Remove IAsyncOperation reference count checks. They are unreliable as the worker thread is holding a reference on the async operation itself. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 696828df3fc..9cf636880c0 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -6093,8 +6093,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( result_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_result_async( result_async, 1, Error, 0x86854008, ForceFeedbackLoadEffectResult_EffectNotSupported ); - ref = IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); hr = IForceFeedbackEffect_Start( effect ); todo_wine @@ -6149,8 +6148,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( result_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); - ref = IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); set_hid_expect( file, NULL, 0 ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); @@ -6184,8 +6182,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( bool_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); ref = IForceFeedbackEffect_Release( effect ); @@ -6249,8 +6246,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( result_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); - ref = IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); set_hid_expect( file, NULL, 0 ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); @@ -6284,8 +6280,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( bool_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); ref = IForceFeedbackEffect_Release( effect ); @@ -6355,8 +6350,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( result_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); - ref = IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); set_hid_expect( file, NULL, 0 ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); @@ -6390,8 +6384,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( bool_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); ref = IForceFeedbackEffect_Release( effect ); @@ -6437,8 +6430,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( result_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); - ref = IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); set_hid_expect( file, NULL, 0 ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); @@ -6472,8 +6464,7 @@ static void test_windows_gaming_input(void) ret = CloseHandle( bool_async_handler.event ); ok( ret, "CloseHandle failed, error %lu\n", GetLastError() ); check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); ref = IForceFeedbackEffect_Release( effect );

1 0

Rémi Bernon : ntdll: Create free block after updating the size in HEAP_ShrinkBlock.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: c662992de413c466517b4a6a34bb8511ca52f3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c662992de413c466517b4a6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 18 09:42:28 2022 +0200 ntdll: Create free block after updating the size in HEAP_ShrinkBlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index eb45a94da95..3a1a4268683 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -815,17 +815,17 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) */ static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) { - if ((pArena->size & ARENA_SIZE_MASK) >= size + HEAP_MIN_SHRINK_SIZE) + SIZE_T old_data_size = pArena->size & ARENA_SIZE_MASK; + if (old_data_size >= size + HEAP_MIN_SHRINK_SIZE) { - HEAP_CreateFreeBlock( subheap, (char *)(pArena + 1) + size, - (pArena->size & ARENA_SIZE_MASK) - size ); /* assign size plus previous arena flags */ pArena->size = size | (pArena->size & ~ARENA_SIZE_MASK); + HEAP_CreateFreeBlock( subheap, (char *)(pArena + 1) + size, old_data_size - size ); } else { /* Turn off PREV_FREE flag in next block */ - char *pNext = (char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK); + char *pNext = (char *)(pArena + 1) + old_data_size; if (pNext < (char *)subheap->base + subheap->size) *(DWORD *)pNext &= ~ARENA_FLAG_PREV_FREE; }

1 0

Nikolay Sivov : include: Move minidump types to a separate header.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 61f31d149cab08a88e591fd0e3c0d5466cbc7da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61f31d149cab08a88e591fd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 22:20:34 2022 +0300 include: Move minidump types to a separate header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dbghelp.h | 388 +------------------------------------ include/minidumpapiset.h | 412 ++++++++++++++++++++++++++++++++++++++++ programs/winedbg/tgt_minidump.c | 2 +- 4 files changed, 416 insertions(+), 387 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61f31d149cab08a88e59…

1 0

Nikolay Sivov : winedump: Output minidump streams in order they appear in the file.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 38d7ea5c6fd997fcdc505858a571687d14e6444e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d7ea5c6fd997fcdc505858… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 22:20:35 2022 +0300 winedump: Output minidump streams in order they appear in the file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/minidump.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index b834ec887e4..efc91bfdbfd 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -40,21 +40,6 @@ static void dump_mdmp_string(DWORD rva) printf("<<?>>"); } -static const MINIDUMP_DIRECTORY* get_mdmp_dir(const MINIDUMP_HEADER* hdr, unsigned int str_idx) -{ - const MINIDUMP_DIRECTORY* dir; - unsigned int i; - - for (i = 0; i < hdr->NumberOfStreams; i++) - { - dir = PRD(hdr->StreamDirectoryRva + i * sizeof(MINIDUMP_DIRECTORY), - sizeof(MINIDUMP_DIRECTORY)); - if (!dir) continue; - if (dir->StreamType == str_idx) return dir; - } - return NULL; -} - enum FileSig get_kind_mdmp(void) { const DWORD* pdw; @@ -69,9 +54,9 @@ enum FileSig get_kind_mdmp(void) void mdmp_dump(void) { const MINIDUMP_HEADER* hdr = PRD(0, sizeof(MINIDUMP_HEADER)); - UINT idx, ndir = 0; const MINIDUMP_DIRECTORY* dir; const void* stream; + unsigned int idx; if (!hdr) { @@ -79,27 +64,29 @@ void mdmp_dump(void) return; } - printf("Signature: %u (%.4s)\n", (UINT)hdr->Signature, (const char*)&hdr->Signature); - printf("Version: %x\n", (UINT)hdr->Version); - printf("NumberOfStreams: %u\n", (UINT)hdr->NumberOfStreams); + printf("Signature: %#x (%.4s)\n", hdr->Signature, (const char*)&hdr->Signature); + printf("Version: %#x\n", hdr->Version); + printf("NumberOfStreams: %u\n", hdr->NumberOfStreams); printf("StreamDirectoryRva: %u\n", (UINT)hdr->StreamDirectoryRva); - printf("CheckSum: %u\n", (UINT)hdr->CheckSum); + printf("CheckSum: %u\n", hdr->CheckSum); printf("TimeDateStamp: %s\n", get_time_str(hdr->TimeDateStamp)); printf("Flags: %x%08x\n", (UINT)(hdr->Flags >> 32), (UINT)hdr->Flags); - for (idx = 0; idx <= LastReservedStream; idx++) + for (idx = 0; idx < hdr->NumberOfStreams; ++idx) { - if (!(dir = get_mdmp_dir(hdr, idx))) continue; + dir = PRD(hdr->StreamDirectoryRva + idx * sizeof(MINIDUMP_DIRECTORY), sizeof(*dir)); + if (!dir) break; stream = PRD(dir->Location.Rva, dir->Location.DataSize); - printf("Directory [%u]: ", ndir++); + + printf("Stream [%u]: ", idx); switch (dir->StreamType) { case ThreadListStream: { - const MINIDUMP_THREAD_LIST* mtl = (const MINIDUMP_THREAD_LIST*)stream; - const MINIDUMP_THREAD* mt = mtl->Threads; - unsigned int i; + const MINIDUMP_THREAD_LIST *mtl = stream; + const MINIDUMP_THREAD *mt = mtl->Threads; + unsigned int i; printf("Threads: %u\n", (UINT)mtl->NumberOfThreads); for (i = 0; i < mtl->NumberOfThreads; i++, mt++)

1 0

Nikolay Sivov : winedump: Add support for ThreadInfoListStream stream.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: d50f7b02a953d1dc524a8f01c06036a90308ee8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d50f7b02a953d1dc524a8f01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 22:20:38 2022 +0300 winedump: Add support for ThreadInfoListStream stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/minidumpapiset.h | 21 +++++++++++++++++++++ tools/winedump/minidump.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/include/minidumpapiset.h b/include/minidumpapiset.h index 73994c0d3eb..b3a7737bd13 100644 --- a/include/minidumpapiset.h +++ b/include/minidumpapiset.h @@ -405,6 +405,27 @@ typedef struct _MINIDUMP_HANDLE_DESCRIPTOR_2 ULONG32 Reserved0; } MINIDUMP_HANDLE_DESCRIPTOR_2, *PMINIDUMP_HANDLE_DESCRIPTOR_2; +typedef struct _MINIDUMP_THREAD_INFO +{ + ULONG32 ThreadId; + ULONG32 DumpFlags; + ULONG32 DumpError; + ULONG32 ExitStatus; + ULONG64 CreateTime; + ULONG64 ExitTime; + ULONG64 KernelTime; + ULONG64 UserTime; + ULONG64 StartAddress; + ULONG64 Affinity; +} MINIDUMP_THREAD_INFO, *PMINIDUMP_THREAD_INFO; + +typedef struct _MINIDUMP_THREAD_INFO_LIST +{ + ULONG SizeOfHeader; + ULONG SizeOfEntry; + ULONG NumberOfEntries; +} MINIDUMP_THREAD_INFO_LIST, *PMINIDUMP_THREAD_INFO_LIST; + typedef enum _MINIDUMP_STREAM_TYPE { UnusedStream = 0, diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index f8bd03ca0c5..734c754e6be 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -476,6 +476,37 @@ void mdmp_dump(void) } } break; + case ThreadInfoListStream: + { + const MINIDUMP_THREAD_INFO_LIST *til = stream; + const BYTE *desc; + + printf("Thread Info List:\n"); + printf(" SizeOfHeader: %u\n", (UINT)til->SizeOfHeader); + printf(" SizeOfEntry: %u\n", (UINT)til->SizeOfEntry); + printf(" NumberOfEntries: %u\n", (UINT)til->NumberOfEntries); + + desc = (BYTE *)til + sizeof(*til); + for (i = 0; i < til->NumberOfEntries; ++i) + { + const MINIDUMP_THREAD_INFO *ti = (void *)desc; + + printf(" Thread [%u]:\n", i); + printf(" ThreadId: %u\n", ti->ThreadId); + printf(" DumpFlags: %#x\n", ti->DumpFlags); + printf(" DumpError: %u\n", ti->DumpError); + printf(" ExitStatus: %u\n", ti->ExitStatus); + print_longlong(" CreateTime", ti->CreateTime); + print_longlong(" ExitTime", ti->ExitTime); + print_longlong(" KernelTime", ti->KernelTime); + print_longlong(" UserTime", ti->UserTime); + print_longlong(" StartAddress", ti->StartAddress); + print_longlong(" Affinity", ti->Affinity); + + desc += til->SizeOfEntry; + } + } + break; default: printf("NIY %d\n", dir->StreamType);

1 0

Rémi Bernon : mf/tests: Move WMA decoder aggregation tests from wmadmod.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: f14018f7edecdff5784ee98e10f1defa6ee75040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f14018f7edecdff5784ee98e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 21:26:49 2022 +0200 mf/tests: Move WMA decoder aggregation tests from wmadmod. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8f2c050e3c6..e873712085b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -29,6 +29,7 @@ #include "d3d9types.h" #include "initguid.h" +#include "control.h" #include "dmo.h" #include "mediaobj.h" #include "ole2.h" @@ -6220,6 +6221,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; + IUnknown *unknown, *tmp_unknown, outer = {&test_unk_vtbl}; ULONG wmadec_data_len, wmaenc_data_len; const BYTE *wmadec_data, *wmaenc_data; MFT_OUTPUT_STREAM_INFO output_info; @@ -6228,15 +6230,17 @@ static void test_wma_decoder(void) MFT_OUTPUT_DATA_BUFFER output; DWORD status, flags, length; WCHAR output_path[MAX_PATH]; + IMediaObject *media_object; + IPropertyBag *property_bag; IMFMediaType *media_type; IMFTransform *transform; LONGLONG time, duration; HANDLE output_file; IMFSample *sample; + ULONG i, ret, ref; HRSRC resource; GUID class_id; UINT32 value; - ULONG i, ret; HRESULT hr; hr = CoInitialize(NULL); @@ -6583,6 +6587,42 @@ static void test_wma_decoder(void) ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %lu\n", ret); + hr = CoCreateInstance( &CLSID_CWMADecMediaObject, &outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void **)&unknown ); + ok( hr == S_OK, "CoCreateInstance returned %#lx\n", hr ); + hr = IUnknown_QueryInterface( unknown, &IID_IMFTransform, (void **)&transform ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IUnknown_QueryInterface( unknown, &IID_IMediaObject, (void **)&media_object ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IUnknown_QueryInterface( unknown, &IID_IPropertyBag, (void **)&property_bag ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IUnknown_QueryInterface( media_object, &IID_IUnknown, (void **)&tmp_unknown ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + + ok( unknown != &outer, "got outer IUnknown\n" ); + ok( transform != (void *)unknown, "got IUnknown == IMFTransform\n" ); + ok( media_object != (void *)unknown, "got IUnknown == IMediaObject\n" ); + ok( property_bag != (void *)unknown, "got IUnknown == IPropertyBag\n" ); + ok( tmp_unknown != unknown, "got inner IUnknown\n" ); + + check_interface( unknown, &IID_IPersistPropertyBag, FALSE ); + check_interface( unknown, &IID_IAMFilterMiscFlags, FALSE ); + check_interface( unknown, &IID_IMediaSeeking, FALSE ); + check_interface( unknown, &IID_IMediaPosition, FALSE ); + check_interface( unknown, &IID_IReferenceClock, FALSE ); + check_interface( unknown, &IID_IBasicAudio, FALSE ); + + ref = IUnknown_Release( tmp_unknown ); + ok( ref == 1, "Release returned %lu\n", ref ); + ref = IPropertyBag_Release( property_bag ); + ok( ref == 1, "Release returned %lu\n", ref ); + ref = IMediaObject_Release( media_object ); + ok( ref == 1, "Release returned %lu\n", ref ); + ref = IMFTransform_Release( transform ); + ok( ref == 1, "Release returned %lu\n", ref ); + ref = IUnknown_Release( unknown ); + ok( ref == 0, "Release returned %lu\n", ref ); + failed: CoUninitialize(); }

1 0