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

Mohamad Al-Jaf : graphicscapture: Partially implement IGraphicsCaptureSessionStatics::IsSupported().
by Alexandre Julliard March 27, 2023

March 27, 2023

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 March 27, 2023

March 27, 2023

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

Mohamad Al-Jaf : graphicscapture: Add stub DLL.
by Alexandre Julliard March 27, 2023

March 27, 2023

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 March 27, 2023

March 27, 2023

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 : include: Add windows.graphics.capture.idl file.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: 4eb5616e8d42e79a03ed4de8f095cab8480395dd URL: https://gitlab.winehq.org/wine/wine/-/commit/4eb5616e8d42e79a03ed4de8f095ca… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Dec 6 21:01:54 2022 -0500 include: Add windows.graphics.capture.idl file. --- include/Makefile.in | 1 + include/windows.graphics.capture.idl | 77 ++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 102ea551cac..9bde0bcceb0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -815,6 +815,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.gaming.ui.idl \ windows.globalization.idl \ + windows.graphics.capture.idl \ windows.graphics.directx.direct3d11.idl \ windows.graphics.directx.idl \ windows.graphics.effects.idl \ diff --git a/include/windows.graphics.capture.idl b/include/windows.graphics.capture.idl new file mode 100644 index 00000000000..f89f91afc42 --- /dev/null +++ b/include/windows.graphics.capture.idl @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +/* import "windows.graphics.idl"; */ +import "windows.graphics.directx.idl"; +import "windows.graphics.directx.direct3d11.idl"; +/* import "windows.security.authorization.appcapabilityaccess.idl"; */ +import "windows.system.idl"; +import "windows.ui.idl"; +/* import "windows.ui.composition.idl"; */ + +namespace Windows.Graphics.Capture { + interface IGraphicsCaptureSession; + interface IGraphicsCaptureSession2; + interface IGraphicsCaptureSession3; + interface IGraphicsCaptureSessionStatics; + + runtimeclass GraphicsCaptureSession; + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession), + uuid(814e42a9-f70f-4ad7-939b-fddcc6eb880d) + ] + interface IGraphicsCaptureSession : IInspectable + { + HRESULT StartCapture(); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession), + uuid(2224a540-5974-49aa-b232-0882536f4cb5) + ] + interface IGraphicsCaptureSessionStatics : IInspectable + { + HRESULT IsSupported([out, retval] boolean *result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + marshaling_behavior(agile), + static(Windows.Graphics.Capture.IGraphicsCaptureSessionStatics, Windows.Foundation.UniversalApiContract, 6.0), + threading(both) + ] + runtimeclass GraphicsCaptureSession + { + [default] interface Windows.Graphics.Capture.IGraphicsCaptureSession; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Graphics.Capture.IGraphicsCaptureSession2; + [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.Graphics.Capture.IGraphicsCaptureSession3; + interface Windows.Foundation.IClosable; + } +}

1 0

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

March 27, 2023

Module: wine Branch: master Commit: 2d48dbf1b3bd2f8f88c1ccdc28d9fd5e9243a47f URL: https://gitlab.winehq.org/wine/wine/-/commit/2d48dbf1b3bd2f8f88c1ccdc28d9fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:16:29 2023 +0200 wineps: Handle EMR_POLYPOLYGON16 record in spool files. --- dlls/wineps.drv/printproc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f153226d06f..71db4488b41 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -431,6 +431,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYPOLYGON16: + { + const EMRPOLYPOLYGON16 *p = (const EMRPOLYPOLYGON16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].x; + pts[i].y = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].y; + } + i = PSDRV_PolyPolygon(&data->pdev->dev, pts, (const INT *)p->aPolyCounts, p->nPolys); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Biswapriyo Nath : include: Fix c++ compiler error with msxml2.idl.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: 787c3f73f8a3d4dc9dd653245f4967998d239be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/787c3f73f8a3d4dc9dd653245f4967… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Mar 27 11:44:18 2023 +0530 include: Fix c++ compiler error with msxml2.idl. This moves ISAXXMLFilter declaration after its base class ISAXXMLReader. Otherwise the following error is shown in C++ mode $ wineg++ test-msxml2.cpp In file included from test-msxml2.cpp:1: /usr/include/wine/windows/msxml2.h:16199:24: error: invalid use of incomplete type ‘struct ISAXXMLReader’ 16199 | ISAXXMLFilter : public ISAXXMLReader | ^~~~~~~~~~~~~ /usr/include/wine/windows/msxml2.h:644:19: note: forward declaration of ‘struct ISAXXMLReader’ 644 | typedef interface ISAXXMLReader ISAXXMLReader; | ^~~~~~~~~~~~~ winegcc: /usr/bin/g++ failed Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/msxml2.idl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index 916e0e8ab3d..ede4113ecbf 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -2125,20 +2125,7 @@ interface ISAXLocator : IUnknown [ local, object, - uuid(70409222-ca09-4475-acb8-40312fe8d145) -] -interface ISAXXMLFilter : ISAXXMLReader -{ - HRESULT getParent( - [out, retval] ISAXXMLReader ** pReader); - HRESULT putParent( - [in] ISAXXMLReader * reader); -} - -[ -local, -object, -uuid (a4f96ed0-f829-476e-81c0-cdc7bd2a0802) + uuid(a4f96ed0-f829-476e-81c0-cdc7bd2a0802) ] interface ISAXXMLReader : IUnknown { @@ -2192,6 +2179,19 @@ interface ISAXXMLReader : IUnknown [in] const WCHAR * url); } +[ + local, + object, + uuid(70409222-ca09-4475-acb8-40312fe8d145) +] +interface ISAXXMLFilter : ISAXXMLReader +{ + HRESULT getParent( + [out, retval] ISAXXMLReader ** pReader); + HRESULT putParent( + [in] ISAXXMLReader * reader); +} + [ object, dual,

1 0

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

March 27, 2023

Module: wine Branch: master Commit: e214d60449e1ee8aa92b21b6c6ead66e0d7e96c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e214d60449e1ee8aa92b21b6c6ead6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:15:55 2023 +0200 wineps: Handle EMR_POLYPOLYLINE16 record in spool files. --- dlls/wineps.drv/printproc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index a4a9debe1e0..f153226d06f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -414,6 +414,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYPOLYLINE16: + { + const EMRPOLYPOLYLINE16 *p = (const EMRPOLYPOLYLINE16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].x; + pts[i].y = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].y; + } + i = PSDRV_PolyPolyline(&data->pdev->dev, pts, p->aPolyCounts, p->nPolys); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

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

March 27, 2023

Module: wine Branch: master Commit: db076a5b3578ee995db9e70372fa9548ee7e1cb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/db076a5b3578ee995db9e70372fa95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:15:11 2023 +0200 wineps: Handle EMR_POLYLINETO16 record in spool files. --- dlls/wineps.drv/printproc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index ac09623b56e..a4a9debe1e0 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -393,6 +393,27 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYLINETO16: + { + const EMRPOLYLINETO16 *p = (const EMRPOLYLINETO16 *)rec; + POINT *pts; + DWORD cnt; + int i; + + cnt = p->cpts + 1; + pts = malloc(sizeof(*pts) * cnt); + if (!pts) return 0; + GetCurrentPositionEx(data->pdev->dev.hdc, pts); + for (i = 0; i < p->cpts; i++) + { + pts[i + 1].x = p->apts[i].x; + pts[i + 1].y = p->apts[i].y; + } + i = PSDRV_PolyPolyline(&data->pdev->dev, pts, &cnt, 1) && + MoveToEx(data->pdev->dev.hdc, pts[cnt - 1].x, pts[cnt - 1].y, NULL); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

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

March 27, 2023

Module: wine Branch: master Commit: bbf0ef285cb06ecee04077c3356ef59f240d8fd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbf0ef285cb06ecee04077c3356ef5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:14:24 2023 +0200 wineps: Handle EMR_POLYBEZIERTO16 record in spool files. --- dlls/wineps.drv/printproc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 5b088650409..ac09623b56e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -375,6 +375,24 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYBEZIERTO16: + { + const EMRPOLYBEZIERTO16 *p = (const EMRPOLYBEZIERTO16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = p->apts[i].x; + pts[i].y = p->apts[i].y; + } + i = PSDRV_PolyBezierTo(&data->pdev->dev, pts, p->cpts) && + MoveToEx(data->pdev->dev.hdc, pts[p->cpts - 1].x, pts[p->cpts - 1].y, NULL); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0