July 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Use NtGdiArcInternal for Pie implementation.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 0c82bba7b54bc7dd9d2f0dfb1bc59cc4e844496e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c82bba7b54bc7dd9d2f0dfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 16:57:25 2021 +0200 gdi32: Use NtGdiArcInternal for Pie implementation. 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/gdidc.c | 13 +++++++++++++ dlls/gdi32/painting.c | 28 ++++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0123ed8f525..b2bddc717ae 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -80,3 +80,16 @@ BOOL WINAPI Chord( HDC hdc, INT left, INT top, INT right, INT bottom, return NtGdiArcInternal( NtGdiChord, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } + +/*********************************************************************** + * Pie (GDI32.@) + */ +BOOL WINAPI Pie( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, + right, bottom, xstart, ystart, xend, yend ); + + return NtGdiArcInternal( NtGdiPie, hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index f34570cf1ff..4a9bb48db8b 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -322,6 +322,12 @@ BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, xstart, ystart, xend, yend ); break; + case NtGdiPie: + physdev = GET_DC_PHYSDEV( dc, pPie ); + ret = physdev->funcs->pPie( physdev, left, top, right, bottom, + xstart, ystart, xend, yend ); + break; + default: WARN( "invalid arc type %u\n", type ); ret = FALSE; @@ -332,28 +338,6 @@ BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, } -/*********************************************************************** - * Pie (GDI32.@) - */ -BOOL WINAPI Pie( HDC hdc, INT left, INT top, - INT right, INT bottom, INT xstart, INT ystart, - INT xend, INT yend ) -{ - BOOL ret; - PHYSDEV physdev; - DC * dc = get_dc_ptr( hdc ); - - TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); - - if (!dc) return FALSE; - update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pPie ); - ret = physdev->funcs->pPie( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * Ellipse (GDI32.@) */

1 0

Jacek Caban : gdi32: Handle metafiles directly in LineTo implementation.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 68b6cca258b6db8179446cff06c54cb2198185ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b6cca258b6db8179446cff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:00:55 2021 +0200 gdi32: Handle metafiles directly in LineTo implementation. 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/gdi_private.h | 8 ++++++++ dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 18 +++++++++++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +++- include/ntgdi.h | 3 +++ 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8db78190d5f..830c2707e29 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -31,4 +31,12 @@ void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; +static inline BOOL is_meta_dc( HDC hdc ) +{ + unsigned int handle = HandleToULong( hdc ); + return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_METADC; +} + +extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index b2bddc717ae..eecd1b69ad6 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) { TRACE( "%p, (%d, %d)\n", hdc, x, y ); + + if (is_meta_dc( hdc )) return METADC_LineTo( hdc, x, y ); return NtGdiLineTo( hdc, x, y ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 616980d1204..95c25d1e709 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -39,11 +39,11 @@ BOOL CDECL MFDRV_MoveTo(PHYSDEV dev, INT x, INT y) } /*********************************************************************** - * MFDRV_LineTo + * METADC_LineTo */ -BOOL CDECL MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL METADC_LineTo( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2(dev, META_LINETO, x, y); + return metadc_param2( hdc, META_LINETO, x, y ); } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f337d4ec559..36b523e52cc 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -159,7 +159,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pGradientFill */ MFDRV_IntersectClipRect, /* pIntersectClipRect */ MFDRV_InvertRgn, /* pInvertRgn */ - MFDRV_LineTo, /* pLineTo */ + NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ MFDRV_MoveTo, /* pMoveTo */ MFDRV_OffsetClipRgn, /* pOffsetClipRgn */ @@ -259,6 +259,7 @@ static DC *MFDRV_AllocMetaFile(void) } push_dc_driver( &dc->physDev, &physDev->dev, &MFDRV_Funcs ); + set_gdi_client_ptr( dc->hSelf, physDev ); physDev->handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(physDev->handles[0])); physDev->handles_size = HANDLE_LIST_INC; @@ -597,3 +598,18 @@ BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, params[7] = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); } + +static METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc ) +{ + METAFILEDRV_PDEVICE *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC ); + if (!metafile) SetLastError( ERROR_INVALID_HANDLE ); + return metafile; +} + +BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) +{ + METAFILEDRV_PDEVICE *dev; + + if (!(dev = get_metadc_ptr( hdc ))) return FALSE; + return MFDRV_MetaParam2( &dev->dev, func, param1, param2 ); +} diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 6f1f9587d58..88c149e0523 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "ntgdi_private.h" +#include "gdi_private.h" /* Metafile driver physical DC */ @@ -58,6 +59,8 @@ extern UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; +extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN; + /* Metafile driver functions */ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; @@ -81,7 +84,6 @@ extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/include/ntgdi.h b/include/ntgdi.h index d90529392d5..9b37810f7a3 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -67,6 +67,9 @@ typedef struct _GDI_HANDLE_ENTRY /* Wine extension, native uses NTGDI_OBJ_DC */ #define NTGDI_OBJ_MEMDC 0x41 +#define NTGDI_HANDLE_TYPE_SHIFT 16 +#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 + typedef struct _GDI_SHARED_MEMORY { GDI_HANDLE_ENTRY Handles[GDI_MAX_HANDLE_COUNT];

1 0

Jacek Caban : gdi32: Handle metafiles directly in MoveToEx implementation.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 95b3504e1e8e065046b63cd4c5237f809b8ead00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95b3504e1e8e065046b63cd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:20:11 2021 +0200 gdi32: Handle metafiles directly in MoveToEx implementation. 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/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 12 ++++-------- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 830c2707e29..41758b6a25b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -38,5 +38,6 @@ static inline BOOL is_meta_dc( HDC hdc ) } extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index eecd1b69ad6..1aac2d5b418 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -42,6 +42,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, POINT *pt ) { TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); + + if (is_meta_dc( hdc )) return METADC_MoveTo( hdc, x, y ); return NtGdiMoveTo( hdc, x, y, pt ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 95c25d1e709..ebed0f8bc3b 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -31,11 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); /********************************************************************** - * MFDRV_MoveTo + * METADC_MoveTo */ -BOOL CDECL MFDRV_MoveTo(PHYSDEV dev, INT x, INT y) +BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2(dev,META_MOVETO,x,y); + return metadc_param2( hdc, META_MOVETO, x, y ); } /*********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 36b523e52cc..df97817e0a9 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -161,7 +161,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_InvertRgn, /* pInvertRgn */ NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ - MFDRV_MoveTo, /* pMoveTo */ + NULL, /* pMoveTo */ MFDRV_OffsetClipRgn, /* pOffsetClipRgn */ MFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 88c149e0523..b2384602743 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -84,7 +84,6 @@ extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 574ccc3d98f..2ea8b1070ce 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3302,16 +3302,12 @@ static void test_mf_Graphics(void) ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 2, 2); ok( ret, "LineTo error %d.\n", GetLastError()); + + oldpoint.x = oldpoint.y = 0xdeadbeef; ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint); ok( ret, "MoveToEx error %d.\n", GetLastError()); - -/* oldpoint gets garbage under Win XP, so the following test would - * work under Wine but fails under Windows: - * - * ok((oldpoint.x == 2) && (oldpoint.y == 2), - * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n", - * oldpoint.x, oldpoint.y); - */ + ok(oldpoint.x == 0xdeadbeef && oldpoint.y == 0xdeadbeef, + "MoveToEx modified oldpoint\n"); ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError());

1 0

Jacek Caban : gdi32: Handle metafiles directly in Chord and Pie implementations.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: b70616b50832a9e887a619123bcb61d52de7631c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70616b50832a9e887a61912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:01:18 2021 +0200 gdi32: Handle metafiles directly in Chord and Pie implementations. 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/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/mfdrv/graphics.c | 20 ++++++++++---------- dlls/gdi32/mfdrv/init.c | 15 +++++++++++++-- dlls/gdi32/mfdrv/metafiledrv.h | 7 +++---- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 41758b6a25b..8c014b7123f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -37,7 +37,11 @@ static inline BOOL is_meta_dc( HDC hdc ) return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_METADC; } +extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, + INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1aac2d5b418..d3f71d3c59d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -81,6 +81,10 @@ BOOL WINAPI Chord( HDC hdc, INT left, INT top, INT right, INT bottom, TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + if (is_meta_dc( hdc )) + return METADC_Chord( hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); + return NtGdiArcInternal( NtGdiChord, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } @@ -94,6 +98,10 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, INT right, INT bottom, TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + if (is_meta_dc( hdc )) + return METADC_Pie( hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); + return NtGdiArcInternal( NtGdiPie, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index ebed0f8bc3b..89793d0e72d 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -59,24 +59,24 @@ BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** - * MFDRV_Pie + * METADC_Pie */ -BOOL CDECL MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { - return MFDRV_MetaParam8(dev, META_PIE, left, top, right, bottom, - xstart, ystart, xend, yend); + return metadc_param8( hdc, META_PIE, left, top, right, bottom, + xstart, ystart, xend, yend ); } /*********************************************************************** - * MFDRV_Chord + * METADC_Chord */ -BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { - return MFDRV_MetaParam8(dev, META_CHORD, left, top, right, bottom, - xstart, ystart, xend, yend); + return metadc_param8( hdc, META_CHORD, left, top, right, bottom, + xstart, ystart, xend, yend ); } /*********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index df97817e0a9..17352282471 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -107,7 +107,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ - MFDRV_Chord, /* pChord */ + NULL, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ @@ -167,7 +167,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ MFDRV_PaintRgn, /* pPaintRgn */ MFDRV_PatBlt, /* pPatBlt */ - MFDRV_Pie, /* pPie */ + NULL, /* pPie */ MFDRV_PolyBezier, /* pPolyBezier */ MFDRV_PolyBezierTo, /* pPolyBezierTo */ NULL, /* pPolyDraw */ @@ -613,3 +613,14 @@ BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) if (!(dev = get_metadc_ptr( hdc ))) return FALSE; return MFDRV_MetaParam2( &dev->dev, func, param1, param2 ); } + +BOOL metadc_param8( HDC hdc, short func, short param1, short param2, + short param3, short param4, short param5, + short param6, short param7, short param8) +{ + METAFILEDRV_PDEVICE *dev; + + if (!(dev = get_metadc_ptr( hdc ))) return FALSE; + return MFDRV_MetaParam8( &dev->dev, func, param1, param2, param3, + param4, param5, param6, param7, param8 ); +} diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b2384602743..fd206b75ac0 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -60,6 +60,9 @@ extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN; +extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, + short param3, short param4, short param5, short param6, + short param7, short param8 ) DECLSPEC_HIDDEN; /* Metafile driver functions */ @@ -67,8 +70,6 @@ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; @@ -89,8 +90,6 @@ extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *p extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Handle metafiles directly in Arc implementation.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: b789992337609843873109aab4b58cc9b6f9cdeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b789992337609843873109aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 18 12:57:34 2021 +0200 gdi32: Handle metafiles directly in Arc implementation. 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/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 5 +++++ dlls/gdi32/mfdrv/graphics.c | 20 +++++++++++++++----- dlls/gdi32/mfdrv/init.c | 4 ++-- dlls/gdi32/mfdrv/metafiledrv.h | 4 ++-- dlls/gdi32/tests/metafile.c | 3 +++ 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8c014b7123f..436846c5bd5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -37,6 +37,8 @@ static inline BOOL is_meta_dc( HDC hdc ) return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_METADC; } +extern BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index d3f71d3c59d..01c9dfdf8c7 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -55,6 +55,11 @@ BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, INT bottom, { TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if (is_meta_dc( hdc )) + return METADC_Arc( hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); + return NtGdiArcInternal( NtGdiArc, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 89793d0e72d..2037d7ac2e2 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -48,13 +48,23 @@ BOOL METADC_LineTo( HDC hdc, INT x, INT y ) /*********************************************************************** - * MFDRV_Arc + * METADC_Arc */ -BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + return metadc_param8( hdc, META_ARC, left, top, right, bottom, + xstart, ystart, xend, yend ); +} + + +/*********************************************************************** + * MFDRV_ArcTo + */ +BOOL CDECL MFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { - return MFDRV_MetaParam8(dev, META_ARC, left, top, right, bottom, - xstart, ystart, xend, yend); + return FALSE; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 17352282471..444d3dbf1d4 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -103,8 +103,8 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_AbortPath, /* pAbortPath */ NULL, /* pAlphaBlend */ NULL, /* pAngleArc */ - MFDRV_Arc, /* pArc */ - NULL, /* pArcTo */ + NULL, /* pArc */ + MFDRV_ArcTo, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ NULL, /* pChord */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index fd206b75ac0..46a9d43d34b 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -67,8 +67,8 @@ extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, /* Metafile driver functions */ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL CDECL MFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2ea8b1070ce..0e2a5aa4cec 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3312,6 +3312,9 @@ static void test_mf_Graphics(void) ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); + ret = ArcTo(hdcMetafile, 1, 2, 30, 40, 11, 12, 23, 24 ); + ok( !ret, "ArcTo succeeded\n" ); + hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hdcMetafile);

1 0

Jacek Caban : gdi32: Introduce DC_ATTR struct and use it to store current position.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 3f779e47ee2414e6221d7f66f855d69ee624f2f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f779e47ee2414e6221d7f66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:01:49 2021 +0200 gdi32: Introduce DC_ATTR struct and use it to store current position. 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 | 24 +++++++++++++++++++----- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 8 ++++---- dlls/gdi32/font.c | 2 +- dlls/gdi32/ntgdi_private.h | 2 +- dlls/gdi32/painting.c | 30 +++++++++++++++--------------- dlls/gdi32/path.c | 2 +- include/ntgdi.h | 10 ++++++++++ 8 files changed, 53 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f779e47ee2414e6221d…

1 0

Zebediah Figura : d3d11: Implement constant buffer offsetting for OpenGL.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 5ce7adaace3637ff6f8a33264b62c69bf2e53967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce7adaace3637ff6f8a3326… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 15 00:18:35 2021 -0500 d3d11: Implement constant buffer offsetting for OpenGL. Based on a patch by Kimmo Myllyvirta. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45198 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 149 ++++++++++++++++++++++++++++++----------- dlls/wined3d/context_gl.c | 4 +- dlls/wined3d/context_vk.c | 4 +- dlls/wined3d/cs.c | 18 ++--- dlls/wined3d/device.c | 16 ++--- dlls/wined3d/state.c | 9 ++- dlls/wined3d/stateblock.c | 12 +++- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 14 +++- 10 files changed, 159 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ce7adaace3637ff6f8a…

1 0

Zebediah Figura : d3d11/tests: Add tests for constant buffer offsetting.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: c889bab44c790bc9349eb282551338980e5ab3b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c889bab44c790bc9349eb282… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 15 00:18:36 2021 -0500 d3d11/tests: Add tests for constant buffer offsetting. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c889bab44c790bc9349e…

1 0

Nikolay Sivov : evr/mixer: Set MF_MT_INTERLACE_MODE for the mixer output types.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 43dd2fbfbc1641487dedd0e1daee005408583cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=43dd2fbfbc1641487dedd0e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 15 16:20:23 2021 +0300 evr/mixer: Set MF_MT_INTERLACE_MODE for the mixer output types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 21 ++++++++++++++++++++- dlls/evr/tests/evr.c | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 187a13be364..66c3960511a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -657,11 +657,28 @@ static void video_mixer_append_rt_format(struct rt_format *rt_formats, unsigned *count += 1; } +static unsigned int video_mixer_get_interlace_mode_from_video_desc(const DXVA2_VideoDesc *video_desc) +{ + switch (video_desc->SampleFormat.SampleFormat) + { + case DXVA2_SampleFieldInterleavedEvenFirst: + return MFVideoInterlace_FieldInterleavedUpperFirst; + case DXVA2_SampleFieldInterleavedOddFirst: + return MFVideoInterlace_FieldInterleavedLowerFirst; + case DXVA2_SampleFieldSingleEven: + return MFVideoInterlace_FieldSingleUpper; + case DXVA2_SampleFieldSingleOdd: + return MFVideoInterlace_FieldSingleLower; + default: + return MFVideoInterlace_Progressive; + } +} + static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { - unsigned int i, j, format_count, count; + unsigned int i, j, format_count, count, interlace_mode; struct rt_format *rt_formats = NULL, *ptr; HRESULT hr = MF_E_INVALIDMEDIATYPE; MFVideoArea aperture; @@ -702,6 +719,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const memset(&aperture, 0, sizeof(aperture)); aperture.Area.cx = video_desc->SampleWidth; aperture.Area.cy = video_desc->SampleHeight; + interlace_mode = video_mixer_get_interlace_mode_from_video_desc(video_desc); for (i = 0; i < count; ++i) { IMFMediaType *rt_media_type; @@ -714,6 +732,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); + IMFMediaType_SetUINT32(rt_media_type, &MF_MT_INTERLACE_MODE, interlace_mode); mixer->output.rt_formats[i].media_type = rt_media_type; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 91fff21ebed..d240ebe4456 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1056,6 +1056,9 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); IMFMediaType_Release(media_type); }

1 0

Nikolay Sivov : mf/session: Forward MR_POLICY_VOLUME_SERVICE service requests to the SAR node.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 8b6f2762907b907034ce2f4ebc5f66706beb54d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6f2762907b907034ce2f4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 12 15:21:19 2021 +0300 mf/session: Forward MR_POLICY_VOLUME_SERVICE service requests to the SAR node. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf_private.h | 1 + dlls/mf/sar.c | 5 +++++ dlls/mf/session.c | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 2f81eaa13b0..db6f101cd6d 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -80,4 +80,5 @@ static inline const char *debugstr_time(LONGLONG time) } extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; +extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index e35531acb71..f6f2b32dd2d 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1915,6 +1915,11 @@ failed: return hr; } +BOOL mf_is_sar_sink(IMFMediaSink *sink) +{ + return sink->lpVtbl == &audio_renderer_sink_vtbl; +} + static void sar_shutdown_object(void *user_context, IUnknown *obj) { IMFMediaSink *sink; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9e8429fa8ac..df7a987bc55 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1952,18 +1952,36 @@ static ULONG WINAPI session_get_service_Release(IMFGetService *iface) return IMFMediaSession_Release(&session->IMFMediaSession_iface); } -static HRESULT session_get_video_render_service(struct media_session *session, REFGUID service, - REFIID riid, void **obj) +typedef BOOL (*p_renderer_node_test_func)(IMFMediaSink *sink); + +static BOOL session_video_renderer_test_func(IMFMediaSink *sink) +{ + IUnknown *obj; + HRESULT hr; + + /* Use first sink to support IMFVideoRenderer. */ + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&obj); + if (obj) + IUnknown_Release(obj); + + return hr == S_OK; +} + +static BOOL session_audio_renderer_test_func(IMFMediaSink *sink) +{ + return mf_is_sar_sink(sink); +} + +static HRESULT session_get_renderer_node_service(struct media_session *session, + p_renderer_node_test_func node_test_func, REFGUID service, REFIID riid, void **obj) { IMFStreamSink *stream_sink; IMFTopologyNode *node; IMFCollection *nodes; IMFMediaSink *sink; unsigned int i = 0; - IUnknown *vr; HRESULT hr = E_FAIL; - /* Use first sink to support IMFVideoRenderer. */ if (session->presentation.current_topology) { if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, @@ -1975,11 +1993,10 @@ static HRESULT session_get_video_render_service(struct media_session *session, R { if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) { - if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) + if (node_test_func(sink)) { - if (FAILED(hr = MFGetService(vr, service, riid, obj))) - WARN("Failed to get service from video renderer %#x.\n", hr); - IUnknown_Release(vr); + if (FAILED(hr = MFGetService((IUnknown *)sink, service, riid, obj))) + WARN("Failed to get service from renderer node, %#x.\n", hr); } } IMFStreamSink_Release(stream_sink); @@ -1998,6 +2015,20 @@ static HRESULT session_get_video_render_service(struct media_session *session, R return hr; } +static HRESULT session_get_audio_render_service(struct media_session *session, REFGUID service, + REFIID riid, void **obj) +{ + return session_get_renderer_node_service(session, session_audio_renderer_test_func, + service, riid, obj); +} + +static HRESULT session_get_video_render_service(struct media_session *session, REFGUID service, + REFIID riid, void **obj) +{ + return session_get_renderer_node_service(session, session_video_renderer_test_func, + service, riid, obj); +} + static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { struct media_session *session = impl_from_IMFGetService(iface); @@ -2040,6 +2071,10 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { hr = session_get_video_render_service(session, service, riid, obj); } + else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE)) + { + hr = session_get_audio_render_service(session, service, riid, obj); + } else FIXME("Unsupported service %s.\n", debugstr_guid(service));

1 0