October 2021 - Wine-Devel - list.winehq.org

[PATCH v2 2/3] gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.
by Jacek Caban Oct. 1, 2021

Oct. 1, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Initialize the base pointer before NtAllocateVirtualMemory call. dlls/gdi32/dc.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-)

2 1

[PATCH v2 1/3] gdi32: Use native memory allocators in Unix library.
by Jacek Caban Oct. 1, 2021

Oct. 1, 2021

2 1

[PATCH] hidparse.sys: Preserve the original report_count in parse_new_value_caps.
by Rémi Bernon Oct. 1, 2021

Oct. 1, 2021

From: Ivo Ivanov <logos128(a)gmail.com> We force state->items.report_count to 1 while building the alternate value array, but the item is global and should be preserved across caps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51822 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 9 ++++----- dlls/hidparse.sys/main.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 71989ef1b3c..0cfcfedc6cf 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1784,8 +1784,8 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status ); - buffer[6] = 2; - buffer[7] = 4; + buffer[13] = 2; + buffer[14] = 4; ok( !memcmp( buffer, report, caps.InputReportByteLength ), "unexpected report data\n" ); status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, @@ -2502,8 +2502,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) REPORT_COUNT(1, 8), REPORT_SIZE(1, 1), INPUT(1, Cnst|Var|Abs), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), + REPORT_SIZE(1, 8), INPUT(1, Cnst|Var|Abs), /* needs to be 8 bit aligned as next has Buff */ @@ -2724,7 +2723,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = report_id ? 25 : 26, + .InputReportByteLength = report_id ? 32 : 33, .OutputReportByteLength = report_id ? 2 : 3, .FeatureReportByteLength = report_id ? 21 : 22, .NumberLinkCollectionNodes = 10, diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index ca15a91c75a..18ee23974f0 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -360,6 +360,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY { struct hid_value_caps *values; USAGE usage_page = state->items.usage_page; + USHORT report_count = state->items.report_count; DWORD i, usages_size = max( 1, state->usages_size ); USHORT *byte_length = &state->byte_length[type]; ULONG start_bit, *bit_size = &state->bit_size[type][state->items.report_id]; @@ -408,6 +409,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY state->data_count[type] = state->items.data_index_max + 1; state->items.usage_page = usage_page; + state->items.report_count = report_count; reset_local_items( state ); return TRUE; } -- 2.33.0

1 0

[PATCH 01/10] dinput: Stub hid_joystick force feedback methods.
by Rémi Bernon Oct. 1, 2021

Oct. 1, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 83 +++++++++++++++++++++++++++++++++++--- dlls/dinput8/tests/hid.c | 11 +---- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 834a5de0860..a6c6de3a889 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -780,6 +780,77 @@ static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, D return S_OK; } +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, + const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, guid %s, params %p, out %p, outer %p stub!\n", iface, debugstr_guid( guid ), + params, out, outer ); + + if (!out) return E_POINTER; + + return DIERR_UNSUPPORTED; +} + +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 ); + + if (!callback) return DIERR_INVALIDPARAM; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, + const GUID *guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + if (info->dwSize != sizeof(DIEFFECTINFOW)) return DIERR_INVALIDPARAM; + + return DIERR_DEVICENOTREG; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD command ) +{ + FIXME( "iface %p, command %x stub!\n", iface, command ); + + switch (command) + { + case DISFFC_RESET: + case DISFFC_STOPALL: + case DISFFC_PAUSE: + case DISFFC_CONTINUE: + case DISFFC_SETACTUATORSON: + case DISFFC_SETACTUATORSOFF: + return DIERR_UNSUPPORTED; + } + + return DIERR_INVALIDPARAM; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *context, DWORD flags ) +{ + FIXME( "iface %p, callback %p, context %p, flags %#x stub!\n", iface, callback, context, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return DIERR_UNSUPPORTED; +} + static HRESULT WINAPI hid_joystick_Poll( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -837,12 +908,12 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ - IDirectInputDevice2WImpl_CreateEffect, - IDirectInputDevice2WImpl_EnumEffects, - IDirectInputDevice2WImpl_GetEffectInfo, - IDirectInputDevice2WImpl_GetForceFeedbackState, - IDirectInputDevice2WImpl_SendForceFeedbackCommand, - IDirectInputDevice2WImpl_EnumCreatedEffectObjects, + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, hid_joystick_Poll, IDirectInputDevice2WImpl_SendDeviceData, diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 1ab6e645947..e6439ed8fe5 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4038,7 +4038,6 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[5], "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, 0xfe ); @@ -4054,18 +4053,14 @@ static void test_simple_joystick(void) check_effects_params.expect_count - check_effects_params.index ); hr = IDirectInputDevice8_GetEffectInfo( device, NULL, &GUID_Sine ); - todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); effectinfo.dwSize = sizeof(DIEFFECTINFOW) + 1; hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_NULL ); - todo_wine ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - todo_wine ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, NULL ); @@ -4645,18 +4640,14 @@ static void test_simple_joystick(void) winetest_pop_context(); hr = IDirectInputDevice8_GetForceFeedbackState( device, NULL ); - todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); - todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); objdata[0].dwOfs = 0xd; @@ -5713,6 +5704,7 @@ static void test_force_feedback_joystick( void ) effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + todo_wine ok( hr == DI_OK, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); todo_wine check_member_guid( effectinfo, expect_effects[0], guid ); @@ -5802,7 +5794,6 @@ static void test_force_feedback_joystick( void ) ok( hr == 0x80040301, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); -- 2.33.0

1 9

[PATCH] ole32/tests: Remove unused variable.
by Nikolay Sivov Oct. 1, 2021

Oct. 1, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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); -- 2.33.0

1 0

[PATCH v3] riched20: Fix saving to disk first-indent and left-indent (\fi and \li)
by Philip Hardin Oct. 1, 2021

Oct. 1, 2021

2 1

[PATCH 5/5] comctl32/button: Do not restore command link font after themed painting.
by Zhiyi Zhang Sept. 30, 2021

Sept. 30, 2021

Fix button test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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) -- 2.30.2

1 0

[PATCH 4/5] comctl32/button: Do not restore split button font after themed painting.
by Zhiyi Zhang Sept. 30, 2021

Sept. 30, 2021

Fix button test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 f0b2c56b5fe..1a5d2afa999 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2876,12 +2876,13 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_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; RECT rc, content_rect, push_rect, dropdown_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &rc); init_custom_draw(&nmcd, infoPtr, hDC, &rc); @@ -2890,7 +2891,7 @@ static void SB_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_PUSHBUTTON, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -2934,7 +2935,7 @@ static void SB_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)) { @@ -2963,7 +2964,7 @@ static void SB_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) { @@ -2977,9 +2978,6 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in push_rect.bottom -= margins.cyBottomHeight; DrawFocusRect(hDC, &push_rect); } - -cleanup: - if (old_font) SelectObject(hDC, old_font); } static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.30.2

1 0

[PATCH 3/5] comctl32/button: Do not restore groupbox font after themed painting.
by Zhiyi Zhang Sept. 30, 2021

Sept. 30, 2021

Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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); -- 2.30.2

1 0

[PATCH 2/5] comctl32/button: Do not restore checkbox font after themed painting.
by Zhiyi Zhang Sept. 30, 2021

Sept. 30, 2021

Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7dfc1720508..894cc6a3df9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2744,8 +2744,7 @@ static void CB_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); } if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) -- 2.30.2

1 0