March 2023 - Wine-commits - list.winehq.org

Piotr Caban : wineps: Handle EMR_ARC record in spool files.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 53acff5efb31c3f124213004ae32dc8e41b8772b URL: https://gitlab.winehq.org/wine/wine/-/commit/53acff5efb31c3f124213004ae32dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:29:42 2023 +0100 wineps: Handle EMR_ARC record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 9a3de67489e..13846423a4d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -225,6 +225,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, p->rclBox.top, p->rclBox.right, p->rclBox.bottom, p->szlCorner.cx, p->szlCorner.cy); } + case EMR_ARC: + { + const EMRARC *p = (const EMRARC *)rec; + + return PSDRV_Arc(&data->pdev->dev, p->rclBox.left, p->rclBox.top, + p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, + p->ptlStart.y, p->ptlEnd.x, p->ptlEnd.y); + } case EMR_LINETO: { const EMRLINETO *line = (const EMRLINETO *)rec;

1 0

Piotr Caban : wineps: Handle EMR_CHORD record in spool files.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: e4ecc89b6280cb74994031d52443e20400f3856f URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ecc89b6280cb74994031d52443e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:30:54 2023 +0100 wineps: Handle EMR_CHORD record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 13846423a4d..2cc3ea82bce 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -233,6 +233,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, p->ptlStart.y, p->ptlEnd.x, p->ptlEnd.y); } + case EMR_CHORD: + { + const EMRCHORD *p = (const EMRCHORD *)rec; + + return PSDRV_Chord(&data->pdev->dev, p->rclBox.left, p->rclBox.top, + p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, + p->ptlStart.y, p->ptlEnd.x, p->ptlEnd.y); + } case EMR_LINETO: { const EMRLINETO *line = (const EMRLINETO *)rec;

1 0

Piotr Caban : wineps: Handle EMR_PIE record in spool files.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 2f06af6ae0994d0dedd806f8aa90e1acc2e9d350 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f06af6ae0994d0dedd806f8aa90e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:31:37 2023 +0100 wineps: Handle EMR_PIE record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 2cc3ea82bce..31312610c50 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -241,6 +241,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, p->ptlStart.y, p->ptlEnd.x, p->ptlEnd.y); } + case EMR_PIE: + { + const EMRPIE *p = (const EMRPIE *)rec; + + return PSDRV_Pie(&data->pdev->dev, p->rclBox.left, p->rclBox.top, + p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, + p->ptlStart.y, p->ptlEnd.x, p->ptlEnd.y); + } case EMR_LINETO: { const EMRLINETO *line = (const EMRLINETO *)rec;

1 0

Alistair Leslie-Hughes : include: Add Missing IUISettings interfaces.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: dc32c192c3c06f4f8c3212f949780ca5bd2884ac URL: https://gitlab.winehq.org/wine/wine/-/commit/dc32c192c3c06f4f8c3212f949780c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 22 08:03:25 2023 +1100 include: Add Missing IUISettings interfaces. --- include/windows.ui.viewmanagement.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl index e7a90646338..dcfa83aa74d 100644 --- a/include/windows.ui.viewmanagement.idl +++ b/include/windows.ui.viewmanagement.idl @@ -39,7 +39,11 @@ namespace Windows.UI.ViewManagement typedef enum UIElementType UIElementType; interface IUISettings; + interface IUISettings2; interface IUISettings3; + interface IUISettings4; + interface IUISettings5; + interface IUISettings6; runtimeclass UISettings; @@ -141,6 +145,19 @@ namespace Windows.UI.ViewManagement HRESULT UIElementColor([in] Windows.UI.ViewManagement.UIElementType element, [out, retval] Windows.UI.Color *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.UISettings), + uuid(bad82401-2721-44f9-bb91-2bb228be442f) + ] + interface IUISettings2 : IInspectable + { + [propget] HRESULT TextScaleFactor([out, retval] DOUBLE *value); + [eventadd] HRESULT TextScaleFactorChanged([in] Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *cookie); + [eventremove] HRESULT TextScaleFactorChanged([in] EventRegistrationToken cookie); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.ViewManagement.UISettings), @@ -162,6 +179,7 @@ namespace Windows.UI.ViewManagement runtimeclass UISettings { [default] interface Windows.UI.ViewManagement.IUISettings; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IUISettings2; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IUISettings3; } }

1 0

Alistair Leslie-Hughes : windows.ui: Add Stubbed interface IUISettings.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: f797ad083e05e6fa36dde7608ce1e09c5881b890 URL: https://gitlab.winehq.org/wine/wine/-/commit/f797ad083e05e6fa36dde7608ce1e0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 22 11:05:01 2023 +1100 windows.ui: Add Stubbed interface IUISettings. This corrects what interface should be returned, there isn't a hierarchy with these IUISettings at all. It should return IUISettings and the QI for any others that it requires. --- dlls/windows.ui/uisettings.c | 182 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 170 insertions(+), 12 deletions(-) diff --git a/dlls/windows.ui/uisettings.c b/dlls/windows.ui/uisettings.c index 943fbb6a37e..cd1a2b7050d 100644 --- a/dlls/windows.ui/uisettings.c +++ b/dlls/windows.ui/uisettings.c @@ -25,47 +25,62 @@ WINE_DEFAULT_DEBUG_CHANNEL(ui); struct uisettings { + IUISettings IUISettings_iface; IUISettings3 IUISettings3_iface; LONG ref; }; +static inline struct uisettings *impl_from_IUISettings( IUISettings *iface ) +{ + return CONTAINING_RECORD( iface, struct uisettings, IUISettings_iface ); +} + static inline struct uisettings *impl_from_IUISettings3( IUISettings3 *iface ) { return CONTAINING_RECORD( iface, struct uisettings, IUISettings3_iface ); } -static HRESULT WINAPI uisettings3_QueryInterface( IUISettings3 *iface, REFIID iid, void **out ) +static HRESULT WINAPI uisettings_QueryInterface( IUISettings *iface, REFIID iid, void **out ) { - struct uisettings *impl = impl_from_IUISettings3( iface ); + struct uisettings *impl = impl_from_IUISettings( iface ); TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + *out = NULL; + if (IsEqualGUID( iid, &IID_IUnknown ) || IsEqualGUID( iid, &IID_IInspectable ) || IsEqualGUID( iid, &IID_IAgileObject ) || - IsEqualGUID( iid, &IID_IUISettings3 )) + IsEqualGUID( iid, &IID_IUISettings )) + { + *out = &impl->IUISettings_iface; + } + else if (IsEqualGUID( iid, &IID_IUISettings3 )) { *out = &impl->IUISettings3_iface; - IInspectable_AddRef( *out ); - return S_OK; } - FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); - *out = NULL; - return E_NOINTERFACE; + if (!*out) + { + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; + } + + IUnknown_AddRef( (IUnknown*)*out ); + return S_OK; } -static ULONG WINAPI uisettings3_AddRef( IUISettings3 *iface ) +static ULONG WINAPI uisettings_AddRef( IUISettings *iface ) { - struct uisettings *impl = impl_from_IUISettings3( iface ); + struct uisettings *impl = impl_from_IUISettings( iface ); ULONG ref = InterlockedIncrement( &impl->ref ); TRACE( "iface %p, ref %lu.\n", iface, ref ); return ref; } -static ULONG WINAPI uisettings3_Release( IUISettings3 *iface ) +static ULONG WINAPI uisettings_Release( IUISettings *iface ) { - struct uisettings *impl = impl_from_IUISettings3( iface ); + struct uisettings *impl = impl_from_IUISettings( iface ); ULONG ref = InterlockedDecrement( &impl->ref ); TRACE( "iface %p, ref %lu.\n", iface, ref ); @@ -74,6 +89,148 @@ static ULONG WINAPI uisettings3_Release( IUISettings3 *iface ) return ref; } +static HRESULT WINAPI uisettings_GetIids( IUISettings *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_GetRuntimeClassName( IUISettings *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_GetTrustLevel( IUISettings *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_HandPreference( IUISettings *iface, enum HandPreference *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_CursorSize( IUISettings *iface, struct Size *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_ScrollBarSize( IUISettings *iface, struct Size *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_ScrollBarArrowSize( IUISettings *iface, struct Size *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_ScrollBarThumbBoxSize( IUISettings *iface, struct Size *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_MessageDuration( IUISettings *iface, UINT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_AnimationsEnabled( IUISettings *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_CaretBrowsingEnabled( IUISettings *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_CaretBlinkRate( IUISettings *iface, UINT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_CaretWidth( IUISettings *iface, UINT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_DoubleClickTime( IUISettings *iface, UINT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_get_MouseHoverTime( IUISettings *iface, UINT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings_UIElementColor( IUISettings *iface, enum UIElementType element, struct Color *value ) +{ + FIXME( "iface %p, element %d value %p stub!\n", iface, element, value ); + return E_NOTIMPL; +} + +static const struct IUISettingsVtbl uisettings_vtbl = +{ + uisettings_QueryInterface, + uisettings_AddRef, + uisettings_Release, + + /* IInspectable methods */ + uisettings_GetIids, + uisettings_GetRuntimeClassName, + uisettings_GetTrustLevel, + + /* IUISettings methods */ + uisettings_get_HandPreference, + uisettings_get_CursorSize, + uisettings_get_ScrollBarSize, + uisettings_get_ScrollBarArrowSize, + uisettings_get_ScrollBarThumbBoxSize, + uisettings_get_MessageDuration, + uisettings_get_AnimationsEnabled, + uisettings_get_CaretBrowsingEnabled, + uisettings_get_CaretBlinkRate, + uisettings_get_CaretWidth, + uisettings_get_DoubleClickTime, + uisettings_get_MouseHoverTime, + uisettings_UIElementColor +}; + + +static HRESULT WINAPI uisettings3_QueryInterface( IUISettings3 *iface, REFIID iid, void **out ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + return uisettings_QueryInterface(&impl->IUISettings_iface, iid, out); +} + +static ULONG WINAPI uisettings3_AddRef( IUISettings3 *iface ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + return uisettings_AddRef(&impl->IUISettings_iface); +} + +static ULONG WINAPI uisettings3_Release( IUISettings3 *iface ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + return uisettings_Release(&impl->IUISettings_iface); +} + static HRESULT WINAPI uisettings3_GetIids( IUISettings3 *iface, ULONG *iid_count, IID **iids ) { FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); @@ -244,6 +401,7 @@ static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInsp return E_OUTOFMEMORY; } + impl->IUISettings_iface.lpVtbl = &uisettings_vtbl; impl->IUISettings3_iface.lpVtbl = &uisettings3_vtbl; impl->ref = 1;

1 0

Alistair Leslie-Hughes : windows.ui: Add IUISettings2 stub interface.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: c1a9f4ae4668701675bf2cbffa528ff5a135111c URL: https://gitlab.winehq.org/wine/wine/-/commit/c1a9f4ae4668701675bf2cbffa528f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 22 11:26:46 2023 +1100 windows.ui: Add IUISettings2 stub interface. --- dlls/windows.ui/private.h | 38 ++++++++++++++++++++++++++++++++++++++ dlls/windows.ui/uisettings.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dlls/windows.ui/private.h b/dlls/windows.ui/private.h index 1af5faf152b..60a928ca865 100644 --- a/dlls/windows.ui/private.h +++ b/dlls/windows.ui/private.h @@ -38,4 +38,42 @@ extern IActivationFactory *uisettings_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.ui/uisettings.c b/dlls/windows.ui/uisettings.c index cd1a2b7050d..404daca8d72 100644 --- a/dlls/windows.ui/uisettings.c +++ b/dlls/windows.ui/uisettings.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ui); struct uisettings { IUISettings IUISettings_iface; + IUISettings2 IUISettings2_iface; IUISettings3 IUISettings3_iface; LONG ref; }; @@ -55,6 +56,10 @@ static HRESULT WINAPI uisettings_QueryInterface( IUISettings *iface, REFIID iid, { *out = &impl->IUISettings_iface; } + else if (IsEqualGUID( iid, &IID_IUISettings2 )) + { + *out = &impl->IUISettings2_iface; + } else if (IsEqualGUID( iid, &IID_IUISettings3 )) { *out = &impl->IUISettings3_iface; @@ -212,6 +217,43 @@ static const struct IUISettingsVtbl uisettings_vtbl = uisettings_UIElementColor }; +DEFINE_IINSPECTABLE( uisettings2, IUISettings2, struct uisettings, IUISettings_iface ); + +static HRESULT WINAPI uisettings2_get_TextScaleFactor( IUISettings2 *iface, DOUBLE *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings2_add_TextScaleFactorChanged( IUISettings2 *iface, ITypedEventHandler_UISettings_IInspectable *handler, + EventRegistrationToken *cookie ) +{ + FIXME( "iface %p, handler %p, cookie %p stub!\n", iface, handler, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings2_remove_TextScaleFactorChanged( IUISettings2 *iface, EventRegistrationToken cookie ) +{ + FIXME( "iface %p, cookie %#I64x stub!\n", iface, cookie.value ); + return E_NOTIMPL; +} + +static const struct IUISettings2Vtbl uisettings2_vtbl = +{ + uisettings2_QueryInterface, + uisettings2_AddRef, + uisettings2_Release, + + /* IInspectable methods */ + uisettings2_GetIids, + uisettings2_GetRuntimeClassName, + uisettings2_GetTrustLevel, + + /* IUISettings2 methods */ + uisettings2_get_TextScaleFactor, + uisettings2_add_TextScaleFactorChanged, + uisettings2_remove_TextScaleFactorChanged +}; static HRESULT WINAPI uisettings3_QueryInterface( IUISettings3 *iface, REFIID iid, void **out ) { @@ -402,6 +444,7 @@ static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInsp } impl->IUISettings_iface.lpVtbl = &uisettings_vtbl; + impl->IUISettings2_iface.lpVtbl = &uisettings2_vtbl; impl->IUISettings3_iface.lpVtbl = &uisettings3_vtbl; impl->ref = 1;

1 0

Alistair Leslie-Hughes : windows.ui: Use DEFINE_IINSPECTABLE for IUISettings3.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 7deaadef6388371c501168e12f66be049de59d9e URL: https://gitlab.winehq.org/wine/wine/-/commit/7deaadef6388371c501168e12f66be… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 22 19:50:08 2023 +1100 windows.ui: Use DEFINE_IINSPECTABLE for IUISettings3. --- dlls/windows.ui/uisettings.c | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/windows.ui/uisettings.c b/dlls/windows.ui/uisettings.c index 404daca8d72..041388da33b 100644 --- a/dlls/windows.ui/uisettings.c +++ b/dlls/windows.ui/uisettings.c @@ -36,11 +36,6 @@ static inline struct uisettings *impl_from_IUISettings( IUISettings *iface ) return CONTAINING_RECORD( iface, struct uisettings, IUISettings_iface ); } -static inline struct uisettings *impl_from_IUISettings3( IUISettings3 *iface ) -{ - return CONTAINING_RECORD( iface, struct uisettings, IUISettings3_iface ); -} - static HRESULT WINAPI uisettings_QueryInterface( IUISettings *iface, REFIID iid, void **out ) { struct uisettings *impl = impl_from_IUISettings( iface ); @@ -255,41 +250,7 @@ static const struct IUISettings2Vtbl uisettings2_vtbl = uisettings2_remove_TextScaleFactorChanged }; -static HRESULT WINAPI uisettings3_QueryInterface( IUISettings3 *iface, REFIID iid, void **out ) -{ - struct uisettings *impl = impl_from_IUISettings3( iface ); - return uisettings_QueryInterface(&impl->IUISettings_iface, iid, out); -} - -static ULONG WINAPI uisettings3_AddRef( IUISettings3 *iface ) -{ - struct uisettings *impl = impl_from_IUISettings3( iface ); - return uisettings_AddRef(&impl->IUISettings_iface); -} - -static ULONG WINAPI uisettings3_Release( IUISettings3 *iface ) -{ - struct uisettings *impl = impl_from_IUISettings3( iface ); - return uisettings_Release(&impl->IUISettings_iface); -} - -static HRESULT WINAPI uisettings3_GetIids( IUISettings3 *iface, ULONG *iid_count, IID **iids ) -{ - FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); - return E_NOTIMPL; -} - -static HRESULT WINAPI uisettings3_GetRuntimeClassName( IUISettings3 *iface, HSTRING *class_name ) -{ - FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); - return E_NOTIMPL; -} - -static HRESULT WINAPI uisettings3_GetTrustLevel( IUISettings3 *iface, TrustLevel *trust_level ) -{ - FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); - return E_NOTIMPL; -} +DEFINE_IINSPECTABLE( uisettings3, IUISettings3, struct uisettings, IUISettings_iface ); static DWORD get_app_theme(void) {

1 0

Mohamad Al-Jaf : include: Add windows.graphics.effects.idl file.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 58a2532a37cac4256dd3ea7ad1d10a7c36763178 URL: https://gitlab.winehq.org/wine/wine/-/commit/58a2532a37cac4256dd3ea7ad1d10a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 24 02:49:45 2023 -0400 include: Add windows.graphics.effects.idl file. Needed for mingw Firefox build. --- include/Makefile.in | 1 + include/windows.graphics.effects.idl | 51 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7e0b9d89085..102ea551cac 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -817,6 +817,7 @@ SOURCES = \ windows.globalization.idl \ windows.graphics.directx.direct3d11.idl \ windows.graphics.directx.idl \ + windows.graphics.effects.idl \ windows.graphics.holographic.idl \ windows.h \ windows.media.closedcaptioning.idl \ diff --git a/include/windows.graphics.effects.idl b/include/windows.graphics.effects.idl new file mode 100644 index 00000000000..c7c5f863cba --- /dev/null +++ b/include/windows.graphics.effects.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Graphics.Effects { + interface IGraphicsEffect; + interface IGraphicsEffectSource; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(cb51c0ce-8fe6-4636-b202-861faa07d8f3) + ] + interface IGraphicsEffect : IInspectable + requires Windows.Graphics.Effects.IGraphicsEffectSource + { + [propget] HRESULT Name([out, retval] HSTRING *name); + [propput] HRESULT Name([in] HSTRING name); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(2d8f9ddc-4339-4eb9-9216-f9deb75658a2) + ] + interface IGraphicsEffectSource : IInspectable + { + } +}

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.7.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 75ab8431145a014c7303cca3b4b6b18de2cd08d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/75ab8431145a014c7303cca3b4b6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 12:55:34 2023 +0100 vkd3d: Import upstream release 1.7. --- include/d3d12.idl | 1 + include/wine/list.h | 24 + libs/vkd3d/AUTHORS | 1 + libs/vkd3d/COPYING | 2 +- libs/vkd3d/include/vkd3d.h | 13 + libs/vkd3d/include/vkd3d_shader.h | 213 ++- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 110 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 366 ++++-- libs/vkd3d/libs/vkd3d-shader/glsl.c | 26 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 770 +++++++++-- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 290 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 6 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 1372 ++++++++++++++++---- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 1025 ++++++++++++--- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 10 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 179 ++- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 264 ++-- libs/vkd3d/libs/vkd3d-shader/sm4.h | 3 + libs/vkd3d/libs/vkd3d-shader/spirv.c | 48 +- libs/vkd3d/libs/vkd3d-shader/trace.c | 36 +- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 160 ++- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 105 +- libs/vkd3d/libs/vkd3d/command.c | 603 ++++----- libs/vkd3d/libs/vkd3d/device.c | 245 +--- libs/vkd3d/libs/vkd3d/resource.c | 198 ++- libs/vkd3d/libs/vkd3d/state.c | 44 +- libs/vkd3d/libs/vkd3d/utils.c | 21 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 184 +-- 28 files changed, 4509 insertions(+), 1810 deletions(-)

1 0

Alexandre Julliard : ntdll: One more fix for CPU information in old Wow64 mode.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 7686cba10523d5ff9a5b427c9ecc15b18cfbc677 URL: https://gitlab.winehq.org/wine/wine/-/commit/7686cba10523d5ff9a5b427c9ecc15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 13:17:27 2023 +0100 ntdll: One more fix for CPU information in old Wow64 mode. --- dlls/ntdll/tests/info.c | 1 - dlls/ntdll/unix/system.c | 9 +-------- dlls/ntdll/unix/virtual.c | 13 ++++++++++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f500fc09092..ae1c8c7c89d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -322,7 +322,6 @@ static void test_query_cpu(void) { ok( sci.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", sci.ProcessorArchitecture ); - todo_wine ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 || sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64, "ProcessorArchitecture wrong %x\n", sci2.ProcessorArchitecture ); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3eecccc4972..04755fac5ea 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2568,14 +2568,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } case SystemCpuInformation: /* 1 */ - if (size >= (len = sizeof(cpu_info))) - { - SYSTEM_CPU_INFORMATION cpu = cpu_info; - - if (is_old_wow64() && cpu.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) - cpu.ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; - memcpy(info, &cpu, len); - } + if (size >= (len = sizeof(cpu_info))) memcpy(info, &cpu_info, len); else ret = STATUS_INFO_LENGTH_MISMATCH; break; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1d07744ed1a..0faf3e343e3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -5319,10 +5319,21 @@ NTSTATUS WINAPI NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const NTSTATUS WINAPI NtWow64GetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG len, ULONG *retlen ) { + NTSTATUS status; + switch (class) { - case SystemBasicInformation: case SystemCpuInformation: + status = NtQuerySystemInformation( class, info, len, retlen ); + if (!status && is_old_wow64()) + { + SYSTEM_CPU_INFORMATION *cpu = info; + + if (cpu->ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + cpu->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + } + return status; + case SystemBasicInformation: case SystemEmulationBasicInformation: case SystemEmulationProcessorInformation: return NtQuerySystemInformation( class, info, len, retlen );

1 0