November 2021 - Wine-Commits

Rémi Bernon : dinput: Pretend that DIPROP_AUTOCENTER is supported.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: e04cfc0b0a7c33f2d882b453d0fceda9e4793bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04cfc0b0a7c33f2d882b453… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:00 2021 +0100 dinput: Pretend that DIPROP_AUTOCENTER is supported. Star Wars Episode I Racer will ignore force-feedback joystick devices if we return an error here. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 3 ++- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c79b182bc66..dff1f3426d3 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1082,7 +1082,8 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co EnterCriticalSection( &impl->crit ); if (impl->acquired) hr = DIERR_ACQUIRED; else if (value->dwData > DIPROPAUTOCENTER_ON) hr = DIERR_INVALIDPARAM; - else hr = DIERR_UNSUPPORTED; + else if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) hr = DIERR_UNSUPPORTED; + else hr = DI_OK; LeaveCriticalSection( &impl->crit ); return hr; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index af8d48dfc90..a0e202ba804 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -7360,7 +7360,6 @@ static void test_force_feedback_joystick( void ) prop_dword.diph.dwObj = 0; prop_dword.dwData = DIPROPAUTOCENTER_ON; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device );

1 0

Rémi Bernon : dinput8/tests: Check setting DIPROP_AUTOCENTER on force-feedback joystick.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: d5a44e98da51482d64f8e4ae34a8759e0a517ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a44e98da51482d64f8e4ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:34:59 2021 +0100 dinput8/tests: Check setting DIPROP_AUTOCENTER on force-feedback joystick. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index c6d01b8bee7..af8d48dfc90 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -7356,11 +7356,16 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); + prop_dword.diph.dwHow = DIPH_DEVICE; + prop_dword.diph.dwObj = 0; + prop_dword.dwData = DIPROPAUTOCENTER_ON; + hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); - prop_dword.diph.dwHow = DIPH_DEVICE; - prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine

1 0

Rémi Bernon : dinput: Check for DIEFFECT_DX6 size when DIEP_STARTDELAY is set.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 869a0ddacadbf85f3849bb7ca2473e307565bdae URL: https://source.winehq.org/git/wine.git/?a=commit;h=869a0ddacadbf85f3849bb7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:01 2021 +0100 dinput: Check for DIEFFECT_DX6 size when DIEP_STARTDELAY is set. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 5 +++-- dlls/dinput/joystick_hid.c | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index dff1f3426d3..85392c6b30b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1357,7 +1357,7 @@ static HRESULT WINAPI dinput_device_CreateEffect( IDirectInputDevice8W *iface, c IUnknown *outer ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DWORD flags = DIEP_ALLPARAMS; + DWORD flags; HRESULT hr; TRACE( "iface %p, guid %s, params %p, out %p, outer %p\n", iface, debugstr_guid( guid ), @@ -1372,8 +1372,9 @@ static HRESULT WINAPI dinput_device_CreateEffect( IDirectInputDevice8W *iface, c hr = IDirectInputEffect_Initialize( *out, DINPUT_instance, impl->dinput->dwVersion, guid ); if (FAILED(hr)) goto failed; - if (!params) return DI_OK; + + flags = params->dwSize == sizeof(DIEFFECT_DX6) ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) flags |= DIEP_NODOWNLOAD; hr = IDirectInputEffect_SetParameters( *out, params, flags ); if (FAILED(hr)) goto failed; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 610a75871f1..20a10bde6ae 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2149,7 +2149,11 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa if (flags & DIEP_DURATION) params->dwDuration = impl->params.dwDuration; if (flags & DIEP_GAIN) params->dwGain = impl->params.dwGain; if (flags & DIEP_SAMPLEPERIOD) params->dwSamplePeriod = impl->params.dwSamplePeriod; - if (flags & DIEP_STARTDELAY) params->dwStartDelay = impl->params.dwStartDelay; + if (flags & DIEP_STARTDELAY) + { + if (params->dwSize != sizeof(DIEFFECT_DX6)) return DIERR_INVALIDPARAM; + params->dwStartDelay = impl->params.dwStartDelay; + } if (flags & DIEP_TRIGGERREPEATINTERVAL) params->dwTriggerRepeatInterval = impl->params.dwTriggerRepeatInterval; if (flags & DIEP_TRIGGERBUTTON) @@ -2336,6 +2340,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa } if (flags & DIEP_STARTDELAY) { + if (params->dwSize != sizeof(DIEFFECT_DX6)) return DIERR_INVALIDPARAM; if (impl->params.dwStartDelay != params->dwStartDelay) impl->modified = TRUE; impl->params.dwStartDelay = params->dwStartDelay; }

1 0

Rémi Bernon : dinput: Support both DIEFFECT_DX5 and DIEFFECT_DX6 parameters.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 67d38c699110a186ff69ecfa9a11e8c0cb3305a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d38c699110a186ff69ecfa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 09:35:02 2021 +0100 dinput: Support both DIEFFECT_DX5 and DIEFFECT_DX6 parameters. Star Wars Episode I Racer force-feedback doesn't work otherwise as it passes a DIEFFECT_DX5 struct to 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 20a10bde6ae..541aa26e73b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2043,7 +2043,7 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa TRACE( "iface %p, params %p, flags %#x.\n", iface, params, flags ); if (!params) return DI_OK; - if (params->dwSize != sizeof(DIEFFECT)) return DIERR_INVALIDPARAM; + if (params->dwSize != sizeof(DIEFFECT_DX6) && params->dwSize != sizeof(DIEFFECT_DX5)) return DIERR_INVALIDPARAM; capacity = params->cAxes; object_flags = params->dwFlags & (DIEFF_OBJECTIDS | DIEFF_OBJECTOFFSETS); direction_flags = params->dwFlags & (DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL); @@ -2199,7 +2199,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa TRACE( "iface %p, params %p, flags %#x.\n", iface, params, flags ); if (!params) return E_POINTER; - if (params->dwSize != sizeof(DIEFFECT)) return DIERR_INVALIDPARAM; + if (params->dwSize != sizeof(DIEFFECT_DX6) && params->dwSize != sizeof(DIEFFECT_DX5)) return DIERR_INVALIDPARAM; object_flags = params->dwFlags & (DIEFF_OBJECTIDS | DIEFF_OBJECTOFFSETS); direction_flags = params->dwFlags & (DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL);

1 0

Nikolay Sivov : mfplay: Fix leaks on error paths (Coverity).
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: b676f14865e2765729e238ceb8e54e96e63f1da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b676f14865e2765729e238ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 11:43:07 2021 +0300 mfplay: Fix leaks on error paths (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 12ea653b97d..5abee9d7de8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1024,6 +1024,15 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IUnknown *object; HRESULT hr; + if (sync && !ret) + return E_POINTER; + + if (!sync && !player->callback) + { + WARN("Asynchronous item creation is not supported without user callback.\n"); + return MF_E_INVALIDREQUEST; + } + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; @@ -1035,9 +1044,6 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, if (sync) { - if (!ret) - return E_POINTER; - *ret = NULL; if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, @@ -1054,17 +1060,9 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } IMFPMediaItem_Release(&item->IMFPMediaItem_iface); - - return hr; } else { - if (!player->callback) - { - WARN("Asynchronous item creation is not supported without user callback.\n"); - return MF_E_INVALIDREQUEST; - } - if (ret) *ret = NULL; hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE,

1 0

Jinoh Kang : gdi32: Allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: da126e19e3f033b2f3f79e1821ce8dc6e9d44b47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da126e19e3f033b2f3f79e18… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:34 2021 +0900 gdi32: Allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. User-facing APIs should accept biSizeImage == 0, and fix it up accordingly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51834 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 210 ++++++++++++++++++++++++++++++++++++++++---- dlls/gdi32/tests/metafile.c | 14 --- 2 files changed, 194 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da126e19e3f033b2f3f7…

1 0

Connor McAdams : include: Update existing provider definitions in uiautomationcore.idl.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 273d3255d59ec1a117fcfed3dec5adeeeb2d6529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=273d3255d59ec1a117fcfed3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sat Nov 6 15:57:19 2021 -0400 include: Update existing provider definitions in uiautomationcore.idl. Update definitions to match newer Windows SDK headers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationcore.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 3ae6dac4b3f..9ee79170e4a 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -26,7 +26,10 @@ enum ProviderOptions { ProviderOptions_NonClientAreaProvider = 0x0004, ProviderOptions_OverrideProvider = 0x0008, ProviderOptions_ProviderOwnsSetFocus = 0x0010, - ProviderOptions_UseComThreading = 0x0020 + ProviderOptions_UseComThreading = 0x0020, + ProviderOptions_RefuseNonClientSupport = 0x0040, + ProviderOptions_HasNativeIAccessible = 0x0080, + ProviderOptions_UseClientCoordinates = 0x0100, }; typedef int PROPERTYID; @@ -48,7 +51,8 @@ library UIA [ object, uuid(d6dd68d1-86fd-4332-8666-9abedea2d24c), - pointer_default(unique) + pointer_default(unique), + oleautomation ] interface IRawElementProviderSimple : IUnknown {

1 0

Connor McAdams : include: Define more provider interfaces in uiautomationcore.idl.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: a077f98ee365191f073e236b8f46c236378b51f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a077f98ee365191f073e236b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sat Nov 6 15:57:20 2021 -0400 include: Define more provider interfaces in uiautomationcore.idl. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationcore.idl | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 9ee79170e4a..170b0c76de1 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -20,6 +20,14 @@ import "oaidl.idl"; import "oleacc.idl"; +enum NavigateDirection { + NavigateDirection_Parent = 0x0000, + NavigateDirection_NextSibling = 0x0001, + NavigateDirection_PreviousSibling = 0x0002, + NavigateDirection_FirstChild = 0x0003, + NavigateDirection_LastChild = 0x0004, +}; + enum ProviderOptions { ProviderOptions_ClientSideProvider = 0x0001, ProviderOptions_ServerSideProvider = 0x0002, @@ -38,6 +46,13 @@ typedef int EVENTID; typedef int TEXTATTRIBUTEID; typedef int CONTROLTYPEID; +struct UiaRect { + double left; + double top; + double width; + double height; +}; + [ version(1.0), uuid(930299ce-9965-4dec-b0f4-a54848d4b667), @@ -92,4 +107,48 @@ library UIA [in] IRawElementProviderSimple *pIn, [out] IAccessibleEx **ppRetValOut); } + + interface IRawElementProviderFragmentRoot; + + [ + object, + uuid(f7063da8-8359-439c-9297-bbc5299a7d87), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderFragment : IUnknown + { + HRESULT Navigate( + [in] enum NavigateDirection direction, + [out, retval] IRawElementProviderFragment **pRetVal); + + HRESULT GetRuntimeId([out, retval] SAFEARRAY(int) *pRetVal); + HRESULT get_BoundingRectangle([out, retval] struct UiaRect *pRetVal); + /* + * FIXME: Current versions of Windows SDK use + * SAFEARRAY(IRawElementProviderFragmentRoot *) instead of + * SAFEARRAY(VARIANT). The new type is currently unsupported + * in widl, we should switch to it when it is. + */ + HRESULT GetEmbeddedFragmentRoots([out, retval] SAFEARRAY(VARIANT) *pRetVal); + HRESULT SetFocus(); + + [propget] HRESULT FragmentRoot([out, retval] IRawElementProviderFragmentRoot **pRetVal); + } + + [ + object, + uuid(620ce2a5-ab8f-40a9-86cb-de3c75599b58), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderFragmentRoot : IUnknown + { + HRESULT ElementProviderFromPoint( + [in] double x, + [in] double y, + [out, retval] IRawElementProviderFragment **pRetVal); + + HRESULT GetFocus([out, retval] IRawElementProviderFragment **pRetVal); + } }

1 0

Connor McAdams : include: Update existing PROPERTYIDs in uiautomationclient.idl.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: eb745fd01783a7ade0a7f9d36b924b262b10252c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb745fd01783a7ade0a7f9d3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sat Nov 6 15:57:21 2021 -0400 include: Update existing PROPERTYIDs in uiautomationclient.idl. Add PROPERTYID definitions from newer versions of Windows headers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationclient.idl | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index ca768ba6d07..a353a63816b 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -143,6 +143,70 @@ library UIAutomationClient { const long UIA_IsItemContainerPatternAvailablePropertyId = 30108; const long UIA_IsVirtualizedItemPatternAvailablePropertyId = 30109; const long UIA_IsSynchronizedInputPatternAvailablePropertyId = 30110; + const long UIA_OptimizeForVisualContentPropertyId = 30111; + const long UIA_IsObjectModelPatternAvailablePropertyId = 30112; + const long UIA_AnnotationAnnotationTypeIdPropertyId = 30113; + const long UIA_AnnotationAnnotationTypeNamePropertyId = 30114; + const long UIA_AnnotationAuthorPropertyId = 30115; + const long UIA_AnnotationDateTimePropertyId = 30116; + const long UIA_AnnotationTargetPropertyId = 30117; + const long UIA_IsAnnotationPatternAvailablePropertyId = 30118; + const long UIA_IsTextPattern2AvailablePropertyId = 30119; + const long UIA_StylesStyleIdPropertyId = 30120; + const long UIA_StylesStyleNamePropertyId = 30121; + const long UIA_StylesFillColorPropertyId = 30122; + const long UIA_StylesFillPatternStylePropertyId = 30123; + const long UIA_StylesShapePropertyId = 30124; + const long UIA_StylesFillPatternColorPropertyId = 30125; + const long UIA_StylesExtendedPropertiesPropertyId = 30126; + const long UIA_IsStylesPatternAvailablePropertyId = 30127; + const long UIA_IsSpreadsheetPatternAvailablePropertyId = 30128; + const long UIA_SpreadsheetItemFormulaPropertyId = 30129; + const long UIA_SpreadsheetItemAnnotationObjectsPropertyId = 30130; + const long UIA_SpreadsheetItemAnnotationTypesPropertyId = 30131; + const long UIA_IsSpreadsheetItemPatternAvailablePropertyId = 30132; + const long UIA_Transform2CanZoomPropertyId = 30133; + const long UIA_IsTransformPattern2AvailablePropertyId = 30134; + const long UIA_LiveSettingPropertyId = 30135; + const long UIA_IsTextChildPatternAvailablePropertyId = 30136; + const long UIA_IsDragPatternAvailablePropertyId = 30137; + const long UIA_DragIsGrabbedPropertyId = 30138; + const long UIA_DragDropEffectPropertyId = 30139; + const long UIA_DragDropEffectsPropertyId = 30140; + const long UIA_IsDropTargetPatternAvailablePropertyId = 30141; + const long UIA_DropTargetDropTargetEffectPropertyId = 30142; + const long UIA_DropTargetDropTargetEffectsPropertyId = 30143; + const long UIA_DragGrabbedItemsPropertyId = 30144; + const long UIA_Transform2ZoomLevelPropertyId = 30145; + const long UIA_Transform2ZoomMinimumPropertyId = 30146; + const long UIA_Transform2ZoomMaximumPropertyId = 30147; + const long UIA_FlowsFromPropertyId = 30148; + const long UIA_IsTextEditPatternAvailablePropertyId = 30149; + const long UIA_IsPeripheralPropertyId = 30150; + const long UIA_IsCustomNavigationPatternAvailablePropertyId = 30151; + const long UIA_PositionInSetPropertyId = 30152; + const long UIA_SizeOfSetPropertyId = 30153; + const long UIA_LevelPropertyId = 30154; + const long UIA_AnnotationTypesPropertyId = 30155; + const long UIA_AnnotationObjectsPropertyId = 30156; + const long UIA_LandmarkTypePropertyId = 30157; + const long UIA_LocalizedLandmarkTypePropertyId = 30158; + const long UIA_FullDescriptionPropertyId = 30159; + const long UIA_FillColorPropertyId = 30160; + const long UIA_OutlineColorPropertyId = 30161; + const long UIA_FillTypePropertyId = 30162; + const long UIA_VisualEffectsPropertyId = 30163; + const long UIA_OutlineThicknessPropertyId = 30164; + const long UIA_CenterPointPropertyId = 30165; + const long UIA_RotationPropertyId = 30166; + const long UIA_SizePropertyId = 30167; + const long UIA_IsSelectionPattern2AvailablePropertyId = 30168; + const long UIA_Selection2FirstSelectedItemPropertyId = 30169; + const long UIA_Selection2LastSelectedItemPropertyId = 30170; + const long UIA_Selection2CurrentSelectedItemPropertyId = 30171; + const long UIA_Selection2ItemCountPropertyId = 30172; + const long UIA_HeadingLevelPropertyId = 30173; + const long UIA_IsDialogPropertyId = 30174; /* } */

1 0

Jinoh Kang : gdi32: Fix bounding box calculation for EMR_STRETCHDIBITS.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 03e9b882a29c971e18f2f7024d0e4ce316c4e80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9b882a29c971e18f2f702… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 6 01:37:33 2021 +0900 gdi32: Fix bounding box calculation for EMR_STRETCHDIBITS. rclBounds should denote a closed interval for each axis. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 4 ++-- dlls/gdi32/tests/metafile.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 981849a9e86..203350d937d 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1639,8 +1639,8 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, emr->rclBounds.left = x_dst; emr->rclBounds.top = y_dst; - emr->rclBounds.right = x_dst + width_dst; - emr->rclBounds.bottom = y_dst + height_dst; + emr->rclBounds.right = x_dst + width_dst - 1; + emr->rclBounds.bottom = y_dst + height_dst - 1; /* save the record we just created */ ret = emfdc_record( dc_attr->emf, &emr->emr ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 261e438d670..0987df95f2d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -6376,12 +6376,6 @@ static void test_emf_StretchDIBits(void) {32, 4, 4, BI_BITFIELDS, 1, EMF_STRETCHDIBITS_32BIT_4X4_SIZED, sizeof(EMF_STRETCHDIBITS_32BIT_4X4_SIZED), 0, 3, {{0x00, 0x00, 0xff}, {0xe0, 0xff, 0x00}, {0xff, 0x00, 0x00}}}, }; - if (!strcmp(winetest_platform, "wine")) - { - skip("Wine sets EMRSTRETCHDIBITS::rclBounds incorrectly\n"); - return; - } - hdc = GetDC(0); for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx)

1 0