October 2021 - Wine-Commits

Rémi Bernon : dinput: Start and cancel reading HID reports while holding the CS.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 9a9a1656c1a154425b920168bbdd5aaaa3b27d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9a1656c1a154425b920168… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:03 2021 +0200 dinput: Start and cancel reading HID reports while holding the CS. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index aee8118191f..b6c4c960521 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -699,14 +699,18 @@ static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) TRACE( "iface %p.\n", iface ); - if ((hr = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return hr; - - memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) ); - impl->read_ovl.hEvent = impl->base.read_event; - if (ReadFile( impl->device, impl->input_report_buf, report_len, NULL, &impl->read_ovl )) - impl->base.read_callback( iface ); + EnterCriticalSection( &impl->base.crit ); + hr = IDirectInputDevice2WImpl_Acquire( iface ); + if (hr == DI_OK) + { + memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) ); + impl->read_ovl.hEvent = impl->base.read_event; + if (ReadFile( impl->device, impl->input_report_buf, report_len, NULL, &impl->read_ovl )) + impl->base.read_callback( iface ); + } + LeaveCriticalSection( &impl->base.crit ); - return DI_OK; + return hr; } static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) @@ -717,12 +721,16 @@ static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) TRACE( "iface %p.\n", iface ); - if ((hr = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return hr; - - ret = CancelIoEx( impl->device, &impl->read_ovl ); - if (!ret) WARN( "CancelIoEx failed, last error %u\n", GetLastError() ); + EnterCriticalSection( &impl->base.crit ); + if (impl->base.acquired) + { + ret = CancelIoEx( impl->device, &impl->read_ovl ); + if (!ret) WARN( "CancelIoEx failed, last error %u\n", GetLastError() ); + } + hr = IDirectInputDevice2WImpl_Unacquire( iface ); + LeaveCriticalSection( &impl->base.crit ); - return DI_OK; + return hr; } static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr )

1 0

Rémi Bernon : dinput: Send DISFFC_RESET command on HID joystick (Un)Acquire.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 84e586124c92d00335433e75b9c95ca89a6b9150 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e586124c92d00335433e75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:04 2021 +0200 dinput: Send DISFFC_RESET command on HID joystick (Un)Acquire. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++++ dlls/dinput8/tests/hid.c | 12 ++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b6c4c960521..ac67625cddc 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -707,6 +707,8 @@ static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) impl->read_ovl.hEvent = impl->base.read_event; if (ReadFile( impl->device, impl->input_report_buf, report_len, NULL, &impl->read_ovl )) impl->base.read_callback( iface ); + + IDirectInputDevice8_SendForceFeedbackCommand( iface, DISFFC_RESET ); } LeaveCriticalSection( &impl->base.crit ); @@ -726,6 +728,8 @@ static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) { ret = CancelIoEx( impl->device, &impl->read_ovl ); if (!ret) WARN( "CancelIoEx failed, last error %u\n", GetLastError() ); + + IDirectInputDevice8_SendForceFeedbackCommand( iface, DISFFC_RESET ); } hr = IDirectInputDevice2WImpl_Unacquire( iface ); LeaveCriticalSection( &impl->base.crit ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 618fb4e4c7c..7c46f19cc40 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5259,14 +5259,6 @@ static void test_force_feedback_joystick( void ) .report_len = 2, .report_buf = {1, 0x01}, }; - struct hid_expect expect_dc_reset_todo = - { - .code = IOCTL_HID_WRITE_REPORT, - .todo = TRUE, - .report_id = 1, - .report_len = 2, - .report_buf = {1, 0x01}, - }; const DIDEVICEINSTANCEW expect_devinst = { @@ -5775,7 +5767,7 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); - set_hid_expect( file, &expect_dc_reset_todo, sizeof(expect_dc_reset_todo) ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); @@ -5821,7 +5813,7 @@ static void test_force_feedback_joystick( void ) test_periodic_effect( device, file ); - set_hid_expect( file, &expect_dc_reset_todo, sizeof(expect_dc_reset_todo) ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 );

1 0

Rémi Bernon : dinput: Look for the PID device control output report.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: ff7685dea4469dc099fe24a492ee73418c3aada4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7685dea4469dc099fe24a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:01 2021 +0200 dinput: Look for the PID device control output report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput8/tests/hid.c | 6 ---- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a6c6de3a889..b10ce7fc03b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -78,6 +78,13 @@ struct extra_caps LONG saturation; }; +struct pid_control_report +{ + BYTE id; + ULONG collection; + ULONG control_coll; +}; + #define DEVICE_STATE_MAX_SIZE 1024 struct hid_joystick @@ -102,6 +109,8 @@ struct hid_joystick BYTE device_state_report_id; BYTE device_state[DEVICE_STATE_MAX_SIZE]; + + struct pid_control_report pid_device_control; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -1176,6 +1185,12 @@ static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HAND instance->wUsagePage = caps->UsagePage; instance->wUsage = caps->Usage; + count = ARRAY_SIZE(buttons); + status = HidP_GetSpecificButtonCaps( HidP_Output, HID_USAGE_PAGE_PID, 0, + PID_USAGE_DC_DEVICE_RESET, buttons, &count, preparsed_data ); + if (status == HIDP_STATUS_SUCCESS && count > 0) + instance->guidFFDriver = IID_IDirectInputPIDDriver; + count = ARRAY_SIZE(buttons); status = HidP_GetSpecificButtonCaps( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, 0, buttons, &count, preparsed_data ); if (status != HIDP_STATUS_SUCCESS) count = button_count = 0; @@ -1398,6 +1413,67 @@ static BOOL init_data_format( struct hid_joystick *impl, struct hid_value_caps * return DIENUM_CONTINUE; } +static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct pid_control_report *device_control = &impl->pid_device_control; + +#define SET_COLLECTION( rep ) \ + do \ + { \ + if (rep->collection) FIXME( "duplicate " #rep " report!\n" ); \ + else rep->collection = DIDFT_GETINSTANCE( instance->dwType ); \ + } while (0) + +#define SET_SUB_COLLECTION( rep, sub ) \ + do { \ + if (instance->wCollectionNumber != rep->collection) \ + FIXME( "unexpected " #rep "." #sub " parent!\n" ); \ + else if (rep->sub) \ + FIXME( "duplicate " #rep "." #sub " collection!\n" ); \ + else \ + rep->sub = DIDFT_GETINSTANCE( instance->dwType ); \ + } while (0) + + if (instance->wUsagePage == HID_USAGE_PAGE_PID) + { + switch (instance->wUsage) + { + case PID_USAGE_DEVICE_CONTROL_REPORT: SET_COLLECTION( device_control ); break; + case PID_USAGE_DEVICE_CONTROL: SET_SUB_COLLECTION( device_control, control_coll ); break; + } + } + +#undef SET_SUB_COLLECTION +#undef SET_COLLECTION + + return DIENUM_CONTINUE; +} + +static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct pid_control_report *device_control = &impl->pid_device_control; + + if (!(instance->dwType & DIDFT_OUTPUT)) return DIENUM_CONTINUE; + +#define SET_REPORT_ID( rep ) \ + do \ + { \ + if (!rep->id) \ + rep->id = instance->wReportId; \ + else if (rep->id != instance->wReportId) \ + FIXME( "multiple " #rep " report ids!\n" ); \ + } while (0) + + if (instance->wCollectionNumber == device_control->control_coll) + SET_REPORT_ID( device_control ); + +#undef SET_REPORT_ID + + return DIENUM_CONTINUE; +} + static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { static const DIPROPHEADER filter = @@ -1485,6 +1561,20 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID impl->usages_buf = usages; enum_objects( impl, &filter, DIDFT_ALL, init_objects, NULL ); + enum_objects( impl, &filter, DIDFT_COLLECTION, init_pid_reports, NULL ); + enum_objects( impl, &filter, DIDFT_NODATA, init_pid_caps, NULL ); + + TRACE( "device control id %u, coll %u, control coll %u\n", impl->pid_device_control.id, + impl->pid_device_control.collection, impl->pid_device_control.control_coll ); + + if (impl->pid_device_control.id) + { + impl->dev_caps.dwFlags |= DIDC_FORCEFEEDBACK; + impl->dev_caps.dwFFSamplePeriod = 1000000; + impl->dev_caps.dwFFMinTimeResolution = 1000000; + impl->dev_caps.dwHardwareRevision = 1; + impl->dev_caps.dwFFDriverVersion = 1; + } format = impl->base.data_format.wine_df; if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index e6439ed8fe5..638d8f0aaeb 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5646,7 +5646,6 @@ static void test_force_feedback_joystick( void ) check_member_wstr( devinst, expect_devinst, tszInstanceName ); todo_wine check_member_wstr( devinst, expect_devinst, tszProductName ); - todo_wine check_member_guid( devinst, expect_devinst, guidFFDriver ); check_member( devinst, expect_devinst, "%04x", wUsagePage ); check_member( devinst, expect_devinst, "%04x", wUsage ); @@ -5655,20 +5654,15 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetCapabilities( device, &caps ); ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); - todo_wine check_member( caps, expect_caps, "%#x", dwFlags ); check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); check_member( caps, expect_caps, "%d", dwButtons ); check_member( caps, expect_caps, "%d", dwPOVs ); - todo_wine check_member( caps, expect_caps, "%d", dwFFSamplePeriod ); - todo_wine check_member( caps, expect_caps, "%d", dwFFMinTimeResolution ); check_member( caps, expect_caps, "%d", dwFirmwareRevision ); - todo_wine check_member( caps, expect_caps, "%d", dwHardwareRevision ); - todo_wine check_member( caps, expect_caps, "%d", dwFFDriverVersion ); prop_dword.dwData = 0xdeadbeef;

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_EnumEffects.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 5b8daecabff01447e65db2df42fa165fbbe660b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b8daecabff01447e65db2df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:05 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_EnumEffects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ac67625cddc..a43ecde0e9c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -818,10 +818,71 @@ static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, co static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, void *context, DWORD type ) { - FIXME( "iface %p, callback %p, context %p, type %#x stub!\n", iface, callback, context, type ); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); if (!callback) return DIERR_INVALIDPARAM; + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + return DI_OK; }

1 0

Zhiyi Zhang : comctl32/button: Do not restore groupbox font after themed painting.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 1e7e31cab9fd6fd5aea1d580fa3433e4eb662d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e7e31cab9fd6fd5aea1d580… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:29:30 2021 +0800 comctl32/button: Do not restore groupbox font after themed painting. Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 894cc6a3df9..f0b2c56b5fe 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2835,8 +2835,8 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in created_font = TRUE; } } else { - font = (HFONT)SendMessageW(infoPtr->hwnd, WM_GETFONT, 0, 0); - hPrevFont = SelectObject(hDC, font); + if (infoPtr->font) + SelectObject(hDC, infoPtr->font); } GetClientRect(infoPtr->hwnd, &bgRect);

1 0

Zhiyi Zhang : light.msstyles: Add scrollbar width and height.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 760acf6c1300dc66d0524981436168b1a586574d URL: https://source.winehq.org/git/wine.git/?a=commit;h=760acf6c1300dc66d0524981… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:26:14 2021 +0800 light.msstyles: Add scrollbar width and height. Fix a bug that scrollbar width and height don't change when activating Light theme. For example, when theming is inactive, change scrollbar width from the default 16 pixels to 32 pixels, then activate Light theme. Then scrollbar width should be changed to the theme specified scrollbar width. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 76adf8f8398..cf9271cb612 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,7 +144,10 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"; System colors\r\n" +"ScrollbarWidth = 16\r\n" +"ScrollbarHeight = 16\r\n" + +"\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n" "Background = 37 111 149\r\n" "ActiveCaption = 50 150 250\r\n"

1 0

Zhiyi Zhang : comctl32/button: Do not restore command link font after themed painting.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 887e1bcfc31d0fa722433c7652f70dabd05a3c63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887e1bcfc31d0fa722433c76… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:29:55 2021 +0800 comctl32/button: Do not restore command link font after themed painting. Fix button test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1a5d2afa999..b576e6c6db6 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2982,12 +2982,13 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; RECT rc; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &rc); init_custom_draw(&nmcd, infoPtr, hDC, &rc); @@ -2996,7 +2997,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -3011,7 +3012,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE)) { @@ -3083,7 +3084,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -3098,9 +3099,6 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in rc.bottom -= margins.cyBottomHeight; DrawFocusRect(hDC, &rc); } - -cleanup: - if (old_font) SelectObject(hDC, old_font); } void BUTTON_Register(void)

1 0

Nikolay Sivov : ole32/tests: Remove unused variable.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: f264ba76616f2e5eb080ed96d7823a11c48eda0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f264ba76616f2e5eb080ed96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 1 10:24:51 2021 +0300 ole32/tests: Remove unused variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index abd17c9961f..8d3276651bc 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1179,7 +1179,6 @@ static void test_MkParseDisplayName(void) IEnumMoniker *spEM3 = NULL; DWORD pdwReg1=0; - DWORD grflags=0; DWORD pdwReg2=0; IRunningObjectTable * pprot=NULL; @@ -1388,13 +1387,10 @@ todo_wine matchCnt = count_moniker_matches(pbc, spEM1); - grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; - hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk1, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, ROTFLAGS_REGISTRATIONKEEPSALIVE, lpEM1, pmk1, &pdwReg1); ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); - grflags=0; - grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; - hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk2, &pdwReg2); + hr = IRunningObjectTable_Register(pprot, ROTFLAGS_REGISTRATIONKEEPSALIVE, lpEM1, pmk2, &pdwReg2); ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); hr = IRunningObjectTable_EnumRunning(pprot, &spEM2);

1 0

Jacek Caban : gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 01b6ba88d615125d2244a28a0adfda07dca79d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b6ba88d615125d2244a28a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:57:54 2021 +0200 gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c00e5128ced..c21993a8ca5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -26,6 +26,8 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <pthread.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -39,6 +41,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); +static pthread_mutex_t dc_attr_lock = PTHREAD_MUTEX_INITIALIZER; + +struct dc_attr_bucket +{ + struct list entry; + DC_ATTR *entries; + DC_ATTR *next_free; + DC_ATTR *next_unused; +}; + +static struct list dc_attr_buckets = LIST_INIT( dc_attr_buckets ); + static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -74,6 +88,70 @@ static inline DC *get_dc_obj( HDC hdc ) } } +/* alloc DC_ATTR from a pool of memory accessible from client */ +static DC_ATTR *alloc_dc_attr(void) +{ + struct dc_attr_bucket *bucket; + DC_ATTR *dc_attr = NULL; + + pthread_mutex_lock( &dc_attr_lock ); + + LIST_FOR_EACH_ENTRY( bucket, &dc_attr_buckets, struct dc_attr_bucket, entry ) + { + if (bucket->next_free) + { + dc_attr = bucket->next_free; + bucket->next_free = *(void **)bucket->next_free; + break; + } + if ((char *)bucket->next_unused - (char *)bucket->entries + sizeof(*dc_attr) <= + system_info.AllocationGranularity) + { + dc_attr = bucket->next_unused++; + break; + } + } + + if (!dc_attr && (bucket = malloc( sizeof(*bucket) ))) + { + SIZE_T size = system_info.AllocationGranularity; + bucket->entries = NULL; + if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, 0, &size, + MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + { + bucket->next_free = NULL; + bucket->next_unused = bucket->entries + 1; + dc_attr = bucket->entries; + list_add_head( &dc_attr_buckets, &bucket->entry ); + } + else free( bucket ); + } + + if (dc_attr) memset( dc_attr, 0, sizeof( *dc_attr )); + + pthread_mutex_unlock( &dc_attr_lock ); + + return dc_attr; +} + + +static void free_dc_attr( DC_ATTR *dc_attr ) +{ + struct dc_attr_bucket *bucket; + + pthread_mutex_lock( &dc_attr_lock ); + + LIST_FOR_EACH_ENTRY( bucket, &dc_attr_buckets, struct dc_attr_bucket, entry ) + { + if (bucket->entries > dc_attr || dc_attr >= bucket->next_unused) continue; + *(void **)dc_attr = bucket->next_free; + bucket->next_free = dc_attr; + break; + } + + pthread_mutex_unlock( &dc_attr_lock ); +} + /*********************************************************************** * set_initial_dc_state @@ -133,7 +211,7 @@ DC *alloc_dc_ptr( DWORD magic ) DC *dc; if (!(dc = calloc( 1, sizeof(*dc) ))) return NULL; - if (!(dc->attr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc->attr) ))) + if (!(dc->attr = alloc_dc_attr())) { free( dc ); return NULL; @@ -152,7 +230,7 @@ DC *alloc_dc_ptr( DWORD magic ) if (!(dc->hSelf = alloc_gdi_handle( &dc->obj, magic, &dc_funcs ))) { - RtlFreeHeap( GetProcessHeap(), 0, dc->attr ); + free_dc_attr( dc->attr ); free( dc ); return NULL; } @@ -179,7 +257,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) NtGdiDeleteObjectApp( dc->hVisRgn ); if (dc->region) NtGdiDeleteObjectApp( dc->region ); if (dc->path) free_gdi_path( dc->path ); - RtlFreeHeap( GetProcessHeap(), 0, dc->attr ); + free_dc_attr( dc->attr ); free( dc ); }

1 0

Jacek Caban : gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: fc7420de71f8126112ada8bf380d3a79785bb661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7420de71f8126112ada8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:58:03 2021 +0200 gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 47b413ab0aa..8381c9e2746 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -42,9 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define FIRST_GDI_HANDLE 32 -static GDI_SHARED_MEMORY gdi_shared; +static GDI_SHARED_MEMORY *gdi_shared; static GDI_HANDLE_ENTRY *next_free; -static GDI_HANDLE_ENTRY *next_unused = gdi_shared.Handles + FIRST_GDI_HANDLE; +static GDI_HANDLE_ENTRY *next_unused; static LONG debug_count; SYSTEM_BASIC_INFORMATION system_info; @@ -52,7 +52,7 @@ const struct user_callbacks *user_callbacks = NULL; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { - unsigned int idx = entry - gdi_shared.Handles; + unsigned int idx = entry - gdi_shared->Handles; return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } @@ -60,10 +60,10 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) { unsigned int idx = LOWORD(handle); - if (idx < GDI_MAX_HANDLE_COUNT && gdi_shared.Handles[idx].Type) + if (idx < GDI_MAX_HANDLE_COUNT && gdi_shared->Handles[idx].Type) { - if (!HIWORD( handle ) || HIWORD( handle ) == gdi_shared.Handles[idx].Unique) - return &gdi_shared.Handles[idx]; + if (!HIWORD( handle ) || HIWORD( handle ) == gdi_shared->Handles[idx].Unique) + return &gdi_shared->Handles[idx]; } if (handle) WARN( "invalid handle %p\n", handle ); return NULL; @@ -605,19 +605,26 @@ static HFONT create_scaled_font( const LOGFONTW *deffont, unsigned int dpi ) return create_font( &lf ); } -static void set_gdi_shared(void) +static void init_gdi_shared(void) { + SIZE_T size = sizeof(*gdi_shared); + + if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) + return; + next_unused = gdi_shared->Handles + FIRST_GDI_HANDLE; + #ifndef _WIN64 if (NtCurrentTeb()->GdiBatchCount) { TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; PEB64 *peb64 = (PEB64 *)(UINT_PTR)teb64->Peb; - peb64->GdiSharedHandleTable = (UINT_PTR)&gdi_shared; + peb64->GdiSharedHandleTable = (UINT_PTR)gdi_shared; return; } #endif /* NOTE: Windows uses 32-bit for 32-bit kernel */ - NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; + NtCurrentTeb()->Peb->GdiSharedHandleTable = gdi_shared; } HGDIOBJ get_stock_object( INT obj ) @@ -695,7 +702,7 @@ static void init_stock_objects( unsigned int dpi ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < STOCK_LAST + 5; i++) { - GDI_HANDLE_ENTRY *entry = &gdi_shared.Handles[FIRST_GDI_HANDLE + i]; + GDI_HANDLE_ENTRY *entry = &gdi_shared->Handles[FIRST_GDI_HANDLE + i]; entry_obj( entry )->system = TRUE; entry->StockFlag = 1; } @@ -730,7 +737,7 @@ static void dump_gdi_objects( void ) TRACE( "%u objects:\n", GDI_MAX_HANDLE_COUNT ); EnterCriticalSection( &gdi_section ); - for (entry = gdi_shared.Handles; entry < next_unused; entry++) + for (entry = gdi_shared->Handles; entry < next_unused; entry++) { if (!entry->Type) TRACE( "handle %p FREE\n", entry_to_handle( entry )); @@ -760,7 +767,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry = next_free; if (entry) next_free = (GDI_HANDLE_ENTRY *)(UINT_PTR)entry->Object; - else if (next_unused < gdi_shared.Handles + GDI_MAX_HANDLE_COUNT) + else if (next_unused < gdi_shared->Handles + GDI_MAX_HANDLE_COUNT) entry = next_unused++; else { @@ -1269,7 +1276,9 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p if (reason != DLL_PROCESS_ATTACH) return 0; NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); - set_gdi_shared(); + init_gdi_shared(); + if (!gdi_shared) return STATUS_NO_MEMORY; + dpi = font_init(); init_stock_objects( dpi ); user_callbacks = ptr_in;

1 0