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

Jacek Caban : gdi32: Handle metafiles directly in LineTo implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

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: Use NtGdiArcInternal for Pie implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

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: Use NtGdiArcInternal for Chord implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 1bf34b763ebfdbda73f9de042d40da798450ddc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bf34b763ebfdbda73f9de04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 16:57:16 2021 +0200 gdi32: Use NtGdiArcInternal for Chord 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 98269cb7582..0123ed8f525 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -67,3 +67,16 @@ BOOL WINAPI ArcTo( HDC hdc, INT left, INT top, INT right, INT bottom, return NtGdiArcInternal( NtGdiArcTo, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } + +/*********************************************************************** + * Chord (GDI32.@) + */ +BOOL WINAPI Chord( 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( NtGdiChord, hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 4fc7f98d9b8..f34570cf1ff 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -316,6 +316,12 @@ BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, break; } + case NtGdiChord: + physdev = GET_DC_PHYSDEV( dc, pChord ); + ret = physdev->funcs->pChord( physdev, left, top, right, bottom, + xstart, ystart, xend, yend ); + break; + default: WARN( "invalid arc type %u\n", type ); ret = FALSE; @@ -348,28 +354,6 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, } -/*********************************************************************** - * Chord (GDI32.@) - */ -BOOL WINAPI Chord( 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, pChord ); - ret = physdev->funcs->pChord( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * Ellipse (GDI32.@) */

1 0

Jacek Caban : gdi32: Introduce NtGdiLineTo.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: c1f63c08946965e70bab120f133538d34b4e96af URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f63c08946965e70bab120f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 16:56:39 2021 +0200 gdi32: Introduce NtGdiLineTo. 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/Makefile.in | 1 + dlls/gdi32/gdi_private.h | 6 ++++++ dlls/gdi32/gdidc.c | 35 +++++++++++++++++++++++++++++++++++ dlls/gdi32/objects.c | 6 +----- dlls/gdi32/painting.c | 6 ++---- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 1bf6a4fa711..4132c511a4e 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -31,6 +31,7 @@ C_SRCS = \ enhmfdrv/objects.c \ font.c \ freetype.c \ + gdidc.c \ gdiobj.c \ icm.c \ mapping.c \ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index db33f33110f..8db78190d5f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -22,6 +22,12 @@ #ifndef __WINE_GDI_PRIVATE_H #define __WINE_GDI_PRIVATE_H +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ntgdi.h" + void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c new file mode 100644 index 00000000000..e1becbee3a4 --- /dev/null +++ b/dlls/gdi32/gdidc.c @@ -0,0 +1,35 @@ +/* + * GDI Device Context functions + * + * Copyright 1993, 1994 Alexandre Julliard + * Copyright 1997 Bertho A. Stultiens + * 1999 Huw D M Davies + * + * 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 + */ + +#include "gdi_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdi); + +/*********************************************************************** + * LineTo (GDI32.@) + */ +BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) +{ + TRACE( "%p, (%d, %d)\n", hdc, x, y ); + return NtGdiLineTo( hdc, x, y ); +} diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 63a79255224..e5aafc1fed4 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -19,12 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" +#include "gdi_private.h" #include "winnls.h" -#include "ntgdi.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 3f77650259f..fc83949d67c 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -226,16 +226,14 @@ BOOL CDECL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) } /*********************************************************************** - * LineTo (GDI32.@) + * NtGdiLineTo (win32u.@) */ -BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) +BOOL WINAPI NtGdiLineTo( HDC hdc, INT x, INT y ) { DC * dc = get_dc_ptr( hdc ); PHYSDEV physdev; BOOL ret; - TRACE( "%p, (%d, %d)\n", hdc, x, y ); - if(!dc) return FALSE; update_dc( dc );

1 0

Nikolay Sivov : winegstreamer: Use consistent trace format for MF objects.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 04ebeff225100cedaec40e248ea2b0f788310860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ebeff225100cedaec40e24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 16 19:44:27 2021 +0300 winegstreamer: Use consistent trace format for MF objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 54 +++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9c554c7c415..05544ef7abe 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -559,7 +559,7 @@ static HRESULT WINAPI media_stream_QueryInterface(IMFMediaStream *iface, REFIID { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%s %p)\n", stream, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaStream) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -583,7 +583,7 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface) struct media_stream *stream = impl_from_IMFMediaStream(iface); ULONG ref = InterlockedIncrement(&stream->ref); - TRACE("(%p) ref=%u\n", stream, ref); + TRACE("%p, refcount %u.\n", iface, ref); return ref; } @@ -591,10 +591,9 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface) static ULONG WINAPI media_stream_Release(IMFMediaStream *iface) { struct media_stream *stream = impl_from_IMFMediaStream(iface); - ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p) ref=%u\n", stream, ref); + TRACE("%p, refcount %u.\n", iface, ref); if (!ref) { @@ -610,7 +609,7 @@ static HRESULT WINAPI media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%#x, %p)\n", stream, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } @@ -619,7 +618,7 @@ static HRESULT WINAPI media_stream_BeginGetEvent(IMFMediaStream *iface, IMFAsync { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p, %p)\n", stream, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } @@ -628,7 +627,7 @@ static HRESULT WINAPI media_stream_EndGetEvent(IMFMediaStream *iface, IMFAsyncRe { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p, %p)\n", stream, result, event); + TRACE("%p, %p, %p.\n", stream, result, event); return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } @@ -638,7 +637,7 @@ static HRESULT WINAPI media_stream_QueueEvent(IMFMediaStream *iface, MediaEventT { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", stream, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } @@ -647,7 +646,7 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p)\n", stream, source); + TRACE("%p, %p.\n", iface, source); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -662,7 +661,7 @@ static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IM { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("(%p)->(%p)\n", stream, descriptor); + TRACE("%p, %p.\n", iface, descriptor); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -679,7 +678,7 @@ static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown struct source_async_command *command; HRESULT hr; - TRACE("(%p)->(%p)\n", iface, token); + TRACE("%p, %p.\n", iface, token); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; @@ -745,7 +744,8 @@ static HRESULT new_media_stream(struct media_source *source, if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; - TRACE("->(%p)\n", object); + TRACE("Created stream object %p.\n", object); + *out_stream = object; return S_OK; @@ -1030,7 +1030,7 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%s %p)\n", source, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaSource) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -1044,7 +1044,7 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID } else { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); + FIXME("%s, %p.\n", debugstr_guid(riid), out); *out = NULL; return E_NOINTERFACE; } @@ -1058,7 +1058,7 @@ static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedIncrement(&source->ref); - TRACE("(%p) ref=%u\n", source, ref); + TRACE("%p, refcount %u.\n", iface, ref); return ref; } @@ -1068,7 +1068,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedDecrement(&source->ref); - TRACE("(%p) ref=%u\n", source, ref); + TRACE("%p, refcount %u.\n", iface, ref); if (!ref) { @@ -1084,7 +1084,7 @@ static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%#x, %p)\n", source, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsync { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p, %p)\n", source, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state); } @@ -1102,7 +1102,7 @@ static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncRe { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p, %p)\n", source, result, event); + TRACE("%p, %p, %p.\n", iface, result, event); return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event); } @@ -1112,7 +1112,7 @@ static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventT { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", source, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); } @@ -1121,7 +1121,7 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p)\n", source, characteristics); + TRACE("%p, %p.\n", iface, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1135,7 +1135,7 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("(%p)->(%p)\n", source, descriptor); + TRACE("%p, %p.\n", iface, descriptor); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1150,7 +1150,7 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD struct source_async_command *command; HRESULT hr; - TRACE("(%p)->(%p, %p, %p)\n", source, descriptor, time_format, position); + TRACE("%p, %p, %p, %p.\n", iface, descriptor, time_format, position); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1176,7 +1176,7 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) struct source_async_command *command; HRESULT hr; - TRACE("(%p)\n", source); + TRACE("%p.\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1191,7 +1191,7 @@ static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p): stub\n", source); + FIXME("%p: stub\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1204,7 +1204,7 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); unsigned int i; - TRACE("(%p)\n", source); + TRACE("%p.\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; @@ -1730,7 +1730,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_callback_GetParameters(IMFAsy static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags, IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) { - TRACE("(%p %s %p %u %p %p %p)\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + TRACE("%p, %s, %p, %u, %p, %p, %p.\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); if (flags & MF_RESOLUTION_MEDIASOURCE) {

1 0

Jacek Caban : include: Declare NTSTATUS in propvarutils.h.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 7a797bf6c360bf1c5c42c179b942e437e7cc4ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a797bf6c360bf1c5c42c179… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 16 17:01:57 2021 +0200 include: Declare NTSTATUS in propvarutils.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propvarutil.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/propvarutil.h b/include/propvarutil.h index 511e503a109..55b64abbe4f 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -22,6 +22,11 @@ #include <shtypes.h> #include <shlwapi.h> +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Hugh McMaster : reg: Support use of registry views when exporting registry data.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: fcf79426147adf0d9f1d80b0cf24d0b6abd8bf59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf79426147adf0d9f1d80b0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 15 23:36:12 2021 +1000 reg: Support use of registry views when exporting registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 26 ++++++++++++++++++++------ programs/reg/tests/export.c | 10 +++++----- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 79f6997ce35..e8b7e22c6dd 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -225,7 +225,7 @@ static void export_key_name(HANDLE hFile, WCHAR *name) free(buf); } -static int export_registry_data(HANDLE hFile, HKEY hkey, WCHAR *path) +static int export_registry_data(HANDLE hFile, HKEY hkey, WCHAR *path, REGSAM sam) { LONG rc; DWORD max_value_len = 256, value_len; @@ -284,9 +284,9 @@ static int export_registry_data(HANDLE hFile, HKEY hkey, WCHAR *path) if (rc == ERROR_SUCCESS) { subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); - if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ, &subkey)) + if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ|sam, &subkey)) { - export_registry_data(hFile, subkey, subkey_path); + export_registry_data(hFile, subkey, subkey_path, sam); RegCloseKey(subkey); } free(subkey_path); @@ -349,6 +349,7 @@ int reg_export(int argc, WCHAR *argvW[]) HKEY root, hkey; WCHAR *path, *key_name; BOOL overwrite_file = FALSE; + REGSAM sam = 0; HANDLE hFile; int i, ret; @@ -368,13 +369,26 @@ int reg_export(int argc, WCHAR *argvW[]) if (is_char(*str, 'y') && !str[1]) overwrite_file = TRUE; - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else goto invalid; } - if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + + if (RegOpenKeyExW(root, path, 0, KEY_READ|sam, &hkey)) { output_message(STRING_KEY_NONEXIST); return 1; @@ -384,7 +398,7 @@ int reg_export(int argc, WCHAR *argvW[]) hFile = get_file_handle(argvW[3], overwrite_file); export_file_header(hFile); - ret = export_registry_data(hFile, hkey, key_name); + ret = export_registry_data(hFile, hkey, key_name, sam); export_newline(hFile); CloseHandle(hFile); diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 0a460e08bcb..7d352519690 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -528,8 +528,8 @@ static void test_registry_view_win64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", registry_view_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -546,7 +546,7 @@ static void test_registry_view_win64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); } @@ -571,7 +571,7 @@ static void test_registry_view_wow64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); @@ -581,7 +581,7 @@ static void test_registry_view_wow64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r);

1 0

Jacek Caban : gdi32: Introduce NtGdiMoveTo.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: af039dc5ab881f44dda0ba417a614dfa5b06148a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af039dc5ab881f44dda0ba41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 16:56:46 2021 +0200 gdi32: Introduce NtGdiMoveTo. 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 | 9 +++++++++ dlls/gdi32/painting.c | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index e1becbee3a4..33adb8ccf82 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -33,3 +33,12 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) TRACE( "%p, (%d, %d)\n", hdc, x, y ); return NtGdiLineTo( hdc, x, y ); } + +/*********************************************************************** + * MoveToEx (GDI32.@) + */ +BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, POINT *pt ) +{ + TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); + return NtGdiMoveTo( hdc, x, y, pt ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index fc83949d67c..85c940c7f3d 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -251,16 +251,14 @@ BOOL WINAPI NtGdiLineTo( HDC hdc, INT x, INT y ) /*********************************************************************** - * MoveToEx (GDI32.@) + * NtGdiMoveTo (win32u.@) */ -BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) +BOOL WINAPI NtGdiMoveTo( HDC hdc, INT x, INT y, POINT *pt ) { BOOL ret; PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); - TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); - if(!dc) return FALSE; if(pt)

1 0

Jacek Caban : include: Fix C++ InitPropVariantFromGUIDAsBuffer implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 92a0405d9a2fce080e98b1a6ec09ca88bc2d243e URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a0405d9a2fce080e98b1a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 16 17:01:49 2021 +0200 include: Fix C++ InitPropVariantFromGUIDAsBuffer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propvarutil.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/propvarutil.h b/include/propvarutil.h index 972cf48a019..511e503a109 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -178,7 +178,11 @@ inline HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) inline HRESULT InitPropVariantFromGUIDAsBuffer(REFGUID guid, PROPVARIANT *ppropvar) { +#ifdef __cplusplus + return InitPropVariantFromBuffer(&guid, sizeof(GUID), ppropvar); +#else return InitPropVariantFromBuffer(guid, sizeof(GUID), ppropvar); +#endif } inline BOOL IsPropVariantVector(REFPROPVARIANT propvar)

1 0

Jacek Caban : gdi32: Use NtGdiArcInternal for ArcTo implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 2b0cddbf0d72c2ecf2a15641fd7bfa5cb2a6b877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b0cddbf0d72c2ecf2a15641… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 16:57:06 2021 +0200 gdi32: Use NtGdiArcInternal for ArcTo 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 | 61 +++++++++++++++++++-------------------------------- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 2fc74d7685b..98269cb7582 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -54,3 +54,16 @@ BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, INT bottom, return NtGdiArcInternal( NtGdiArc, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } + +/*********************************************************************** + * ArcTo (GDI32.@) + */ +BOOL WINAPI ArcTo( 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( NtGdiArcTo, hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index b235480dacb..4fc7f98d9b8 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -293,6 +293,29 @@ BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, physdev = GET_DC_PHYSDEV( dc, pArc ); ret = physdev->funcs->pArc( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); break; + + case NtGdiArcTo: + { + double width = abs( right - left ); + double height = abs( bottom - top ); + double xradius = width / 2; + double yradius = height / 2; + double xcenter = right > left ? left + xradius : right + xradius; + double ycenter = bottom > top ? top + yradius : bottom + yradius; + + physdev = GET_DC_PHYSDEV( dc, pArcTo ); + ret = physdev->funcs->pArcTo( physdev, left, top, right, bottom, + xstart, ystart, xend, yend ); + if (ret) + { + double angle = atan2(((yend - ycenter) / height), + ((xend - xcenter) / width)); + dc->cur_pos.x = GDI_ROUND( xcenter + (cos( angle ) * xradius) ); + dc->cur_pos.y = GDI_ROUND( ycenter + (sin( angle ) * yradius) ); + } + break; + } + default: WARN( "invalid arc type %u\n", type ); ret = FALSE; @@ -302,44 +325,6 @@ BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, return ret; } -/*********************************************************************** - * ArcTo (GDI32.@) - */ -BOOL WINAPI ArcTo( HDC hdc, - INT left, INT top, - INT right, INT bottom, - INT xstart, INT ystart, - INT xend, INT yend ) -{ - double width = abs( right - left ), - height = abs( bottom - top ), - xradius = width/2, - yradius = height/2, - xcenter = right > left ? left+xradius : right+xradius, - ycenter = bottom > top ? top+yradius : bottom+yradius, - angle; - PHYSDEV physdev; - BOOL result; - 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, pArcTo ); - result = physdev->funcs->pArcTo( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); - - if (result) - { - angle = atan2(((yend-ycenter)/height), - ((xend-xcenter)/width)); - dc->cur_pos.x = GDI_ROUND( xcenter + (cos( angle ) * xradius) ); - dc->cur_pos.y = GDI_ROUND( ycenter + (sin( angle ) * yradius) ); - } - release_dc_ptr( dc ); - return result; -} - /*********************************************************************** * Pie (GDI32.@)

1 0