wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Rémi Bernon : windows.gaming.input: Split IAsyncInfo interface to a separate struct.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: c30c0abd24e336fb9bad098fae82e674417626b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30c0abd24e336fb9bad098f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 11:25:53 2022 +0200 windows.gaming.input: Split IAsyncInfo interface to a separate struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 350 ++++++++++++++++++++++----------- dlls/windows.gaming.input/provider.idl | 12 ++ 2 files changed, 246 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c30c0abd24e336fb9bad…

1 0

Rémi Bernon : windows.gaming.input: Use a PROPVARIANT as async operation result.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: b985fe636237d6f26d228f41cb9b18829abd971f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b985fe636237d6f26d228f41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 11:22:16 2022 +0200 windows.gaming.input: Use a PROPVARIANT as async operation result. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 22 +++++++++++++++------- dlls/windows.gaming.input/force_feedback.c | 15 +++++++++------ dlls/windows.gaming.input/private.h | 4 ++-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 6afbca96831..cce2729f06b 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -34,14 +34,13 @@ struct async_bool IAsyncInfo IAsyncInfo_iface; LONG ref; - BOOLEAN result; - - async_operation_boolean_callback callback; + async_operation_callback callback; TP_WORK *async_run_work; IInspectable *invoker; CRITICAL_SECTION cs; IWineAsyncOperationCompletedHandler *handler; + PROPVARIANT result; AsyncStatus status; HRESULT hr; }; @@ -197,6 +196,7 @@ static ULONG WINAPI async_bool_Release( IAsyncOperation_boolean *iface ) { IAsyncInfo_Close( &impl->IAsyncInfo_iface ); if (impl->handler && impl->handler != HANDLER_NOT_SET) IWineAsyncOperationCompletedHandler_Release( impl->handler ); + PropVariantClear( &impl->result ); IInspectable_Release( impl->invoker ); DeleteCriticalSection( &impl->cs ); free( impl ); @@ -276,19 +276,24 @@ static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, static HRESULT WINAPI async_bool_GetResults( IAsyncOperation_boolean *iface, BOOLEAN *results ) { struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); + PROPVARIANT result = {.vt = VT_BOOL}; HRESULT hr; TRACE( "iface %p, results %p.\n", iface, results ); EnterCriticalSection( &impl->cs ); if (impl->status != Completed && impl->status != Error) hr = E_ILLEGAL_METHOD_CALL; + else if (impl->result.vt != result.vt) hr = E_UNEXPECTED; else { - *results = impl->result; + PropVariantCopy( &result, &impl->result ); + if (impl->result.vt == VT_UNKNOWN) PropVariantClear( &impl->result ); hr = impl->hr; } LeaveCriticalSection( &impl->cs ); + *results = result.boolVal; + PropVariantClear( &result ); return hr; } @@ -312,14 +317,15 @@ static void CALLBACK async_run_cb( TP_CALLBACK_INSTANCE *instance, void *data, T { IAsyncOperation_boolean *operation = data; struct async_bool *impl = impl_from_IAsyncOperation_boolean( operation ); - BOOLEAN result = FALSE; + PROPVARIANT result; HRESULT hr; + PropVariantInit( &result ); hr = impl->callback( impl->invoker, &result ); EnterCriticalSection( &impl->cs ); if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - impl->result = result; + PropVariantCopy( &impl->result, &result ); impl->hr = hr; if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) @@ -335,9 +341,10 @@ static void CALLBACK async_run_cb( TP_CALLBACK_INSTANCE *instance, void *data, T else LeaveCriticalSection( &impl->cs ); IAsyncOperation_boolean_Release( operation ); + PropVariantClear( &result ); } -HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_boolean_callback callback, +HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_callback callback, IAsyncOperation_boolean **out ) { struct async_bool *impl; @@ -351,6 +358,7 @@ HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_b impl->handler = HANDLER_NOT_SET; impl->callback = callback; impl->status = Started; + impl->result.vt = VT_BOOL; if (!(impl->async_run_work = CreateThreadpoolWork( async_run_cb, &impl->IAsyncOperation_boolean_iface, NULL ))) { diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 24810d1d787..667c6d8d81b 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -212,13 +212,14 @@ static HRESULT WINAPI motor_StopAllEffects( IForceFeedbackMotor *iface ) return IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_STOPALL ); } -static HRESULT WINAPI motor_try_disable_async( IInspectable *iface, BOOLEAN *result ) +static HRESULT WINAPI motor_try_disable_async( IInspectable *iface, PROPVARIANT *result ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)iface ); HRESULT hr; hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_SETACTUATORSOFF ); - *result = SUCCEEDED(hr); + result->vt = VT_BOOL; + result->boolVal = SUCCEEDED(hr); return hr; } @@ -229,13 +230,14 @@ static HRESULT WINAPI motor_TryDisableAsync( IForceFeedbackMotor *iface, IAsyncO return async_operation_boolean_create( (IInspectable *)iface, motor_try_disable_async, async_op ); } -static HRESULT WINAPI motor_try_enable_async( IInspectable *iface, BOOLEAN *result ) +static HRESULT WINAPI motor_try_enable_async( IInspectable *iface, PROPVARIANT *result ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)iface ); HRESULT hr; hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_SETACTUATORSON ); - *result = SUCCEEDED(hr); + result->vt = VT_BOOL; + result->boolVal = SUCCEEDED(hr); return hr; } @@ -246,13 +248,14 @@ static HRESULT WINAPI motor_TryEnableAsync( IForceFeedbackMotor *iface, IAsyncOp return async_operation_boolean_create( (IInspectable *)iface, motor_try_enable_async, async_op ); } -static HRESULT WINAPI motor_try_reset_async( IInspectable *iface, BOOLEAN *result ) +static HRESULT WINAPI motor_try_reset_async( IInspectable *iface, PROPVARIANT *result ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)iface ); HRESULT hr; hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_RESET ); - *result = SUCCEEDED(hr); + result->vt = VT_BOOL; + result->boolVal = SUCCEEDED(hr); return hr; } diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 2c25aca9027..63c9c262f7a 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -67,8 +67,8 @@ extern void event_handlers_notify( struct list *list, IInspectable *element ); extern HRESULT force_feedback_motor_create( IDirectInputDevice8W *device, IForceFeedbackMotor **out ); -typedef HRESULT (WINAPI *async_operation_boolean_callback)( IInspectable *invoker, BOOLEAN *result ); -extern HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_boolean_callback callback, +typedef HRESULT (WINAPI *async_operation_callback)( IInspectable *invoker, PROPVARIANT *result ); +extern HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_callback callback, IAsyncOperation_boolean **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \

1 0

Rémi Bernon : windows.gaming.input: Introduce a new type-pruning WineAsyncOperationCompletedHandler.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: d99ee0273bc90a92378e514755904fc7b875e9e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99ee0273bc90a92378e5147… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 11:21:05 2022 +0200 windows.gaming.input: Introduce a new type-pruning WineAsyncOperationCompletedHandler. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 23 +++++++++++++---------- dlls/windows.gaming.input/provider.idl | 3 +++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 91ecdeb9550..6afbca96831 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -19,6 +19,7 @@ */ #include "private.h" +#include "provider.h" #include "wine/debug.h" @@ -33,7 +34,6 @@ struct async_bool IAsyncInfo IAsyncInfo_iface; LONG ref; - IAsyncOperationCompletedHandler_boolean *handler; BOOLEAN result; async_operation_boolean_callback callback; @@ -41,6 +41,7 @@ struct async_bool IInspectable *invoker; CRITICAL_SECTION cs; + IWineAsyncOperationCompletedHandler *handler; AsyncStatus status; HRESULT hr; }; @@ -195,7 +196,7 @@ static ULONG WINAPI async_bool_Release( IAsyncOperation_boolean *iface ) if (!ref) { IAsyncInfo_Close( &impl->IAsyncInfo_iface ); - if (impl->handler && impl->handler != HANDLER_NOT_SET) IAsyncOperationCompletedHandler_boolean_Release( impl->handler ); + if (impl->handler && impl->handler != HANDLER_NOT_SET) IWineAsyncOperationCompletedHandler_Release( impl->handler ); IInspectable_Release( impl->invoker ); DeleteCriticalSection( &impl->cs ); free( impl ); @@ -223,8 +224,9 @@ static HRESULT WINAPI async_bool_GetTrustLevel( IAsyncOperation_boolean *iface, return E_NOTIMPL; } -static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean *handler ) +static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean *bool_handler ) { + IWineAsyncOperationCompletedHandler *handler = (IWineAsyncOperationCompletedHandler *)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); HRESULT hr = S_OK; @@ -235,7 +237,7 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, else if (impl->handler != HANDLER_NOT_SET) hr = E_ILLEGAL_DELEGATE_ASSIGNMENT; else if ((impl->handler = handler)) { - IAsyncOperationCompletedHandler_boolean_AddRef( impl->handler ); + IWineAsyncOperationCompletedHandler_AddRef( impl->handler ); if (impl->status > Started) { @@ -244,8 +246,8 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, impl->handler = NULL; /* Prevent concurrent invoke. */ LeaveCriticalSection( &impl->cs ); - IAsyncOperationCompletedHandler_boolean_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandler_boolean_Release( handler ); + IWineAsyncOperationCompletedHandler_Invoke( handler, (IInspectable *)operation, status ); + IWineAsyncOperationCompletedHandler_Release( handler ); return S_OK; } @@ -255,8 +257,9 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, return hr; } -static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean **handler ) +static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean **bool_handler ) { + IWineAsyncOperationCompletedHandler **handler = (IWineAsyncOperationCompletedHandler **)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); HRESULT hr = S_OK; @@ -321,13 +324,13 @@ static void CALLBACK async_run_cb( TP_CALLBACK_INSTANCE *instance, void *data, T if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) { - IAsyncOperationCompletedHandler_boolean *handler = impl->handler; + IWineAsyncOperationCompletedHandler *handler = impl->handler; AsyncStatus status = impl->status; impl->handler = NULL; /* Prevent concurrent invoke. */ LeaveCriticalSection( &impl->cs ); - IAsyncOperationCompletedHandler_boolean_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandler_boolean_Release( handler ); + IWineAsyncOperationCompletedHandler_Invoke( handler, (IInspectable *)operation, status ); + IWineAsyncOperationCompletedHandler_Release( handler ); } else LeaveCriticalSection( &impl->cs ); diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl index 60eaab34506..5f718cb167b 100644 --- a/dlls/windows.gaming.input/provider.idl +++ b/dlls/windows.gaming.input/provider.idl @@ -38,6 +38,9 @@ namespace Windows.Gaming.Input.Custom { interface IWineGameControllerProvider; runtimeclass WineGameControllerProvider; + /* type-pruning version of AsyncOperationCompletedHandler<T> */ + delegate HRESULT WineAsyncOperationCompletedHandler([in] IInspectable *async, [in] AsyncStatus status); + enum WineGameControllerType { Joystick = 0,

1 0

Rémi Bernon : windows.gaming.input: Set get_AreEffectsPaused value to FALSE when dinput fails.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: cb2f3f76eeb372bf5e3ed853445e6725339c6f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb2f3f76eeb372bf5e3ed853… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 17:40:34 2022 +0200 windows.gaming.input: Set get_AreEffectsPaused value to FALSE when dinput fails. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/force_feedback.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index a9a875c48e3..24810d1d787 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -111,11 +111,10 @@ static HRESULT WINAPI motor_get_AreEffectsPaused( IForceFeedbackMotor *iface, BO TRACE( "iface %p, value %p.\n", iface, value ); - if (FAILED(hr = IDirectInputDevice8_GetForceFeedbackState( impl->device, &state ))) - return hr; + if (FAILED(hr = IDirectInputDevice8_GetForceFeedbackState( impl->device, &state ))) *value = FALSE; + else *value = (state & DIGFFS_PAUSED); - *value = (state & DIGFFS_PAUSED); - return S_OK; + return hr; } static HRESULT WINAPI motor_get_MasterGain( IForceFeedbackMotor *iface, double *value )

1 0

Angelo Haller : comctl32/tests: Add change sequence for ownerdata listviews.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 1132f5f74be000a8cda980030f8405fa41df8b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1132f5f74be000a8cda98003… Author: Angelo Haller <angelo(a)szanni.org> Date: Thu Apr 28 08:20:11 2022 -0500 comctl32/tests: Add change sequence for ownerdata listviews. Add a new test sequence for ownerdata listviews that logs solely item change notifications for single and multiple items changing. Use it in the ownerdata multiselect tests. Signed-off-by: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 124f463908e..6ac7f53137d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -37,6 +37,7 @@ enum seq_index { PARENT_SEQ_INDEX, PARENT_FULL_SEQ_INDEX, PARENT_CD_SEQ_INDEX, + PARENT_ODSTATECHANGED_SEQ_INDEX, LISTVIEW_SEQ_INDEX, EDITBOX_SEQ_INDEX, COMBINED_SEQ_INDEX, @@ -254,6 +255,14 @@ static const struct message ownerdata_deselect_all_parent_seq[] = { { 0 } }; +static const struct message ownerdata_multiselect_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + static const struct message change_all_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -523,6 +532,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP add_message(sequences, PARENT_SEQ_INDEX, &msg); add_message(sequences, COMBINED_SEQ_INDEX, &msg); } + /* log change messages for single and multiple items changing in ownerdata listviews */ + if (message == WM_NOTIFY && (msg.id == LVN_ITEMCHANGED || msg.id == LVN_ODSTATECHANGED)) + add_message(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, &msg); + add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); switch (message) @@ -3556,8 +3569,15 @@ static void test_ownerdata_multiselect(void) hold_key(VK_SHIFT); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); expect(0, res); + + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, + ownerdata_multiselect_odstatechanged_seq, + "ownerdata select multiple notification", TRUE); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res); @@ -3566,8 +3586,15 @@ static void test_ownerdata_multiselect(void) hold_key(VK_CONTROL); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); expect(0, res); + + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, + ownerdata_multiselect_odstatechanged_seq, + "ownerdata select multiple notification", TRUE); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); expect(0, res);

1 0

Angelo Haller : comctl32/tests: Add multi select tests for ownerdata listviews.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: ca9e3586de3957716391f76abdb9a16cb6093c32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9e3586de3957716391f76a… Author: Angelo Haller <angelo(a)szanni.org> Date: Thu Apr 28 08:20:10 2022 -0500 comctl32/tests: Add multi select tests for ownerdata listviews. Add tests for selecting multiple items in ownerdata listviews by using SHIFT/CTRL and arrow keys. Signed-off-by: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 160925a073a..124f463908e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3530,6 +3530,56 @@ static void test_ownerdata(void) DestroyWindow(hwnd); } +static void test_ownerdata_multiselect(void) +{ + HWND hwnd; + DWORD res; + LVITEMA item; + + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 20, 0); + expect(1, res); + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(0, res); + + memset(&item, 0, sizeof(item)); + item.state = LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(1, res); + + res = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); + expect(0, res); + + hold_key(VK_SHIFT); + + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); + expect(0, res); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); + expect(0, res); + + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(2, res); + + hold_key(VK_CONTROL); + + res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); + expect(0, res); + res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); + expect(0, res); + + release_key(VK_CONTROL); + release_key(VK_SHIFT); + + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(3, res); + + DestroyWindow(hwnd); +} + static void test_norecompute(void) { static CHAR testA[] = "test"; @@ -6878,6 +6928,7 @@ START_TEST(listview) test_subitem_rect(); test_sorting(); test_ownerdata(); + test_ownerdata_multiselect(); test_norecompute(); test_nosortheader(); test_setredraw(); @@ -6937,6 +6988,7 @@ START_TEST(listview) test_columns(); test_sorting(); test_ownerdata(); + test_ownerdata_multiselect(); test_norecompute(); test_nosortheader(); test_indentation();

1 0

Angelo Haller : comctl32/tests: Add hold_key and release_key functions.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 2d78448464f8e3d4f4e7419c42559de515acfcd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d78448464f8e3d4f4e7419c… Author: Angelo Haller <angelo(a)szanni.org> Date: Thu Apr 28 08:20:09 2022 -0500 comctl32/tests: Add hold_key and release_key functions. Add functions to simulate the holding of keys like SHIFT, CTRL,... Move existing SHIFT key press emulation to these functions. Signed-off-by: Angelo Haller <angelo(a)szanni.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ca263cd644a..160925a073a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -462,6 +462,30 @@ static const struct message listview_end_label_edit_kill_focus[] = { { 0 } }; +static void hold_key(int vk) +{ + BYTE kstate[256]; + BOOL res; + + res = GetKeyboardState(kstate); + ok(res, "GetKeyboardState failed.\n"); + kstate[vk] |= 0x80; + res = SetKeyboardState(kstate); + ok(res, "SetKeyboardState failed.\n"); +} + +static void release_key(int vk) +{ + BYTE kstate[256]; + BOOL res; + + res = GetKeyboardState(kstate); + ok(res, "GetKeyboardState failed.\n"); + kstate[vk] &= ~0x80; + res = SetKeyboardState(kstate); + ok(res, "SetKeyboardState failed.\n"); +} + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -2356,7 +2380,6 @@ static void test_multiselect(void) int i, j; static const int items=5; DWORD item_count; - BYTE kstate[256]; select_task task; LONG_PTR style; LVITEMA item; @@ -2423,10 +2446,7 @@ static void test_multiselect(void) selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); ok(selected_count == 1, "expected 1, got %ld\n", selected_count); - /* Set SHIFT key pressed */ - GetKeyboardState(kstate); - kstate[VK_SHIFT]=0x80; - SetKeyboardState(kstate); + hold_key(VK_SHIFT); for (j=1;j<=(task.count == -1 ? item_count : task.count);j++) { r = SendMessageA(hwnd, WM_KEYDOWN, task.loopVK, 0); @@ -2441,10 +2461,7 @@ static void test_multiselect(void) "Failed multiple selection %s. There should be %ld selected items (is %ld)\n", task.descr, item_count, selected_count); - /* Set SHIFT key released */ - GetKeyboardState(kstate); - kstate[VK_SHIFT]=0x00; - SetKeyboardState(kstate); + release_key(VK_SHIFT); } DestroyWindow(hwnd);

1 0

Zebediah Figura : server: Do not signal accept bits if there are accept asyncs queued.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 753fbb28d5c57ef73392dddd6b9e0c57c0dd675b URL: https://source.winehq.org/git/wine.git/?a=commit;h=753fbb28d5c57ef73392dddd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:30 2022 -0500 server: Do not signal accept bits if there are accept asyncs queued. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++-- server/sock.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 2ace83f5e21..5b64ccd7715 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -722,7 +722,7 @@ static void test_poll(void) ok(!size, "got size %lu\n", size); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); closesocket(server); closesocket(client); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 17719bfaacd..f17ffba7a85 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5578,7 +5578,7 @@ static void test_accept_events(struct event_test_ctx *ctx) ok(ret, "got error %lu\n", GetLastError()); ok(!size, "got size %lu\n", size); - check_events_todo(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); closesocket(server); closesocket(client); @@ -5587,7 +5587,7 @@ static void test_accept_events(struct event_test_ctx *ctx) ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); ok(!ret, "got error %u\n", WSAGetLastError()); - check_events_todo(ctx, FD_ACCEPT, 0, 200); + check_events(ctx, FD_ACCEPT, 0, 200); check_events(ctx, 0, 0, 0); server = accept(listener, NULL, NULL); diff --git a/server/sock.c b/server/sock.c index aa62a03d699..e46be9349e2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -990,6 +990,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) if (req->iosb->status == STATUS_PENDING && !req->accepted) { complete_async_accept( sock, req ); + event &= ~POLLIN; break; } }

1 0

Zebediah Figura : server: Do not signal write bits if there are write asyncs alerted.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: bff228c198597f4a1c43432988a2d61f93df5bc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff228c198597f4a1c434329… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:29 2022 -0500 server: Do not signal write bits if there are write asyncs alerted. Asyncs which are alerted but not "waiting" may still fill the pipe, and we shouldn't signal AFD_POLL_WRITE in that case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index cb76765e495..aa62a03d699 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1011,10 +1011,13 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) event &= ~(POLLIN | POLLPRI); } - if (event & POLLOUT && async_waiting( &sock->write_q )) + if ((event & POLLOUT) && async_queued( &sock->write_q )) { - if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); - async_wake_up( &sock->write_q, STATUS_ALERTED ); + if (async_waiting( &sock->write_q )) + { + if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); + async_wake_up( &sock->write_q, STATUS_ALERTED ); + } event &= ~POLLOUT; }

1 0

Zebediah Figura : server: Don't poll for POLLOUT if there are alerted write asyncs.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: c5541f8a0814279e477b4c6199981bbe2d8575a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5541f8a0814279e477b4c61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:28 2022 -0500 server: Don't poll for POLLOUT if there are alerted write asyncs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 2bb2963a840..cb76765e495 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1315,7 +1315,12 @@ static int sock_get_poll_events( struct fd *fd ) if (async_queued( &sock->write_q )) { - if (async_waiting( &sock->write_q )) ev |= POLLOUT; + /* As with read asyncs above, clear POLLOUT if we have an alerted + * async. */ + if (async_waiting( &sock->write_q )) + ev |= POLLOUT; + else + ev &= ~POLLOUT; } else if (!sock->wr_shutdown && (mask & AFD_POLL_WRITE)) {

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022