October 2021 - Wine-commits

Piotr Caban : user32/tests: Test style returned by GetWindowLong in WM_CREATE.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: ce3efca24a3c10dc52deff970b4f29704f93fb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3efca24a3c10dc52deff97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:45 2021 +0200 user32/tests: Test style returned by GetWindowLong in WM_CREATE. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 65 +++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 744f7781439..d725f129d36 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4424,34 +4424,39 @@ static void test_SetParent(void) ok(!IsWindow(popup), "popup still exists\n"); } +typedef struct +{ + DWORD cs_style; + DWORD cs_exstyle; + DWORD style; + DWORD exstyle; +} test_style; + static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - LPCREATESTRUCTA lpcs; - LPSTYLESTRUCT lpss; + CREATESTRUCTA *cs; + test_style *ts; + DWORD style; switch (msg) { case WM_NCCREATE: case WM_CREATE: - lpcs = (LPCREATESTRUCTA)lparam; - lpss = lpcs->lpCreateParams; - if (lpss) - { - if ((lpcs->dwExStyle & WS_EX_DLGMODALFRAME) || - ((!(lpcs->dwExStyle & WS_EX_STATICEDGE)) && - (lpcs->style & (WS_DLGFRAME | WS_THICKFRAME)))) - ok(lpcs->dwExStyle & WS_EX_WINDOWEDGE, "Window should have WS_EX_WINDOWEDGE style\n"); - else - ok(!(lpcs->dwExStyle & WS_EX_WINDOWEDGE), "Window shouldn't have WS_EX_WINDOWEDGE style\n"); - - ok((lpss->styleOld & ~WS_EX_WINDOWEDGE) == (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE), - "Ex style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", - lpss->styleOld, lpcs->dwExStyle); - - ok(lpss->styleNew == lpcs->style, - "Style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", - lpss->styleNew, lpcs->style); - } + cs = (LPCREATESTRUCTA)lparam; + ts = cs->lpCreateParams; + + ok(ts != NULL, "lpCreateParams not set\n"); + ok(cs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + cs->style, ts->cs_style); + ok(cs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n", + cs->dwExStyle, ts->cs_exstyle); + + style = GetWindowLongW(hwnd, GWL_STYLE); + ok(style == ts->style, "style = 0x%08x, expected 0x%08x\n", + style, ts->style); + style = GetWindowLongW(hwnd, GWL_EXSTYLE); + ok(style == ts->exstyle, "exstyle = 0x%08x, expected 0x%08x\n", + style, ts->exstyle); break; } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -4483,21 +4488,29 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle { DWORD dwActualStyle; DWORD dwActualExStyle; - STYLESTRUCT ss; + test_style ts; HWND hwnd; HWND hwndParent = NULL; - ss.styleNew = dwStyleIn; - ss.styleOld = dwExStyleIn; + ts.cs_style = dwStyleIn; + ts.cs_exstyle = dwExStyleIn; + if ((dwExStyleIn & WS_EX_DLGMODALFRAME) || + ((!(dwExStyleIn & WS_EX_STATICEDGE)) && + (dwStyleIn & (WS_DLGFRAME | WS_THICKFRAME)))) + ts.cs_exstyle |= WS_EX_WINDOWEDGE; + else + ts.cs_exstyle &= ~WS_EX_WINDOWEDGE; + ts.style = dwStyleOut; + ts.exstyle = dwExStyleOut; if (dwStyleIn & WS_CHILD) { - hwndParent = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atomStyleCheckClass), NULL, + hwndParent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, NULL); } hwnd = CreateWindowExA(dwExStyleIn, (LPCSTR)MAKEINTATOM(atomStyleCheckClass), NULL, - dwStyleIn, 0, 0, 0, 0, hwndParent, NULL, NULL, &ss); + dwStyleIn, 0, 0, 0, 0, hwndParent, NULL, NULL, &ts); assert(hwnd); flush_events( TRUE );

1 0

Piotr Caban : user32/tests: Don't use the same condition in ok and todo_wine_if.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 08303d9bbf7da6fbe7f68685d6ec9c4b79de7545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08303d9bbf7da6fbe7f68685… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:48 2021 +0200 user32/tests: Don't use the same condition in ok and todo_wine_if. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d725f129d36..93d1e8ec232 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4548,8 +4548,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle else dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); - /* FIXME: Remove the condition below once Wine is fixed */ - todo_wine_if (dwActualExStyle != dwExStyleOut) + todo_wine_if (!dwStyleIn) ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); @@ -4702,7 +4701,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou WORD class_atom; WCHAR caption[1]; } dlg_data; - DWORD style, ex_style; + DWORD style, ex_style, ex_style_out2; HWND hwnd, grand_parent = 0, parent = 0; struct dialog_param param; @@ -4764,14 +4763,13 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou ok(style == style_out, "expected style %#x, got %#x\n", style_out, style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) - ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) - ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; else - ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; - /* FIXME: Remove the condition below once Wine is fixed */ - todo_wine_if (ex_style != ex_style_out) - ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + ex_style_out2 = ex_style_in & ~WS_EX_WINDOWEDGE; + todo_wine_if (ex_style_out != ex_style_out2) + ok(ex_style == ex_style_out2, "expected ex_style %#x, got %#x\n", ex_style_out2, ex_style); DestroyWindow(hwnd);

1 0

Piotr Caban : user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 3979f4a4e4e517e10c22f4350d9396832d70cdfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3979f4a4e4e517e10c22f435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:52 2021 +0200 user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7c2471d2746..d261968d742 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1653,16 +1653,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } /* WS_EX_WINDOWEDGE depends on some other styles */ - if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) + if ((wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) && + !(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; - else if (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) - { - if (!((wndPtr->dwExStyle & WS_EX_STATICEDGE) && - (wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))) - wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; - } - else - wndPtr->dwExStyle &= ~WS_EX_WINDOWEDGE; if (!(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) wndPtr->flags |= WIN_NEED_SIZE;

1 0

Piotr Caban : user32: Add helper for setting WS_EX_WINDOWEDGE flag.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 94c1a67f7846071910ca800f75ecbc80ace648c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1a67f7846071910ca800f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:55 2021 +0200 user32: Add helper for setting WS_EX_WINDOWEDGE flag. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d261968d742..a1464f01345 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1461,6 +1461,20 @@ static void map_dpi_create_struct( CREATESTRUCTW *cs, UINT dpi_from, UINT dpi_to cs->cy = MulDiv( cs->cy, dpi_to, dpi_from ); } +/*********************************************************************** + * fix_exstyle + */ +static DWORD fix_exstyle( DWORD style, DWORD exstyle ) +{ + if ((exstyle & WS_EX_DLGMODALFRAME) || + (!(exstyle & WS_EX_STATICEDGE) && + (style & (WS_DLGFRAME | WS_THICKFRAME)))) + exstyle |= WS_EX_WINDOWEDGE; + else + exstyle &= ~WS_EX_WINDOWEDGE; + return exstyle; +} + /*********************************************************************** * WIN_CreateWindowEx * @@ -1596,13 +1610,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } WIN_FixCoordinates(cs, &sw); /* fix default coordinates */ - - if ((cs->dwExStyle & WS_EX_DLGMODALFRAME) || - ((!(cs->dwExStyle & WS_EX_STATICEDGE)) && - (cs->style & (WS_DLGFRAME | WS_THICKFRAME)))) - cs->dwExStyle |= WS_EX_WINDOWEDGE; - else - cs->dwExStyle &= ~WS_EX_WINDOWEDGE; + cs->dwExStyle = fix_exstyle(cs->style, cs->dwExStyle); /* Create the window structure */ @@ -2622,13 +2630,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0; /* WS_EX_TOPMOST can only be changed through SetWindowPos */ newval = (style.styleNew & ~WS_EX_TOPMOST) | (wndPtr->dwExStyle & WS_EX_TOPMOST); - /* WS_EX_WINDOWEDGE depends on some other styles */ - if (newval & WS_EX_DLGMODALFRAME) - newval |= WS_EX_WINDOWEDGE; - else if (!(newval & WS_EX_STATICEDGE) && (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))) - newval |= WS_EX_WINDOWEDGE; - else - newval &= ~WS_EX_WINDOWEDGE; + newval = fix_exstyle(wndPtr->dwStyle, newval); break; case GWLP_HWNDPARENT: if (wndPtr->parent == GetDesktopWindow())

1 0

Piotr Caban : user32: Update exstyle when setting style in SetWindowLong.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: a9eee150ad03e28829ffafd1b3fff57fffc816a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9eee150ad03e28829ffafd1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:01 2021 +0200 user32: Update exstyle when setting style in SetWindowLong. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 14 ++++++-------- dlls/user32/win.c | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 93d1e8ec232..f9428fd3494 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4548,8 +4548,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle else dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); - todo_wine_if (!dwStyleIn) - ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); if (hwndParent) DestroyWindow(hwndParent); @@ -4701,7 +4700,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou WORD class_atom; WCHAR caption[1]; } dlg_data; - DWORD style, ex_style, ex_style_out2; + DWORD style, ex_style; HWND hwnd, grand_parent = 0, parent = 0; struct dialog_param param; @@ -4763,13 +4762,12 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou ok(style == style_out, "expected style %#x, got %#x\n", style_out, style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) - ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) - ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; else - ex_style_out2 = ex_style_in & ~WS_EX_WINDOWEDGE; - todo_wine_if (ex_style_out != ex_style_out2) - ok(ex_style == ex_style_out2, "expected ex_style %#x, got %#x\n", ex_style_out2, ex_style); + ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); DestroyWindow(hwnd); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a1464f01345..21214432b6d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2619,8 +2619,6 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (wndPtr->parent == GetDesktopWindow()) newval |= WS_CLIPSIBLINGS; /* WS_MINIMIZE can't be reset */ if (wndPtr->dwStyle & WS_MINIMIZE) newval |= WS_MINIMIZE; - /* FIXME: changing WS_DLGFRAME | WS_THICKFRAME is supposed to change - WS_EX_WINDOWEDGE too */ break; case GWL_EXSTYLE: style.styleOld = wndPtr->dwExStyle; @@ -2699,8 +2697,9 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B switch(offset) { case GWL_STYLE: - req->flags = SET_WIN_STYLE; + req->flags = SET_WIN_STYLE | SET_WIN_EXSTYLE; req->style = newval; + req->ex_style = fix_exstyle(newval, wndPtr->dwExStyle); break; case GWL_EXSTYLE: req->flags = SET_WIN_EXSTYLE; @@ -2734,6 +2733,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B { case GWL_STYLE: wndPtr->dwStyle = newval; + wndPtr->dwExStyle = fix_exstyle(wndPtr->dwStyle, wndPtr->dwExStyle); retval = reply->old_style; break; case GWL_EXSTYLE:

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputEffect_(Start|Stop).
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 33dc3db01e5a972cbc58f795869b44d9c61ed89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=33dc3db01e5a972cbc58f795… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:04 2021 +0200 dinput: Implement HID joystick IDirectInputEffect_(Start|Stop). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 92 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 5 --- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 624cea4d77a..002b16fe84b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -145,6 +145,7 @@ struct hid_joystick_effect IDirectInputEffect IDirectInputEffect_iface; LONG ref; USAGE type; + ULONG index; struct list entry; struct hid_joystick *joystick; @@ -2134,14 +2135,97 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWORD iterations, DWORD flags ) { - FIXME( "iface %p, iterations %u, flags %#x stub!\n", iface, iterations, flags ); - return DIERR_UNSUPPORTED; + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + struct pid_control_report *effect_control = &impl->joystick->pid_effect_control; + ULONG count, report_len = impl->joystick->caps.OutputReportByteLength; + PHIDP_PREPARSED_DATA preparsed = impl->joystick->preparsed; + HANDLE device = impl->joystick->device; + NTSTATUS status; + USAGE control; + HRESULT hr; + + TRACE( "iface %p, iterations %u, flags %#x.\n", iface, iterations, flags ); + + if ((flags & ~(DIES_NODOWNLOAD|DIES_SOLO))) return DIERR_INVALIDPARAM; + if (flags & DIES_SOLO) control = PID_USAGE_OP_EFFECT_START_SOLO; + else control = PID_USAGE_OP_EFFECT_START; + + EnterCriticalSection( &impl->joystick->base.crit ); + if (!impl->joystick->base.acquired || !(impl->joystick->base.dwCoopLevel & DISCL_EXCLUSIVE)) + hr = DIERR_NOTEXCLUSIVEACQUIRED; + else if ((flags & DIES_NODOWNLOAD) && !impl->index) + hr = DIERR_NOTDOWNLOADED; + else if ((flags & DIES_NODOWNLOAD) || !FAILED(hr = IDirectInputEffect_Download( iface ))) + { + count = 1; + status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, + impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, effect_control->control_coll, + &control, &count, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_LOOP_COUNT, + iterations, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else if (WriteFile( device, impl->effect_control_buf, report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + } + LeaveCriticalSection( &impl->joystick->base.crit ); + + return hr; } static HRESULT WINAPI hid_joystick_effect_Stop( IDirectInputEffect *iface ) { - FIXME( "iface %p stub!\n", iface ); - return DIERR_UNSUPPORTED; + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + struct pid_control_report *effect_control = &impl->joystick->pid_effect_control; + ULONG count, report_len = impl->joystick->caps.OutputReportByteLength; + PHIDP_PREPARSED_DATA preparsed = impl->joystick->preparsed; + HANDLE device = impl->joystick->device; + NTSTATUS status; + USAGE control; + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->joystick->base.crit ); + if (!impl->joystick->base.acquired || !(impl->joystick->base.dwCoopLevel & DISCL_EXCLUSIVE)) + hr = DIERR_NOTEXCLUSIVEACQUIRED; + else if (!impl->index) + hr = DIERR_NOTDOWNLOADED; + else + { + count = 1; + control = PID_USAGE_OP_EFFECT_STOP; + status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, + impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, effect_control->control_coll, + &control, &count, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_LOOP_COUNT, + 0, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else if (WriteFile( device, impl->effect_control_buf, report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + } + LeaveCriticalSection( &impl->joystick->base.crit ); + + return hr; } static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *iface, DWORD *status ) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index eb774dd5fe3..a53502ca8d4 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5765,10 +5765,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) check_member( periodic, expect_periodic, "%u", dwPeriod ); hr = IDirectInputEffect_Start( effect, 1, DIES_NODOWNLOAD ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "Start returned %#x\n", hr ); hr = IDirectInputEffect_Stop( effect ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "Stop returned %#x\n", hr ); set_hid_expect( file, expect_download, 3 * sizeof(struct hid_expect) ); @@ -5782,7 +5780,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_NOEFFECT, "Download returned %#x\n", hr ); hr = IDirectInputEffect_Start( effect, 1, 0xdeadbeef ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "Start returned %#x\n", hr ); set_hid_expect( file, &expect_start_solo, sizeof(expect_start_solo) ); @@ -5845,10 +5842,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) set_hid_expect( file, NULL, 0 ); hr = IDirectInputEffect_Start( effect, 1, DIES_NODOWNLOAD ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "Start returned %#x\n", hr ); hr = IDirectInputEffect_Stop( effect ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "Stop returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) );

1 0

Rémi Bernon : dinput: Partially implement HID joystick IDirectInputEffect_GetParameters.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 35ea577409347b90920fedd11a5402686a3653ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ea577409347b90920fedd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:05 2021 +0200 dinput: Partially implement HID joystick IDirectInputEffect_GetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 162 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/hid.c | 48 -------------- 2 files changed, 160 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35ea577409347b90920f…

1 0

Rémi Bernon : dinput: Partially implement HID joystick IDirectInputEffect_SetParameters.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 83bc89f41f1d2a24b4503a8f659d27cd16da89b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83bc89f41f1d2a24b4503a8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:06 2021 +0200 dinput: Partially implement HID joystick IDirectInputEffect_SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 176 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 85 ++-------------------- 2 files changed, 177 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83bc89f41f1d2a24b450…

1 0

Rémi Bernon : dinput: Look for PID direction collection and set DIEP_DIRECTION if found.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 453940f571c361419b1c93f730d57df6815f00ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=453940f571c361419b1c93f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:07 2021 +0200 dinput: Look for PID direction collection and set DIEP_DIRECTION if found. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 66899e73e53..1bc8e752524 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -92,7 +92,10 @@ struct pid_effect_update ULONG type_coll; ULONG axes_coll; ULONG axis_count; + ULONG direction_coll; + ULONG direction_count; struct hid_value_caps *axis_caps[6]; + struct hid_value_caps *direction_caps[6]; struct hid_value_caps *duration_caps; struct hid_value_caps *gain_caps; struct hid_value_caps *sample_period_caps; @@ -1138,6 +1141,7 @@ static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, D } if (effect_update->trigger_button_caps) info->dwDynamicParams |= DIEP_TRIGGERBUTTON; if (effect_update->trigger_repeat_interval_caps) info->dwDynamicParams |= DIEP_TRIGGERREPEATINTERVAL; + if (effect_update->direction_coll) info->dwDynamicParams |= DIEP_DIRECTION; if (effect_update->axes_coll) info->dwDynamicParams |= DIEP_AXES; if (!(collection = effect_update->type_coll)) return DIERR_DEVICENOTREG; @@ -1831,6 +1835,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * SET_SUB_COLLECTION( effect_update, type_coll ); break; case PID_USAGE_AXES_ENABLE: SET_SUB_COLLECTION( effect_update, axes_coll ); break; + case PID_USAGE_DIRECTION: SET_SUB_COLLECTION( effect_update, direction_coll ); break; } } @@ -1887,6 +1892,13 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap else effect_update->axis_caps[effect_update->axis_count] = caps; effect_update->axis_count++; } + if (instance->wCollectionNumber == effect_update->direction_coll) + { + SET_REPORT_ID( effect_update ); + if (effect_update->direction_count >= 6) FIXME( "more than 6 PID directions detected\n" ); + else effect_update->direction_caps[effect_update->direction_count] = caps; + effect_update->direction_count++; + } #undef SET_REPORT_ID

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputEffect_(Download|Unload).
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 9aad438057a141401df2e3298478920c427c1bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aad438057a141401df2e329… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:08 2021 +0200 dinput: Implement HID joystick IDirectInputEffect_(Download|Unload). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 157 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 33 ---------- 2 files changed, 153 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9aad438057a141401df2…

1 0