June 2024 - Wine-Commits - list.winehq.org

Zhiyi Zhang : include: Add some windows.system definitions.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: d010f52241a9bea230f3926803d115d543fdaa07 URL: https://gitlab.winehq.org/wine/wine/-/commit/d010f52241a9bea230f3926803d115… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 13 11:45:04 2024 +0800 include: Add some windows.system definitions. --- include/windows.system.idl | 235 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+)

1 0

Zhiyi Zhang : include: Add some windows.foundation definitions.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: b80657c0a5c12366b430babbf49d6bb814e344e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b80657c0a5c12366b430babbf49d6b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat May 11 19:30:31 2024 +0800 include: Add some windows.foundation definitions. --- include/windows.foundation.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 6978d45fd02..0ac0f78fa5e 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -64,6 +64,7 @@ namespace Windows.Foundation { interface IClosable; interface IDeferral; interface IDeferralFactory; + interface IGetActivationFactory; interface IMemoryBuffer; interface IMemoryBufferFactory; interface IMemoryBufferReference; @@ -109,6 +110,7 @@ namespace Windows.Foundation { interface Windows.Foundation.IReference<BYTE>; interface Windows.Foundation.IReference<INT32>; interface Windows.Foundation.IReference<DOUBLE>; + interface Windows.Foundation.IReference<FLOAT>; interface Windows.Foundation.IReference<UINT32>; interface Windows.Foundation.IReference<UINT64>; interface Windows.Foundation.IReference<Windows.Foundation.DateTime>; @@ -248,6 +250,15 @@ namespace Windows.Foundation { HRESULT Create([in] Windows.Foundation.DeferralCompletedHandler *handler, [out, retval] Windows.Foundation.Deferral **result); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(4edb8ee2-96dd-49a7-94f7-4607ddab8e3c) + ] + interface IGetActivationFactory : IInspectable + { + HRESULT GetActivationFactory([in] HSTRING activatable_class_id, [out, retval] IInspectable **factory); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(5a648006-843a-4da9-865b-9d26e5dfad7b)

1 0

Zhiyi Zhang : include: Add some windows.applicationmodel definitions.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: d1a62e862ebcdd6233b694578122aac82e0b3c38 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1a62e862ebcdd6233b694578122aa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 3 15:27:09 2024 +0800 include: Add some windows.applicationmodel definitions. --- dlls/windows.applicationmodel/classes.idl | 3 + include/Makefile.in | 2 + include/windows.applicationmodel.activation.idl | 198 ++++++++++++ include/windows.applicationmodel.background.idl | 310 +++++++++++++++++++ include/windows.applicationmodel.core.idl | 393 ++++++++++++++++++++++++ include/windows.applicationmodel.idl | 105 +++++++ 6 files changed, 1011 insertions(+)

1 0

Zhiyi Zhang : include: Add some windows.ui.core definitions.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: c165459699a46a2a13542a719b49cc93fcc179fa URL: https://gitlab.winehq.org/wine/wine/-/commit/c165459699a46a2a13542a719b49cc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 13 17:36:02 2024 +0800 include: Add some windows.ui.core definitions. --- include/windows.ui.core.idl | 569 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 568 insertions(+), 1 deletion(-)

1 0

Zhiyi Zhang : include: Add windows.ui.input.idl.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 425ef9cb23d13d5cff719328945fef3517a0146d URL: https://gitlab.winehq.org/wine/wine/-/commit/425ef9cb23d13d5cff719328945fef… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 13 15:56:20 2024 +0800 include: Add windows.ui.input.idl. --- include/Makefile.in | 1 + include/windows.ui.input.idl | 172 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 287666e79d9..a4a3352ce71 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -888,6 +888,7 @@ SOURCES = \ windows.ui.composition.interop.idl \ windows.ui.core.idl \ windows.ui.idl \ + windows.ui.input.idl \ windows.ui.viewmanagement.idl \ windows.ui.xaml.hosting.desktopwindowxamlsource.idl \ windowscontracts.idl \ diff --git a/include/windows.ui.input.idl b/include/windows.ui.input.idl new file mode 100644 index 00000000000..f160671f232 --- /dev/null +++ b/include/windows.ui.input.idl @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2024 Zhiyi Zhang for CodeWeavers + * + * 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 + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.devices.input.idl"; +import "windows.system.idl"; +import "windows.ui.core.idl"; +#endif + +namespace Windows.UI.Input { + typedef enum PointerUpdateKind PointerUpdateKind; + + interface IPointerPoint; + interface IPointerPointProperties; + interface IPointerPointProperties2; + interface IPointerPointStatics; + interface IPointerPointTransform; + + runtimeclass PointerPoint; + runtimeclass PointerPointProperties; + + declare { + interface Windows.Foundation.Collections.IVectorView<Windows.UI.Input.PointerPoint *>; + interface Windows.Foundation.Collections.IVector<Windows.UI.Input.PointerPoint *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum PointerUpdateKind + { + Other = 0, + LeftButtonPressed = 1, + LeftButtonReleased = 2, + RightButtonPressed = 3, + RightButtonReleased = 4, + MiddleButtonPressed = 5, + MiddleButtonReleased = 6, + XButton1Pressed = 7, + XButton1Released = 8, + XButton2Pressed = 9, + XButton2Released = 10 + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Input.PointerPoint), + uuid(e995317d-7296-42d9-8233-c5be73b74a4a) + ] + interface IPointerPoint : IInspectable + { + [propget] HRESULT PointerDevice([out, retval] Windows.Devices.Input.PointerDevice **value); + [propget] HRESULT Position([out, retval] Windows.Foundation.Point *value); + [propget] HRESULT RawPosition([out, retval] Windows.Foundation.Point *value); + [propget] HRESULT pointer_id([out, retval] UINT32 *value); + [propget] HRESULT FrameId([out, retval] UINT32 *value); + [propget] HRESULT Timestamp([out, retval] UINT64 *value); + [propget] HRESULT IsInContact([out, retval] boolean *value); + [propget] HRESULT Properties([out, retval] Windows.UI.Input.PointerPointProperties **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Input.PointerPointProperties), + uuid(c79d8a4b-c163-4ee7-803f-67ce79f9972d) + ] + interface IPointerPointProperties : IInspectable + { + [propget] HRESULT Pressure([out, retval] FLOAT *value); + [propget] HRESULT IsInverted([out, retval] boolean *value); + [propget] HRESULT IsEraser([out, retval] boolean *value); + [propget] HRESULT Orientation([out, retval] FLOAT *value); + [propget] HRESULT XTilt([out, retval] FLOAT *value); + [propget] HRESULT YTilt([out, retval] FLOAT *value); + [propget] HRESULT Twist([out, retval] FLOAT *value); + [propget] HRESULT ContactRect([out, retval] Windows.Foundation.Rect *value); + [propget] HRESULT ContactRectRaw([out, retval] Windows.Foundation.Rect *value); + [propget] HRESULT TouchConfidence([out, retval] boolean *value); + [propget] HRESULT IsLeftButtonPressed([out, retval] boolean *value); + [propget] HRESULT IsRightButtonPressed([out, retval] boolean *value); + [propget] HRESULT IsMiddleButtonPressed([out, retval] boolean *value); + [propget] HRESULT MouseWheelDelta([out, retval] INT32 *value); + [propget] HRESULT IsHorizontalMouseWheel([out, retval] boolean *value); + [propget] HRESULT IsPrimary([out, retval] boolean *value); + [propget] HRESULT IsInRange([out, retval] boolean *value); + [propget] HRESULT IsCanceled([out, retval] boolean *value); + [propget] HRESULT IsBarrelButtonPressed([out, retval] boolean *value); + [propget] HRESULT IsXButton1Pressed([out, retval] boolean *value); + [propget] HRESULT IsXButton2Pressed([out, retval] boolean *value); + [propget] HRESULT PointerUpdateKind([out, retval] Windows.UI.Input.PointerUpdateKind *value); + HRESULT HasUsage([in] UINT32 usage_page, [in] UINT32 usage_id, [out, retval] boolean *value); + HRESULT GetUsageValue([in] UINT32 usage_page, [in] UINT32 usage_id, [out, retval] INT32 *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Input.PointerPointProperties), + uuid(22c3433a-c83b-41c0-a296-5e232d64d6af) + ] + interface IPointerPointProperties2 : IInspectable + { + [propget] HRESULT ZDistance([out, retval] Windows.Foundation.IReference<FLOAT> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Input.PointerPoint), + uuid(a506638d-2a1a-413e-bc75-9f38381cc069) + ] + interface IPointerPointStatics : IInspectable + { + [overload("GetCurrentPoint")] HRESULT GetCurrentPoint([in] UINT32 pointer_id, [out, retval] Windows.UI.Input.PointerPoint **point); + [overload("GetIntermediatePoints")] HRESULT GetIntermediatePoints([in] UINT32 pointer_id, [out, retval] Windows.Foundation.Collections.IVector<Windows.UI.Input.PointerPoint *> **points); + [overload("GetCurrentPoint")] HRESULT GetCurrentPointTransformed([in] UINT32 pointer_id, [in] Windows.UI.Input.IPointerPointTransform *transform, [out, retval] Windows.UI.Input.PointerPoint **point); + [overload("GetIntermediatePoints")] HRESULT GetIntermediatePointsTransformed([in] UINT32 pointer_id, [in] Windows.UI.Input.IPointerPointTransform *transform, [out, retval] Windows.Foundation.Collections.IVector<Windows.UI.Input.PointerPoint *> **points); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(4d5fe14f-b87c-4028-bc9c-59e9947fb056) + ] + interface IPointerPointTransform : IInspectable + { + [propget] HRESULT Inverse([out, retval] Windows.UI.Input.IPointerPointTransform **value); + HRESULT TryTransform([in] Windows.Foundation.Point in_point, [out] Windows.Foundation.Point *out_point, [out, retval] boolean *value); + HRESULT TransformBounds([in] Windows.Foundation.Rect rect, [out, retval] Windows.Foundation.Rect *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(none), + static(Windows.UI.Input.IPointerPointStatics, Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass PointerPoint + { + [default] interface Windows.UI.Input.IPointerPoint; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(none) + ] + runtimeclass PointerPointProperties + { + [default] interface Windows.UI.Input.IPointerPointProperties; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.Input.IPointerPointProperties2; + } +}

1 0

Zhiyi Zhang : include: Add windows.devices.input.idl.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: cd8306db8349bcb79124a40fa60bf363efb5da51 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd8306db8349bcb79124a40fa60bf3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 13 12:10:33 2024 +0800 include: Add windows.devices.input.idl. --- include/Makefile.in | 1 + include/windows.devices.input.idl | 117 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d3548b1bedb..287666e79d9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -832,6 +832,7 @@ SOURCES = \ windows.devices.enumeration.idl \ windows.devices.geolocation.idl \ windows.devices.haptics.idl \ + windows.devices.input.idl \ windows.devices.power.idl \ windows.devices.radios.idl \ windows.devices.usb.idl \ diff --git a/include/windows.devices.input.idl b/include/windows.devices.input.idl new file mode 100644 index 00000000000..492d43c5807 --- /dev/null +++ b/include/windows.devices.input.idl @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2024 Zhiyi Zhang for CodeWeavers + * + * 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 + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +#endif + +namespace Windows.Devices.Input { + typedef enum PointerDeviceType PointerDeviceType; + typedef struct PointerDeviceUsage PointerDeviceUsage; + + interface IPointerDevice; + interface IPointerDevice2; + interface IPointerDeviceStatics; + + runtimeclass PointerDevice; + + declare { + interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Input.PointerDevice *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Input.PointerDeviceUsage>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum PointerDeviceType + { + Touch = 0, + Pen = 1, + Mouse = 2 + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct PointerDeviceUsage + { + UINT32 UsagePage; + UINT32 Usage; + INT32 MinLogical; + INT32 MaxLogical; + INT32 MinPhysical; + INT32 MaxPhysical; + UINT32 Unit; + FLOAT PhysicalMultiplier; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Input.PointerDevice), + uuid(93c9bafc-ebcb-467e-82c6-276feae36b5a) + ] + interface IPointerDevice : IInspectable + { + [propget] HRESULT PointerDeviceType([out, retval] Windows.Devices.Input.PointerDeviceType *value); + [propget] HRESULT IsIntegrated([out, retval] boolean *value); + [propget] HRESULT MaxContacts([out, retval] UINT32 *value); + [propget] HRESULT PhysicalDeviceRect([out, retval] Windows.Foundation.Rect *value); + [propget] HRESULT ScreenRect([out, retval] Windows.Foundation.Rect *value); + [propget] HRESULT SupportedUsages([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Devices.Input.PointerDeviceUsage> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Input.PointerDevice), + uuid(f8a6d2a0-c484-489f-ae3e-30d2ee1ffd3e) + ] + interface IPointerDevice2 : IInspectable + { + [propget] HRESULT MaxPointersWithZDistance([out, retval] UINT32 *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Input.PointerDevice), + uuid(d8b89aa1-d1c6-416e-bd8d-5790914dc563) + ] + interface IPointerDeviceStatics : IInspectable + { + HRESULT GetPointerDevice([in] UINT32 pointer_id, [out, retval] Windows.Devices.Input.PointerDevice **pointer_device); + HRESULT GetPointerDevices([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Devices.Input.PointerDevice *> **pointer_devices); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(none), + static(Windows.Devices.Input.IPointerDeviceStatics, Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass PointerDevice + { + [default] interface Windows.Devices.Input.IPointerDevice; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Input.IPointerDevice2; + } +}

1 0

Zhiyi Zhang : rometadata: Add initial dll.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: cbf1310f87f24238f37d57ebc48f07dbd992b4a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbf1310f87f24238f37d57ebc48f07… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 24 12:16:18 2024 +0800 rometadata: Add initial dll. --- configure | 3 + configure.ac | 2 + dlls/rometadata/Makefile.in | 6 ++ dlls/rometadata/main.c | 194 +++++++++++++++++++++++++++++++++++++ dlls/rometadata/rometadata.spec | 1 + dlls/rometadata/tests/Makefile.in | 5 + dlls/rometadata/tests/rometadata.c | 70 +++++++++++++ include/Makefile.in | 1 + include/rometadata.h | 24 +++++ 9 files changed, 306 insertions(+)

1 0

Torge Matthies : winegstreamer: Handle Gstreamer pipeline flushes gracefully in the media source.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 9dd9c455d345835a9a5454546b8489245b81f3ed URL: https://gitlab.winehq.org/wine/wine/-/commit/9dd9c455d345835a9a5454546b8489… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Jun 14 03:11:44 2024 +0200 winegstreamer: Handle Gstreamer pipeline flushes gracefully in the media source. If a GST_EVENT_FLUSH_START event is received between the calls from PE code to wg_parser_stream_get_buffer and wg_parser_stream_copy_buffer, the latter function will return an error, resulting in the sample request being dropped without having delivered a sample. If wg_parser_stream_copy_buffer returns an error, retry the whole wait_on_sample procedure. Flushes can be triggered by seek operations. --- dlls/winegstreamer/media_source.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 474bc42ae15..030d0c1b9a2 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -728,6 +728,7 @@ static HRESULT media_stream_send_sample(struct media_stream *stream, const struc if (!wg_parser_stream_copy_buffer(stream->wg_stream, data, 0, wg_buffer->size)) { + hr = S_FALSE; wg_parser_stream_release_buffer(stream->wg_stream); IMFMediaBuffer_Unlock(buffer); goto out; @@ -789,8 +790,12 @@ static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token) TRACE("%p, %p\n", stream, token); - if (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer)) - return media_stream_send_sample(stream, &buffer, token); + while (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer)) + { + HRESULT hr = media_stream_send_sample(stream, &buffer, token); + if (hr != S_FALSE) + return hr; + } return media_stream_send_eos(source, stream); }

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put CacheSize.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: 794e1f188494b7d4ff034d2e52731c66f19980ee URL: https://gitlab.winehq.org/wine/wine/-/commit/794e1f188494b7d4ff034d2e52731c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 18:45:17 2024 +1000 msado15: Implement _Recordset get/put CacheSize. --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 36938db88cc..1b1c033320a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -50,6 +50,7 @@ struct recordset CursorTypeEnum cursor_type; IRowset *row_set; EditModeEnum editmode; + LONG cache_size; VARIANT filter; DBTYPE *columntypes; @@ -1449,14 +1450,20 @@ static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmar static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, size ); + + *size = recordset->cache_size; + return S_OK; } static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) { - FIXME( "%p, %ld\n", iface, size ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %ld\n", iface, size ); + + recordset->cache_size = size; + return S_OK; } static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) @@ -2792,6 +2799,7 @@ HRESULT Recordset_create( void **obj ) recordset->cursor_type = adOpenForwardOnly; recordset->row_set = NULL; recordset->editmode = adEditNone; + recordset->cache_size = 1; VariantInit( &recordset->filter ); recordset->columntypes = NULL; recordset->haccessors = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9c9afbc120f..45dbf2c2239 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static void test_Recordset(void) HRESULT hr; VARIANT bookmark, filter, active; EditModeEnum editmode; + LONG cache_size; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -111,6 +112,21 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08lx\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + cache_size = 0; + hr = _Recordset_get_CacheSize( recordset, &cache_size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cache_size == 1, "got %ld\n", cache_size ); + + hr = _Recordset_put_CacheSize( recordset, 5 ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = _Recordset_get_CacheSize( recordset, &cache_size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cache_size == 5, "got %ld\n", cache_size ); + + hr = _Recordset_put_CacheSize( recordset, 1 ); + ok( hr == S_OK, "got %08lx\n", hr ); + editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr );

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put MaxRecords.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: c483e5d45606b497812e16d26b1e146cd8c6cb16 URL: https://gitlab.winehq.org/wine/wine/-/commit/c483e5d45606b497812e16d26b1e14… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 18:59:50 2024 +1000 msado15: Implement _Recordset get/put MaxRecords. --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 17 ++++++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1b1c033320a..b288f4c547c 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -51,6 +51,7 @@ struct recordset IRowset *row_set; EditModeEnum editmode; LONG cache_size; + ADO_LONGPTR max_records; VARIANT filter; DBTYPE *columntypes; @@ -1532,14 +1533,20 @@ static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lo static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, ADO_LONGPTR *max_records ) { - FIXME( "%p, %p\n", iface, max_records ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, max_records ); + + *max_records = recordset->max_records; + return S_OK; } static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, ADO_LONGPTR max_records ) { - FIXME( "%p, %Id\n", iface, max_records ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %Id\n", iface, max_records ); + + recordset->max_records = max_records; + return S_OK; } static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, ADO_LONGPTR *count ) @@ -2800,6 +2807,7 @@ HRESULT Recordset_create( void **obj ) recordset->row_set = NULL; recordset->editmode = adEditNone; recordset->cache_size = 1; + recordset->max_records = 0; VariantInit( &recordset->filter ); recordset->columntypes = NULL; recordset->haccessors = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 45dbf2c2239..b6c1c391e71 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -53,7 +53,7 @@ static void test_Recordset(void) Properties *props; Property *prop; LONG count, state; - ADO_LONGPTR rec_count; + ADO_LONGPTR rec_count, max_records; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -127,6 +127,21 @@ static void test_Recordset(void) hr = _Recordset_put_CacheSize( recordset, 1 ); ok( hr == S_OK, "got %08lx\n", hr ); + max_records = 0; + hr = _Recordset_get_MaxRecords( recordset, &max_records ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( max_records == 0, "got %Id\n", max_records ); + + hr = _Recordset_put_MaxRecords( recordset, 5 ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = _Recordset_get_MaxRecords( recordset, &max_records ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( max_records == 5, "got %Id\n", max_records ); + + hr = _Recordset_put_MaxRecords( recordset, 0 ); + ok( hr == S_OK, "got %08lx\n", hr ); + editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr );

1 0