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

Francois Gouget : oleaut32: Fix the Var*FromStr() prototypes.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 1e627d11875d00045ecb761b32220fbafb4807e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e627d11875d00045ecb761b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:15:09 2021 +0200 oleaut32: Fix the Var*FromStr() prototypes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 2 +- dlls/oleaut32/vartype.c | 35 ++++++++++++++++++----------------- include/oleauto.h | 30 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e627d11875d00045ecb…

1 0

Francois Gouget : user32/tests: Fix the keyboard layout id in an ok() message.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 623f9569fdb5647c68cfcb9ba1e938edad534869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623f9569fdb5647c68cfcb9b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 16:00:40 2021 +0200 user32/tests: Fix the keyboard layout id in an ok() message. The keyboard layout being tested is not the thread's default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 654cabb76d9..08323c4f40e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3166,7 +3166,7 @@ static void test_keyboard_layout_name(void) swprintf( tmpklid, KL_NAMELENGTH, L"%08X", layouts_preload[j] ); if (!wcscmp( tmpklid, klid )) break; } - ok(j < len, "Could not find keyboard layout %p in preload list\n", layout); + ok(j < len, "Could not find keyboard layout %s in preload list\n", wine_dbgstr_w(klid)); if (id & 0x80000000) {

1 0

Nikolay Sivov : winegstreamer: Use consistent trace format for MF objects.
by Alexandre Julliard 19 Jul '21

19 Jul '21

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

Nikolay Sivov : mfplat: Add some Video Processor attributes to tracing.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 5af2db41b3c6d4040d5087d38e904a781ac67aa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5af2db41b3c6d4040d5087d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 16 20:24:53 2021 +0300 mfplat: Add some Video Processor attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 ++++ include/mfidl.idl | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5406ceb5063..bcad90c29da 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1530,11 +1530,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_TIMESTAMP_CAN_BE_DTS), X(MFT_CODEC_MERIT_Attribute), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), + X(MF_XVP_DISABLE_FRC), X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_MPEG2_FLAGS), X(MF_MEDIA_ENGINE_AUDIO_CATEGORY), X(MF_MT_PIXEL_ASPECT_RATIO), + X(MF_VIDEO_PROCESSOR_ALGORITHM), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), X(MFT_CONNECTED_STREAM_ATTRIBUTE), X(MF_MT_REALTIME_CONTENT), @@ -1546,6 +1548,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_MAX_LUMINANCE_LEVEL), X(MFT_CONNECTED_TO_HW_STREAM), X(MF_SA_D3D_AWARE), + X(MF_XVP_SAMPLE_LOCK_TIMEOUT), X(MF_MT_MAX_KEYFRAME_SPACING), X(MFT_TRANSFORM_CLSID_Attribute), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), @@ -1741,6 +1744,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), + X(MF_XVP_CALLER_ALLOCATES_OUTPUT), X(MF_MT_H264_SVC_CAPABILITIES), X(MF_TOPONODE_WORKQUEUE_ITEM_PRIORITY), X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_LENGTH), diff --git a/include/mfidl.idl b/include/mfidl.idl index 76e0d0dfeb4..5b16c08bb90 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1573,4 +1573,9 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, 0xba491364, 0xb cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_VIDEO_PROCESSOR_ALGORITHM, 0x4a0a1e1f, 0x272c, 0x4fb6, 0x9e, 0xb1, 0xdb, 0x33, 0x0c, 0xbc, 0x97, 0xca);") +cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe8, 0x16, 0xd4, 0xfc, 0x51, 0x8d, 0x8c);") +cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") +cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Zebediah Figura : ntdll: Use a separate +unwind debug channel for unwinding on x86-64.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: dae60a374ed7122052a4a18837cf12a81dd75c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae60a374ed7122052a4a188… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 16 12:37:18 2021 -0500 ntdll: Use a separate +unwind debug channel for unwinding on x86-64. Constant spam from unwinding routines makes +seh logs hard to read, especially for programs that throw a lot of exceptions as part of normal execution. Since unwind information is rarely useful, don't display it unless specifically requested. Make +unwind the default channel in these files, though, since there are more unwind messages than exception messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 74 +++++++++++++++++++++-------------------- dlls/ntdll/unix/signal_x86_64.c | 41 ++++++++++++----------- 2 files changed, 59 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dae60a374ed7122052a4…

1 0

Jacek Caban : gdi32: Introduce NtGdiLineTo.
by Alexandre Julliard 19 Jul '21

19 Jul '21

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

Jacek Caban : gdi32: Introduce NtGdiMoveTo.
by Alexandre Julliard 19 Jul '21

19 Jul '21

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 : gdi32: Use NtGdiArcInternal for Arc implementation.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: c16bf295ccaef7ab75d2ef2d4e482b540a6fe9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c16bf295ccaef7ab75d2ef2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 16:56:54 2021 +0200 gdi32: Use NtGdiArcInternal for 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/gdidc.c | 12 ++++++++++++ dlls/gdi32/painting.c | 27 +++++++++++++++++---------- include/ntgdi.h | 8 ++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 33adb8ccf82..2fc74d7685b 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -42,3 +42,15 @@ 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 ); } + +/*********************************************************************** + * Arc (GDI32.@) + */ +BOOL WINAPI Arc( 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( NtGdiArc, hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 85c940c7f3d..b235480dacb 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -275,22 +275,29 @@ BOOL WINAPI NtGdiMoveTo( HDC hdc, INT x, INT y, POINT *pt ) /*********************************************************************** - * Arc (GDI32.@) + * NtGdiArcInternal (win32u.@) */ -BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, - INT xend, INT yend ) +BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { PHYSDEV physdev; BOOL ret; - 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 ); + DC *dc; - if (!dc) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pArc ); - ret = physdev->funcs->pArc( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); + + switch (type) + { + case NtGdiArc: + physdev = GET_DC_PHYSDEV( dc, pArc ); + ret = physdev->funcs->pArc( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); + break; + default: + WARN( "invalid arc type %u\n", type ); + ret = FALSE; + } + release_dc_ptr( dc ); return ret; } diff --git a/include/ntgdi.h b/include/ntgdi.h index d8adc327548..d90529392d5 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -72,6 +72,14 @@ typedef struct _GDI_SHARED_MEMORY GDI_HANDLE_ENTRY Handles[GDI_MAX_HANDLE_COUNT]; } GDI_SHARED_MEMORY, *PGDI_SHARED_MEMORY; +enum +{ + NtGdiArc, + NtGdiArcTo, + NtGdiChord, + NtGdiPie, +}; + INT WINAPI NtGdiAbortDoc( HDC hdc ); BOOL WINAPI NtGdiAbortPath( HDC hdc ); BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle,

1 0

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

19 Jul '21

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

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

19 Jul '21

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