- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : windows.ui: Add IUISettings2 stub interface.
by Alexandre Julliard March 24, 2023

March 24, 2023

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

Piotr Caban : wineps: Handle EMR_PIE record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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 : windows.ui: Use DEFINE_IINSPECTABLE for IUISettings3.
by Alexandre Julliard March 24, 2023

March 24, 2023

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

Piotr Caban : wineps: Handle EMR_SETPIXELV record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 9bea58da96547a886811c699a48e62f7d7439c7e URL: https://gitlab.winehq.org/wine/wine/-/commit/9bea58da96547a886811c699a48e62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:26:51 2023 +0100 wineps: Handle EMR_SETPIXELV record in spool files. --- dlls/wineps.drv/printproc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 13154d66dfa..8e5f2af874c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -169,6 +169,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); + case EMR_SETPIXELV: + { + const EMRSETPIXELV *p = (const EMRSETPIXELV *)rec; + + return PSDRV_SetPixel(&data->pdev->dev, p->ptlPixel.x, + p->ptlPixel.y, p->crColor); + } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYPOLYGON record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: a0b644f4322be7c4b74cc8c0e8624e0f8ee0a004 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0b644f4322be7c4b74cc8c0e8624e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:26:01 2023 +0100 wineps: Handle EMR_POLYPOLYGON 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 3c9f506c885..13154d66dfa 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -159,6 +159,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, (const POINT *)(p->aPolyCounts + p->nPolys), p->aPolyCounts, p->nPolys); } + case EMR_POLYPOLYGON: + { + const EMRPOLYPOLYGON *p = (const EMRPOLYPOLYGON *)rec; + + return PSDRV_PolyPolygon(&data->pdev->dev, + (const POINT *)(p->aPolyCounts + p->nPolys), + (const INT *)p->aPolyCounts, p->nPolys); + } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); case EMR_SELECTOBJECT:

1 0

Piotr Caban : wineps: Handle EMR_ROUNDRECT record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 3a1341aada897a2565dd773838918ce0a04f70da URL: https://gitlab.winehq.org/wine/wine/-/commit/3a1341aada897a2565dd773838918c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:28:39 2023 +0100 wineps: Handle EMR_ROUNDRECT 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 42dd28e7571..9a3de67489e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -217,6 +217,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_Rectangle(&data->pdev->dev, rect->rclBox.left, rect->rclBox.top, rect->rclBox.right, rect->rclBox.bottom); } + case EMR_ROUNDRECT: + { + const EMRROUNDRECT *p = (const EMRROUNDRECT *)rec; + + return PSDRV_RoundRect(&data->pdev->dev, p->rclBox.left, + p->rclBox.top, p->rclBox.right, p->rclBox.bottom, + p->szlCorner.cx, p->szlCorner.cy); + } case EMR_LINETO: { const EMRLINETO *line = (const EMRLINETO *)rec;

1 0

Piotr Caban : wineps: Handle EMR_ARC record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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_ELLIPSE record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 7d01f643f7a9f2fa1c776a058167babdff522fb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d01f643f7a9f2fa1c776a058167ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:27:37 2023 +0100 wineps: Handle EMR_ELLIPSE record in spool files. --- dlls/wineps.drv/printproc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8e5f2af874c..42dd28e7571 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -203,6 +203,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return 1; } } + case EMR_ELLIPSE: + { + const EMRELLIPSE *p = (const EMRELLIPSE *)rec; + const RECTL *r = &p->rclBox; + + return PSDRV_Ellipse(&data->pdev->dev, r->left, r->top, r->right, r->bottom); + } case EMR_RECTANGLE: { const EMRRECTANGLE *rect = (const EMRRECTANGLE *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYBEZIER record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 53d2a32d06379915df0c7b73355316cb7a7d1579 URL: https://gitlab.winehq.org/wine/wine/-/commit/53d2a32d06379915df0c7b73355316… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:24:08 2023 +0100 wineps: Handle EMR_POLYBEZIER record in spool files. --- dlls/wineps.drv/printproc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 91fd914ce78..b2f61a98fe7 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -145,6 +145,12 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->patterns = calloc(sizeof(*data->patterns), header->nHandles); return data->patterns && PSDRV_StartPage(&data->pdev->dev); } + case EMR_POLYBEZIER: + { + const EMRPOLYBEZIER *p = (const EMRPOLYBEZIER *)rec; + + return PSDRV_PolyBezier(&data->pdev->dev, (const POINT *)p->aptl, p->cptl); + } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); case EMR_SELECTOBJECT:

1 0

Piotr Caban : wineps: Handle EMR_MODIFYWORLDTRANSFORM record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: f83dc1cdb5ab380a3399e699841ba7ec037b0b56 URL: https://gitlab.winehq.org/wine/wine/-/commit/f83dc1cdb5ab380a3399e699841ba7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:22:54 2023 +0100 wineps: Handle EMR_MODIFYWORLDTRANSFORM record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 6419000acbc..91fd914ce78 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -213,6 +213,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: + case EMR_MODIFYWORLDTRANSFORM: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0