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

Mohamad Al-Jaf : graphicscapture: Add stub DLL.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 14768c0eca24c7923eff7075dac1dc9f32b70dff URL: https://gitlab.winehq.org/wine/wine/-/commit/14768c0eca24c7923eff7075dac1dc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 01:23:22 2023 -0400 graphicscapture: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/graphicscapture/Makefile.in | 9 +++ dlls/graphicscapture/classes.idl | 23 ++++++ dlls/graphicscapture/graphicscapture.spec | 2 + dlls/graphicscapture/main.c | 49 +++++++++++ dlls/graphicscapture/private.h | 39 +++++++++ dlls/graphicscapture/session.c | 116 +++++++++++++++++++++++++++ dlls/graphicscapture/tests/Makefile.in | 5 ++ dlls/graphicscapture/tests/graphicscapture.c | 85 ++++++++++++++++++++ 10 files changed, 333 insertions(+)

1 0

Mohamad Al-Jaf : graphicscapture: Add IGraphicsCaptureSessionStatics stub interface.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: a36f7015146c5339afc558a3250e7e1a1192a15f URL: https://gitlab.winehq.org/wine/wine/-/commit/a36f7015146c5339afc558a3250e7e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 01:52:42 2023 -0400 graphicscapture: Add IGraphicsCaptureSessionStatics stub interface. --- dlls/graphicscapture/private.h | 38 ++++++++++++++++++++++++++++ dlls/graphicscapture/session.c | 30 ++++++++++++++++++++++ dlls/graphicscapture/tests/graphicscapture.c | 6 +++++ 3 files changed, 74 insertions(+) diff --git a/dlls/graphicscapture/private.h b/dlls/graphicscapture/private.h index 6a958347537..d60c138c873 100644 --- a/dlls/graphicscapture/private.h +++ b/dlls/graphicscapture/private.h @@ -36,4 +36,42 @@ extern IActivationFactory *session_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/graphicscapture/session.c b/dlls/graphicscapture/session.c index d8ed0001ff6..a6752d364a4 100644 --- a/dlls/graphicscapture/session.c +++ b/dlls/graphicscapture/session.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphicscapture); struct session { IActivationFactory IActivationFactory_iface; + IGraphicsCaptureSessionStatics IGraphicsCaptureSessionStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IGraphicsCaptureSessionStatics )) + { + *out = &impl->IGraphicsCaptureSessionStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,31 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( session_statics, IGraphicsCaptureSessionStatics, struct session, IActivationFactory_iface ) + +static HRESULT WINAPI session_statics_IsSupported( IGraphicsCaptureSessionStatics *iface, boolean *result ) +{ + FIXME( "iface %p, result %p stub!\n", iface, result ); + return E_NOTIMPL; +} + +static const struct IGraphicsCaptureSessionStaticsVtbl session_statics_vtbl = +{ + session_statics_QueryInterface, + session_statics_AddRef, + session_statics_Release, + /* IInspectable methods */ + session_statics_GetIids, + session_statics_GetRuntimeClassName, + session_statics_GetTrustLevel, + /* IGraphicsCaptureSessionStatics methods */ + session_statics_IsSupported, +}; + static struct session session_statics = { {&factory_vtbl}, + {&session_statics_vtbl}, 0, }; diff --git a/dlls/graphicscapture/tests/graphicscapture.c b/dlls/graphicscapture/tests/graphicscapture.c index 49b15f914ee..6cdd4e021af 100644 --- a/dlls/graphicscapture/tests/graphicscapture.c +++ b/dlls/graphicscapture/tests/graphicscapture.c @@ -47,6 +47,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_GraphicsCaptureSessionStatics(void) { static const WCHAR *session_statics_name = L"Windows.Graphics.Capture.GraphicsCaptureSession"; + IGraphicsCaptureSessionStatics *session_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -68,6 +69,11 @@ static void test_GraphicsCaptureSessionStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IGraphicsCaptureSessionStatics, (void **)&session_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IGraphicsCaptureSessionStatics_Release( session_statics ); + ok( ref == 1, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 0, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : graphicscapture/tests: Add IGraphicsCaptureSessionStatics::IsSupported() tests.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 872fbcebdca2bec9259258f4c13436de37e10e70 URL: https://gitlab.winehq.org/wine/wine/-/commit/872fbcebdca2bec9259258f4c13436… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 01:57:38 2023 -0400 graphicscapture/tests: Add IGraphicsCaptureSessionStatics::IsSupported() tests. --- dlls/graphicscapture/tests/graphicscapture.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/graphicscapture/tests/graphicscapture.c b/dlls/graphicscapture/tests/graphicscapture.c index 6cdd4e021af..66283fbb5d3 100644 --- a/dlls/graphicscapture/tests/graphicscapture.c +++ b/dlls/graphicscapture/tests/graphicscapture.c @@ -49,6 +49,7 @@ static void test_GraphicsCaptureSessionStatics(void) static const WCHAR *session_statics_name = L"Windows.Graphics.Capture.GraphicsCaptureSession"; IGraphicsCaptureSessionStatics *session_statics; IActivationFactory *factory; + BOOLEAN res; HSTRING str; HRESULT hr; LONG ref; @@ -72,6 +73,11 @@ static void test_GraphicsCaptureSessionStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IGraphicsCaptureSessionStatics, (void **)&session_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + res = 2; + hr = IGraphicsCaptureSessionStatics_IsSupported( session_statics, &res ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( res == TRUE, "got %d.\n", res ); + ref = IGraphicsCaptureSessionStatics_Release( session_statics ); ok( ref == 1, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Mohamad Al-Jaf : graphicscapture: Partially implement IGraphicsCaptureSessionStatics::IsSupported().
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 4e7cbb2d09686113ac36ee1e6f8a4e5e11d6a2d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e7cbb2d09686113ac36ee1e6f8a4e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 01:58:39 2023 -0400 graphicscapture: Partially implement IGraphicsCaptureSessionStatics::IsSupported(). Needed to prevent VR games from crashing when the user attempts to capture the desktop. --- dlls/graphicscapture/session.c | 6 ++++-- dlls/graphicscapture/tests/graphicscapture.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/graphicscapture/session.c b/dlls/graphicscapture/session.c index a6752d364a4..8c7aecfc793 100644 --- a/dlls/graphicscapture/session.c +++ b/dlls/graphicscapture/session.c @@ -119,8 +119,10 @@ DEFINE_IINSPECTABLE( session_statics, IGraphicsCaptureSessionStatics, struct ses static HRESULT WINAPI session_statics_IsSupported( IGraphicsCaptureSessionStatics *iface, boolean *result ) { - FIXME( "iface %p, result %p stub!\n", iface, result ); - return E_NOTIMPL; + TRACE( "iface %p, result %p\n", iface, result ); + + *result = FALSE; + return S_OK; } static const struct IGraphicsCaptureSessionStaticsVtbl session_statics_vtbl = diff --git a/dlls/graphicscapture/tests/graphicscapture.c b/dlls/graphicscapture/tests/graphicscapture.c index 66283fbb5d3..caac271763b 100644 --- a/dlls/graphicscapture/tests/graphicscapture.c +++ b/dlls/graphicscapture/tests/graphicscapture.c @@ -75,7 +75,7 @@ static void test_GraphicsCaptureSessionStatics(void) res = 2; hr = IGraphicsCaptureSessionStatics_IsSupported( session_statics, &res ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); todo_wine ok( res == TRUE, "got %d.\n", res ); ref = IGraphicsCaptureSessionStatics_Release( session_statics );

1 0

Vicki Pfau : hidparse.sys: Include zero-count reports in cap count.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 6a88500af29b82040f0518eb87171ca047fb95aa URL: https://gitlab.winehq.org/wine/wine/-/commit/6a88500af29b82040f0518eb87171c… Author: Vicki Pfau <vi(a)endrift.com> Date: Sat Mar 25 01:08:56 2023 -0700 hidparse.sys: Include zero-count reports in cap count. Signed-off-by: Vicki Pfau <vi(a)endrift.com> --- dlls/dinput/tests/hid.c | 2 -- dlls/hidparse.sys/main.c | 34 +++++++++++++++++++--------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index facbf69fcec..bd01d1ae868 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -3173,11 +3173,9 @@ static void check_preparsed_data( HANDLE file, const struct hidp_kdr *expect_kdr check_member( *kdr, *expect_kdr, "%d", output_caps_end ); check_member( *kdr, *expect_kdr, "%d", output_report_byte_length ); check_member( *kdr, *expect_kdr, "%d", feature_caps_start ); - todo_wine check_member( *kdr, *expect_kdr, "%d", feature_caps_count ); check_member( *kdr, *expect_kdr, "%d", feature_caps_end ); check_member( *kdr, *expect_kdr, "%d", feature_report_byte_length ); - todo_wine check_member( *kdr, *expect_kdr, "%d", caps_size ); check_member( *kdr, *expect_kdr, "%d", number_link_collection_nodes ); diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 7058093e03c..feb5b3531a4 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -130,11 +130,11 @@ static void debug_print_preparsed( struct hid_preparsed_data *data ) data->output_caps_start, data->output_caps_count, data->output_caps_end, data->output_report_byte_length, data->feature_caps_start, data->feature_caps_count, data->feature_caps_end, data->feature_report_byte_length, data->number_link_collection_nodes ); - end = data->input_caps_count; + end = data->input_caps_end - data->input_caps_start; for (i = 0; i < end; i++) TRACE( "input %d: %s\n", i, debugstr_hid_value_caps( HID_INPUT_VALUE_CAPS( data ) + i ) ); - end = data->output_caps_count; + end = data->output_caps_end - data->output_caps_start; for (i = 0; i < end; i++) TRACE( "output %d: %s\n", i, debugstr_hid_value_caps( HID_OUTPUT_VALUE_CAPS( data ) + i ) ); - end = data->feature_caps_count; + end = data->feature_caps_end - data->feature_caps_start; for (i = 0; i < end; i++) TRACE( "feature %d: %s\n", i, debugstr_hid_value_caps( HID_FEATURE_VALUE_CAPS( data ) + i ) ); end = data->number_link_collection_nodes; for (i = 0; i < end; i++) TRACE( "collection %d: %s\n", i, debugstr_hid_collection_node( HID_COLLECTION_NODES( data ) + i ) ); @@ -171,6 +171,7 @@ struct hid_parser_state ULONG bit_size[3][256]; USHORT byte_length[3]; USHORT caps_count[3]; + USHORT empty_caps[3]; USHORT data_count[3]; }; @@ -373,6 +374,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (!state->items.report_count) { + state->empty_caps[type] += usages_size; reset_local_items( state ); return TRUE; } @@ -435,6 +437,8 @@ static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state caps_size = state->caps_count[HidP_Input] + state->caps_count[HidP_Output] + state->caps_count[HidP_Feature]; + caps_size += state->empty_caps[HidP_Input] + state->empty_caps[HidP_Output] + + state->empty_caps[HidP_Feature]; caps_size *= sizeof(struct hid_value_caps); size = caps_size + FIELD_OFFSET(struct hid_preparsed_data, value_caps[0]) + @@ -446,26 +450,26 @@ static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state data->usage = state->usage; data->usage_page = state->usage_page; data->input_caps_start = 0; - data->input_caps_count = state->caps_count[HidP_Input]; - data->input_caps_end = data->input_caps_start + data->input_caps_count; + data->input_caps_count = state->caps_count[HidP_Input] + state->empty_caps[HidP_Input]; + data->input_caps_end = data->input_caps_start + state->caps_count[HidP_Input]; data->input_report_byte_length = state->byte_length[HidP_Input]; data->output_caps_start = data->input_caps_end; - data->output_caps_count = state->caps_count[HidP_Output]; - data->output_caps_end = data->output_caps_start + data->output_caps_count; + data->output_caps_count = state->caps_count[HidP_Output] + state->empty_caps[HidP_Output]; + data->output_caps_end = data->output_caps_start + state->caps_count[HidP_Output]; data->output_report_byte_length = state->byte_length[HidP_Output]; data->feature_caps_start = data->output_caps_end; - data->feature_caps_count = state->caps_count[HidP_Feature]; - data->feature_caps_end = data->feature_caps_start + data->feature_caps_count; + data->feature_caps_count = state->caps_count[HidP_Feature] + state->empty_caps[HidP_Feature]; + data->feature_caps_end = data->feature_caps_start + state->caps_count[HidP_Feature]; data->feature_report_byte_length = state->byte_length[HidP_Feature]; data->caps_size = caps_size; data->number_link_collection_nodes = state->number_link_collection_nodes; caps = HID_INPUT_VALUE_CAPS( data ); - memcpy( caps, state->values[0], data->input_caps_count * sizeof(*caps) ); + memcpy( caps, state->values[0], state->caps_count[HidP_Input] * sizeof(*caps) ); caps = HID_OUTPUT_VALUE_CAPS( data ); - memcpy( caps, state->values[1], data->output_caps_count * sizeof(*caps) ); + memcpy( caps, state->values[1], state->caps_count[HidP_Output] * sizeof(*caps) ); caps = HID_FEATURE_VALUE_CAPS( data ); - memcpy( caps, state->values[2], data->feature_caps_count * sizeof(*caps) ); + memcpy( caps, state->values[2], state->caps_count[HidP_Feature] * sizeof(*caps) ); nodes = HID_COLLECTION_NODES( data ); for (i = 0; i < data->number_link_collection_nodes; ++i) @@ -675,7 +679,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de device_desc->CollectionDesc[0].PreparsedData = (PHIDP_PREPARSED_DATA)preparsed; caps = HID_INPUT_VALUE_CAPS( preparsed ); - caps_end = caps + preparsed->input_caps_count; + caps_end = caps + preparsed->input_caps_end - preparsed->input_caps_start; for (; caps != caps_end; ++caps) { len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count; @@ -684,7 +688,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de } caps = HID_OUTPUT_VALUE_CAPS( preparsed ); - caps_end = caps + preparsed->output_caps_count; + caps_end = caps + preparsed->output_caps_end - preparsed->output_caps_start; for (; caps != caps_end; ++caps) { len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count; @@ -693,7 +697,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de } caps = HID_FEATURE_VALUE_CAPS( preparsed ); - caps_end = caps + preparsed->feature_caps_count; + caps_end = caps + preparsed->feature_caps_end - preparsed->feature_caps_start; for (; caps != caps_end; ++caps) { len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count;

1 0

Piotr Caban : ucrtbase: Add __CxxFrameHandler4 implementation.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 75669ea34a16350a62c58039f621e96df1746e29 URL: https://gitlab.winehq.org/wine/wine/-/commit/75669ea34a16350a62c58039f621e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 13:32:09 2023 +0200 ucrtbase: Add __CxxFrameHandler4 implementation. --- dlls/msvcrt/Makefile.in | 1 + .../except_x86_64.c => msvcrt/handler4.c} | 36 ++++--- dlls/msvcrt/main.c | 15 +++ dlls/msvcrt/msvcrt.h | 10 ++ dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 1 + dlls/vcruntime140_1/Makefile.in | 4 +- dlls/vcruntime140_1/cppexcept.h | 119 --------------------- dlls/vcruntime140_1/main.c | 42 ++++++++ 9 files changed, 92 insertions(+), 137 deletions(-)

1 0

Piotr Caban : wineps: Introduce helper for PolyBezier drawing.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 378fc7f0fda83b9afd418fc0f34a438db0fa4f55 URL: https://gitlab.winehq.org/wine/wine/-/commit/378fc7f0fda83b9afd418fc0f34a43… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 11:20:20 2023 +0100 wineps: Introduce helper for PolyBezier drawing. --- dlls/wineps.drv/graphics.c | 61 ++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 45f20728183..3ea663ccb2d 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -375,58 +375,49 @@ BOOL CDECL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, return TRUE; } - -/*********************************************************************** - * PSDRV_PolyBezier - */ -BOOL CDECL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) +static BOOL poly_bezier( PHYSDEV dev, const POINT *pt0, const POINT *pts, DWORD count) { + POINT dev_pts[3]; DWORD i; - POINT *dev_pts; - TRACE("\n"); + TRACE( "\n" ); - if (!(dev_pts = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*dev_pts) ))) return FALSE; - memcpy( dev_pts, pts, count * sizeof(*dev_pts) ); - LPtoDP( dev->hdc, dev_pts, count ); + dev_pts[0] = *pt0; + LPtoDP( dev->hdc, dev_pts, 1 ); - PSDRV_WriteSpool(dev, "%PolyBezier\n",12); - PSDRV_SetPen(dev); - PSDRV_SetClip(dev); - PSDRV_WriteMoveTo(dev, dev_pts[0].x, dev_pts[0].y ); - for (i = 1; i < count; i += 3) PSDRV_WriteCurveTo( dev, dev_pts + i ); + PSDRV_WriteSpool( dev, "%PolyBezier\n", 12 ); + PSDRV_SetPen( dev ); + PSDRV_SetClip( dev ); + PSDRV_WriteMoveTo( dev, dev_pts[0].x, dev_pts[0].y ); + for (i = 0; i < count; i += 3) + { + memcpy( dev_pts, pts, sizeof(dev_pts) ); + LPtoDP( dev->hdc, dev_pts, 3 ); + PSDRV_WriteCurveTo( dev, dev_pts ); + } PSDRV_DrawLine(dev); PSDRV_ResetClip(dev); - HeapFree( GetProcessHeap(), 0, dev_pts ); return TRUE; } +/*********************************************************************** + * PSDRV_PolyBezier + */ +BOOL CDECL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) +{ + return poly_bezier( dev, pts, pts + 1, count - 1 ); +} + /*********************************************************************** * PSDRV_PolyBezierTo */ BOOL CDECL PSDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) { - DWORD i; - POINT *dev_pts; - - TRACE("\n"); + POINT pt0; - count++; /* add initial position */ - if (!(dev_pts = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*dev_pts) ))) return FALSE; - GetCurrentPositionEx( dev->hdc, dev_pts ); - memcpy( dev_pts + 1, pts, (count - 1) * sizeof(*dev_pts) ); - LPtoDP( dev->hdc, dev_pts, count ); - - PSDRV_WriteSpool(dev, "%PolyBezier\n",12); - PSDRV_SetPen(dev); - PSDRV_SetClip(dev); - PSDRV_WriteMoveTo(dev, dev_pts[0].x, dev_pts[0].y ); - for (i = 1; i < count; i += 3) PSDRV_WriteCurveTo( dev, dev_pts + i ); - PSDRV_DrawLine(dev); - PSDRV_ResetClip(dev); - HeapFree( GetProcessHeap(), 0, dev_pts ); - return TRUE; + GetCurrentPositionEx( dev->hdc, &pt0 ); + return poly_bezier( dev, &pt0, pts, count ); }

1 0

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

27 Mar '23

Module: wine Branch: master Commit: 0725b234cf8026b08f17a80dda1793af2bbb1653 URL: https://gitlab.winehq.org/wine/wine/-/commit/0725b234cf8026b08f17a80dda1793… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:05:17 2023 +0200 wineps: Handle EMR_POLYGON record in spool files. --- dlls/wineps.drv/printproc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 31312610c50..9663b3b3730 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -151,6 +151,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_PolyBezier(&data->pdev->dev, (const POINT *)p->aptl, p->cptl); } + case EMR_POLYGON: + { + const EMRPOLYGON *p = (const EMRPOLYGON *)rec; + + return PSDRV_PolyPolygon(&data->pdev->dev, (const POINT *)p->aptl, + (const INT *)&p->cptl, 1); + } case EMR_POLYPOLYLINE: { const EMRPOLYPOLYLINE *p = (const EMRPOLYPOLYLINE *)rec;

1 0

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

27 Mar '23

Module: wine Branch: master Commit: 9114a24fa1f194b9d44c5f275eb435ad4a89b796 URL: https://gitlab.winehq.org/wine/wine/-/commit/9114a24fa1f194b9d44c5f275eb435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:06:13 2023 +0200 wineps: Handle EMR_POLYLINE record in spool files. --- dlls/wineps.drv/printproc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 9663b3b3730..98f820e6811 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -158,6 +158,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_PolyPolygon(&data->pdev->dev, (const POINT *)p->aptl, (const INT *)&p->cptl, 1); } + case EMR_POLYLINE: + { + const EMRPOLYLINE *p = (const EMRPOLYLINE *)rec; + + return PSDRV_PolyPolyline(&data->pdev->dev, + (const POINT *)p->aptl, &p->cptl, 1); + } case EMR_POLYPOLYLINE: { const EMRPOLYPOLYLINE *p = (const EMRPOLYPOLYLINE *)rec;

1 0

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

27 Mar '23

Module: wine Branch: master Commit: 83a20ec96768a5dc69ed9f74a28acf06cba5a3c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/83a20ec96768a5dc69ed9f74a28acf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:07:46 2023 +0200 wineps: Handle EMR_POLYBEZIERTO record in spool files. --- dlls/wineps.drv/printproc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 98f820e6811..67099365032 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -165,6 +165,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_PolyPolyline(&data->pdev->dev, (const POINT *)p->aptl, &p->cptl, 1); } + case EMR_POLYBEZIERTO: + { + const EMRPOLYBEZIERTO *p = (const EMRPOLYBEZIERTO *)rec; + + return PSDRV_PolyBezierTo(&data->pdev->dev, (const POINT *)p->aptl, p->cptl) && + MoveToEx(data->pdev->dev.hdc, p->aptl[p->cptl - 1].x, p->aptl[p->cptl - 1].y, NULL); + } case EMR_POLYPOLYLINE: { const EMRPOLYPOLYLINE *p = (const EMRPOLYPOLYLINE *)rec;

1 0