November 2021 - Wine-Commits

Jactry Zeng : include: Add IDeviceWatcher interface.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: 489cdd1932da862e27f4cf4c582f2ed951a12caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=489cdd1932da862e27f4cf4c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Oct 29 16:52:56 2021 +0800 include: Add IDeviceWatcher interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.devices.enumeration.idl | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl index 20e4df9d33d..7cde49224a1 100644 --- a/include/windows.devices.enumeration.idl +++ b/include/windows.devices.enumeration.idl @@ -30,6 +30,7 @@ import "windows.foundation.idl"; namespace Windows { namespace Devices { namespace Enumeration { + typedef enum DeviceWatcherStatus DeviceWatcherStatus; typedef enum Panel Panel; interface IDeviceInformation; @@ -41,6 +42,7 @@ namespace Windows { runtimeclass DeviceInformation; runtimeclass DeviceInformationUpdate; runtimeclass DeviceThumbnail; + runtimeclass DeviceWatcher; runtimeclass EnclosureLocation; } } @@ -59,6 +61,9 @@ namespace Windows interface Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *>; interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *>; interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *>; + interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, IInspectable *>; + interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformationUpdate *>; } } } @@ -82,6 +87,16 @@ namespace Windows namespace Windows { namespace Devices { namespace Enumeration { + enum DeviceWatcherStatus + { + Created = 0, + Started = 1, + EnumerationCompleted = 2, + Stopping = 3, + Stopped = 4, + Aborted = 5 + }; + enum Panel { Unknown = 0, @@ -120,6 +135,32 @@ namespace Windows { [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value); } + [ + exclusiveto(Windows.Devices.Enumeration.DeviceWatcher), + uuid(c9eab97d-8f6b-4f96-a9f4-abc814e22271), + ] + interface IDeviceWatcher : IInspectable + { + [eventadd] HRESULT Added([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher*, + Windows.Devices.Enumeration.DeviceInformation *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Added([in] EventRegistrationToken token); + [eventadd] HRESULT Updated([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Updated([in] EventRegistrationToken token); + [eventadd] HRESULT Removed([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Removed([in] EventRegistrationToken token); + [eventadd] HRESULT EnumerationCompleted([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT EnumerationCompleted([in] EventRegistrationToken token); + [eventadd] HRESULT Stopped([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Stopped([in] EventRegistrationToken token); + [propget] HRESULT Status([out, retval] Windows.Devices.Enumeration.DeviceWatcherStatus *status); + HRESULT Start(); + HRESULT Stop(); + } + [ exclusiveto(Windows.Devices.Enumeration.EnclosureLocation), uuid(42340a27-5810-459c-aabb-c65e1f813ecf) @@ -166,6 +207,15 @@ namespace Windows { interface Windows.Storage.Streams.IInputStream; } + [ + marshaling_behavior(agile), + ] + runtimeclass DeviceWatcher + { + [default] interface Windows.Devices.Enumeration.IDeviceWatcher; + interface Windows.Devices.Enumeration.IDeviceWatcher2; + } + [ marshaling_behavior(agile) ]

1 0

Alexandre Julliard : include: Don't define __in and __out.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: 1c9b843ecf821d3caf43668c43bf0280c793b25d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9b843ecf821d3caf43668c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 10:42:07 2021 +0100 include: Don't define __in and __out. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51919 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 4 ++-- libs/jxr/jxrgluelib/JXRMeta.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sal.h b/include/sal.h index 680f97f9250..f11e744aa51 100644 --- a/include/sal.h +++ b/include/sal.h @@ -344,7 +344,7 @@ #define __ecount(size) #define __ecount_opt(size) -#define __in +/* #define __in */ /* conflicts with system headers */ #define __in_bcount(size) #define __in_bcount_nz(size) #define __in_bcount_nz_opt(size) @@ -390,7 +390,7 @@ #define __inout_z #define __inout_z_opt -#define __out +/* #define __out */ /* conflicts with system headers */ #define __out_bcount(size) #define __out_bcount_full(size) #define __out_bcount_full_opt(size) diff --git a/libs/jxr/jxrgluelib/JXRMeta.h b/libs/jxr/jxrgluelib/JXRMeta.h index 53215041d70..81b12ea063c 100644 --- a/libs/jxr/jxrgluelib/JXRMeta.h +++ b/libs/jxr/jxrgluelib/JXRMeta.h @@ -107,8 +107,8 @@ #ifdef WIN32 -#define __in_win __in -#define __out_win __out +#define __in_win +#define __out_win #endif

1 0

Paul Gofman : ntdll: Pass DDAG node to process_attach().
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: 06f925c59942ba5613b0aac15172ea2516aee46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f925c59942ba5613b0aac1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 13:26:41 2021 +0300 ntdll: Pass DDAG node to process_attach(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index ebb0f4250f9..093ec75476d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -187,7 +187,7 @@ static WINE_MODREF *last_failed_modref; static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WCHAR *default_ext, DWORD flags, WINE_MODREF** pwm ); -static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); +static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ); static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, @@ -648,7 +648,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS WINE_MODREF **deps = grow_module_deps( current_modref, 1 ); if (deps) deps[current_modref->nDeps++] = wm; } - else if (process_attach( wm, NULL ) != STATUS_SUCCESS) + else if (process_attach( wm->ldr.DdagNode, NULL ) != STATUS_SUCCESS) { LdrUnloadDll( wm->ldr.DllBase ); wm = NULL; @@ -1438,14 +1438,19 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved * * The loader_section must be locked while calling this function. */ -static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) +static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ) { NTSTATUS status = STATUS_SUCCESS; + LDR_DATA_TABLE_ENTRY *mod; ULONG_PTR cookie; + WINE_MODREF *wm; int i; if (process_detaching) return status; + mod = CONTAINING_RECORD( node->Modules.Flink, LDR_DATA_TABLE_ENTRY, NodeModuleLink ); + wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr ); + /* prevent infinite recursion in case of cyclical dependencies */ if ( ( wm->ldr.Flags & LDR_LOAD_IN_PROGRESS ) || ( wm->ldr.Flags & LDR_PROCESS_ATTACHED ) ) @@ -1462,7 +1467,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) for ( i = 0; i < wm->nDeps; i++ ) { if (!wm->deps[i]) continue; - if ((status = process_attach( wm->deps[i], lpReserved )) != STATUS_SUCCESS) break; + if ((status = process_attach( wm->deps[i]->ldr.DdagNode, lpReserved )) != STATUS_SUCCESS) break; } if (!wm->ldr.InInitializationOrderLinks.Flink) @@ -2994,7 +2999,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { - nts = process_attach( wm, NULL ); + nts = process_attach( wm->ldr.DdagNode, NULL ); if (nts != STATUS_SUCCESS) { LdrUnloadDll(wm->ldr.DllBase); @@ -3957,7 +3962,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR for (i = 0; i < wm->nDeps; i++) { if (!wm->deps[i]) continue; - if ((status = process_attach( wm->deps[i], context )) != STATUS_SUCCESS) + if ((status = process_attach( wm->deps[i]->ldr.DdagNode, context )) != STATUS_SUCCESS) { if (last_failed_modref) ERR( "%s failed to initialize, aborting\n",

1 0

Paul Gofman : ntdll: Store module dependencies in DDAG structure.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: 0dd37b02f99f5090dd855343fcd8a99496047f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd37b02f99f5090dd855343… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 13:26:42 2021 +0300 ntdll: Store module dependencies in DDAG structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 12 +-- dlls/ntdll/loader.c | 201 +++++++++++++++++++++++++++++++------------ include/winternl.h | 4 +- 3 files changed, 152 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dd37b02f99f5090dd85…

1 0

Alexandre Julliard : include: Don't include unistd.h in wine/port.h.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: efe46a0483084abd570bdce15ea044e168d10441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe46a0483084abd570bdce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 10:42:59 2021 +0100 include: Don't include unistd.h in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/freetype.c | 1 + dlls/wineandroid.drv/device.c | 1 + include/wine/port.h | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 6e573b23cdf..70415d8a157 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -43,6 +43,7 @@ #endif #include <stdio.h> #include <assert.h> +#include <unistd.h> #ifdef HAVE_CARBON_CARBON_H #define LoadResource __carbon_LoadResource diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 4a16e6836ed..6ddb4b741eb 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <stdarg.h> #include <sys/ioctl.h> +#include <unistd.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/include/wine/port.h b/include/wine/port.h index 0e9911af9ad..bc71725ed4e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -32,9 +32,6 @@ #include <sys/types.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif /****************************************************************

1 0

Jactry Zeng : include: Add IMapView interface.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: b74523bb347b6e9c6362287cc67e0c25c758d971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b74523bb347b6e9c6362287c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Oct 29 16:52:53 2021 +0800 include: Add IMapView interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index b0b9430048b..876e15336a2 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -74,6 +74,18 @@ cpp_quote("#endif") namespace Collections { + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(e480ce40-a338-4ada-adcf-272272e48cb9) + ] + interface IMapView<K, V> : IInspectable + { + HRESULT Lookup([in] K key, [out] V *value); + [propget] HRESULT Size([out] unsigned int *size); + HRESULT HasKey([in] K key, [out] boolean *found); + HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(6a79e863-4300-459a-9966-cbb660963ee1)

1 0

Alexandre Julliard : qcap: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: 62e2d7a99b089b1ce302a348103178e64dee4342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e2d7a99b089b1ce302a348… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 18:38:11 2021 +0100 qcap: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 + dlls/qcap/qcap_private.h | 123 ++++++++++++++++++++++++++++------ dlls/qcap/v4l.c | 168 +++++++++++++++++++++++++++-------------------- dlls/qcap/vfwcapture.c | 73 ++++++++++++++------ 4 files changed, 255 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62e2d7a99b089b1ce302…

1 0

Zebediah Figura : winegstreamer: Implement IWMReader::GetOutputProps().
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: a855591fd29f1f47947459f8710b580a4f90ce3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a855591fd29f1f47947459f8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 23:51:48 2021 -0500 winegstreamer: Implement IWMReader::GetOutputProps(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 10 ++++++---- dlls/wmvcore/tests/wmvcore.c | 32 ++++++++++++-------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 8caf21a2de0..6771b590a71 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -114,11 +114,13 @@ static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *count) return S_OK; } -static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) +static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output, IWMOutputMediaProps **props) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, output); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReader(iface); + + TRACE("reader %p, output %u, props %p.\n", reader, output, props); + + return wm_reader_get_output_props(&reader->reader, output, props); } static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 553f79656d6..148b4f5f373 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1397,12 +1397,7 @@ static void test_async_reader_types(void) output_number = i; hr = IWMReader_GetOutputProps(reader, output_number, &output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - { - winetest_pop_context(); - continue; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); @@ -1529,25 +1524,22 @@ static void test_async_reader_types(void) todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - hr = IWMReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(output_props2 != output_props, "Expected different objects.\n"); + hr = IWMReader_GetOutputProps(reader, output_number, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); - ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); - } + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); winetest_pop_context(); } - todo_wine ok(got_audio, "No audio stream was enumerated.\n"); - todo_wine ok(got_video, "No video stream was enumerated.\n"); + ok(got_audio, "No audio stream was enumerated.\n"); + ok(got_video, "No video stream was enumerated.\n"); count = 0xdeadbeef; hr = IWMReader_GetOutputFormatCount(reader, 2, &count); @@ -1556,7 +1548,7 @@ static void test_async_reader_types(void) output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputProps(reader, 2, &output_props); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); output_props = (void *)0xdeadbeef;

1 0

Alistair Leslie-Hughes : msdasql: Implement ISourcesRowset GetSourcesRowset for enumeration.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: cf82bc541773bb22b120f42f852c8863a222fbac URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf82bc541773bb22b120f42f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 3 16:37:10 2021 +1100 msdasql: Implement ISourcesRowset GetSourcesRowset for enumeration. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 137 +++++++++++++++++++++++++++++++++++++++++- dlls/oledb32/tests/database.c | 6 +- 2 files changed, 138 insertions(+), 5 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index ff16413004e..7402b505270 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -26,6 +26,7 @@ #include "oledb.h" #include "rpcproxy.h" #include "wine/debug.h" +#include "oledberr.h" #include "initguid.h" #include "msdasql.h" @@ -605,13 +606,145 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) return ref; } +struct msdasql_enum_rowset +{ + IRowset IRowset_iface; + LONG ref; +}; + +static inline struct msdasql_enum_rowset *msdasql_rs_from_IRowset(IRowset *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql_enum_rowset, IRowset_iface); +} + +static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + TRACE( "%p, %s, %p\n", rowset, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IRowset, riid)) + { + *ppv = &rowset->IRowset_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI enum_rowset_AddRef(IRowset *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + LONG refs = InterlockedIncrement( &rowset->ref ); + TRACE( "%p new refcount %d\n", rowset, refs ); + return refs; +} + +static ULONG WINAPI enum_rowset_Release(IRowset *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + LONG refs = InterlockedDecrement( &rowset->ref ); + TRACE( "%p new refcount %d\n", rowset, refs ); + if (!refs) + { + TRACE( "destroying %p\n", rowset ); + free( rowset ); + } + return refs; +} + +static HRESULT WINAPI enum_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rowset_GetData(IRowset *iface, HROW row, HACCESSOR accessor, void *data) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, DBROWOFFSET offset, + DBROWCOUNT count, DBCOUNTITEM *obtained, HROW **rows) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); + + if (!obtained || !rows) + return E_INVALIDARG; + + *obtained = 0; + + if (!count) + return S_OK; + + return DB_S_ENDOFROWSET; +} + +static HRESULT WINAPI enum_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBROWOPTIONS options[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); + + return S_OK; +} + +static HRESULT WINAPI enum_rowset_RestartPosition(IRowset *iface, HCHAPTER reserved) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld\n", rowset, reserved); + + return S_OK; +} + +static const struct IRowsetVtbl enum_rowset_vtbl = +{ + enum_rowset_QueryInterface, + enum_rowset_AddRef, + enum_rowset_Release, + enum_rowset_AddRefRows, + enum_rowset_GetData, + enum_rowset_GetNextRows, + enum_rowset_ReleaseRows, + enum_rowset_RestartPosition +}; + static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets, DBPROPSET properties[], IUnknown **rowset) { struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); - FIXME("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + struct msdasql_enum_rowset *enum_rs; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + + enum_rs = malloc(sizeof(*enum_rs)); + enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; + enum_rs->ref = 1; + + hr = IRowset_QueryInterface(&enum_rs->IRowset_iface, riid, (void**)rowset); + IRowset_Release(&enum_rs->IRowset_iface); + return hr; } static const ISourcesRowsetVtbl msdsqlenum_vtbl = diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7fdc3df4176..7e298fcb129 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1073,19 +1073,19 @@ static void test_odbc_enumerator(void) } hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, 0, (IUnknown**)&rowset); - todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); if (hr == S_OK) { IAccessor *accessor; IRowsetInfo *info; hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor); - ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) IAccessor_Release(accessor); hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void **)&info); - ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) IRowsetInfo_Release(info);

1 0

Alistair Leslie-Hughes : msdasql: Support IAccessor in IRowset for Enumeration.
by Alexandre Julliard Nov. 3, 2021

Nov. 3, 2021

Module: wine Branch: master Commit: 9e76b504e54e80ffee72a033b8dfd9e001b04cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e76b504e54e80ffee72a033… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 3 16:37:11 2021 +1100 msdasql: Support IAccessor in IRowset for Enumeration. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 81 +++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 2 +- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 7402b505270..b8d68287e6a 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -609,6 +609,7 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) struct msdasql_enum_rowset { IRowset IRowset_iface; + IAccessor IAccessor_iface; LONG ref; }; @@ -617,6 +618,11 @@ static inline struct msdasql_enum_rowset *msdasql_rs_from_IRowset(IRowset *iface return CONTAINING_RECORD(iface, struct msdasql_enum_rowset, IRowset_iface); } +static inline struct msdasql_enum_rowset *msdasql_enum_from_IAccessor ( IAccessor *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_enum_rowset, IAccessor_iface ); +} + static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); @@ -629,6 +635,10 @@ static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, v { *ppv = &rowset->IRowset_iface; } + else if(IsEqualGUID(&IID_IAccessor, riid)) + { + *ppv = &rowset->IAccessor_iface; + } if(*ppv) { @@ -729,6 +739,76 @@ static const struct IRowsetVtbl enum_rowset_vtbl = enum_rowset_RestartPosition }; +static HRESULT WINAPI enum_rs_accessor_QueryInterface(IAccessor *iface, REFIID riid, void **out) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI enum_rs_accessor_AddRef(IAccessor *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI enum_rs_accessor_Release(IAccessor *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI enum_rs_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rs_accessor_CreateAccessor(IAccessor *iface, DBACCESSORFLAGS flags, + DBCOUNTITEM count, const DBBINDING bindings[], DBLENGTH row_size, HACCESSOR *accessor, + DBBINDSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + + FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + + if (accessor) + *accessor = 0xdeadbeef; + + return S_OK; +} + +static HRESULT WINAPI enum_rs_accessor_GetBindings(IAccessor *iface, HACCESSOR accessor, + DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rs_accessor_ReleaseAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + + FIXME("%p, %lu, %p\n", rowset, accessor, count); + + if (count) + *count = 0; + + return S_OK; +} + +struct IAccessorVtbl enum_accessor_vtbl = +{ + enum_rs_accessor_QueryInterface, + enum_rs_accessor_AddRef, + enum_rs_accessor_Release, + enum_rs_accessor_AddRefAccessor, + enum_rs_accessor_CreateAccessor, + enum_rs_accessor_GetBindings, + enum_rs_accessor_ReleaseAccessor +}; + static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets, DBPROPSET properties[], IUnknown **rowset) { @@ -740,6 +820,7 @@ static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnkn enum_rs = malloc(sizeof(*enum_rs)); enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; + enum_rs->IAccessor_iface.lpVtbl = &enum_accessor_vtbl; enum_rs->ref = 1; hr = IRowset_QueryInterface(&enum_rs->IRowset_iface, riid, (void**)rowset); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7e298fcb129..421f4258afd 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1080,7 +1080,7 @@ static void test_odbc_enumerator(void) IRowsetInfo *info; hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) IAccessor_Release(accessor);

1 0