November 2021 - Wine-commits

Jactry Zeng : include: Add IDeviceWatcher interface.
by Alexandre Julliard 03 Nov '21

03 Nov '21

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

Damjan Jovanovic : ntdll: Implement setting SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION.IdleTime on FreeBSD.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 478a7dbc90477de85dc8c98429af99e156e92b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=478a7dbc90477de85dc8c984… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 31 17:47:26 2021 +0200 ntdll: Implement setting SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION.IdleTime on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c37fc360f3e..6640a66597b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -52,6 +52,9 @@ #ifdef HAVE_SYS_RANDOM_H # include <sys/random.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #ifdef HAVE_IOKIT_IOKITLIB_H # include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> @@ -2611,7 +2614,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count * sizeof(natural_t)); } } -#else +#elif defined(linux) { FILE *cpuinfo = fopen("/proc/stat", "r"); if (cpuinfo) @@ -2644,6 +2647,33 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, fclose(cpuinfo); } } +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) + { + static int clockrate_name[] = { CTL_KERN, KERN_CLOCKRATE }; + size_t size = 0; + struct clockinfo clockrate; + int have_clockrate; + long *ptimes; + + size = sizeof(clockrate); + have_clockrate = !sysctl(clockrate_name, 2, &clockrate, &size, NULL, 0); + size = out_cpus * CPUSTATES * sizeof(long); + ptimes = malloc(size + 1); + if (ptimes) + { + if (have_clockrate && (!sysctlbyname("kern.cp_times", ptimes, &size, NULL, 0) || errno == ENOMEM)) + { + for (cpus = 0; cpus < out_cpus; cpus++) + { + if (cpus * CPUSTATES * sizeof(long) >= size) break; + sppi[cpus].IdleTime.QuadPart = (ULONGLONG)ptimes[cpus*CPUSTATES + CP_IDLE] * 10000000 / clockrate.stathz; + sppi[cpus].KernelTime.QuadPart = (ULONGLONG)ptimes[cpus*CPUSTATES + CP_SYS] * 10000000 / clockrate.stathz; + sppi[cpus].UserTime.QuadPart = (ULONGLONG)ptimes[cpus*CPUSTATES + CP_USER] * 10000000 / clockrate.stathz; + } + } + free(ptimes); + } + } #endif if (cpus == 0) {

1 0

Damjan Jovanovic : ntdll: Implement setting SYSTEM_PERFORMANCE_INFORMATION.IdleTime on FreeBSD.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: d5406d028b9b735a1f727d7b500494a724b7eaad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5406d028b9b735a1f727d7b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 31 17:47:50 2021 +0200 ntdll: Implement setting SYSTEM_PERFORMANCE_INFORMATION.IdleTime on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6640a66597b..91184b12dba 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1852,6 +1852,7 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) memset( info, 0, sizeof(*info) ); +#if defined(linux) if ((fp = fopen("/proc/uptime", "r"))) { double uptime, idle_time; @@ -1860,12 +1861,28 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) fclose(fp); info->IdleTime.QuadPart = 10000000 * idle_time; } - else +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + { + static int clockrate_name[] = { CTL_KERN, KERN_CLOCKRATE }; + size_t size = 0; + struct clockinfo clockrate; + long ptimes[CPUSTATES]; + + size = sizeof(clockrate); + if (!sysctl(clockrate_name, 2, &clockrate, &size, NULL, 0)) + { + size = sizeof(ptimes); + if (!sysctlbyname("kern.cp_time", ptimes, &size, NULL, 0)) + info->IdleTime.QuadPart = (ULONGLONG)ptimes[CP_IDLE] * 10000000 / clockrate.stathz; + } + } +#else { static ULONGLONG idle; /* many programs expect IdleTime to change so fake change */ info->IdleTime.QuadPart = ++idle; } +#endif #ifdef linux if ((fp = fopen("/proc/meminfo", "r")))

1 0

Damjan Jovanovic : ntdll: Implement get_device_mount_point() on FreeBSD.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 26d8701ae296d9b149b1111677e5ccbc1cb5ed4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d8701ae296d9b149b11116… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 31 17:48:18 2021 +0200 ntdll: Implement get_device_mount_point() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 1acd999a3c5..10d8f3de4a3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -944,7 +944,7 @@ static char *get_device_mount_point( dev_t dev ) fclose( f ); } mutex_unlock( &mnt_mutex ); -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs *entry; struct stat st; int i, size;

1 0

Damjan Jovanovic : ntdll: Implement vm counters on FreeBSD.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: c67c50f2821d456955023671d363c1839d1bb151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c67c50f2821d456955023671… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 31 17:49:33 2021 +0200 ntdll: Implement vm counters on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 10a88db9291..c834ef85c79 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -46,6 +46,21 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +# include <sys/queue.h> +#endif +#ifdef HAVE_SYS_USER_H +# include <sys/user.h> +#endif +#ifdef HAVE_LIBPROCSTAT_H +# include <libprocstat.h> +#endif #include <unistd.h> #ifdef HAVE_MACH_MACH_H # include <mach/mach.h> @@ -1002,6 +1017,30 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) fclose(f); } +#elif defined(HAVE_LIBPROCSTAT) + +void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) +{ + struct procstat *pstat; + struct kinfo_proc *kip; + unsigned int proc_count; + + pstat = procstat_open_sysctl(); + if (pstat) + { + kip = procstat_getprocs( pstat, KERN_PROC_PID, unix_pid == -1 ? getpid() : unix_pid, &proc_count ); + if (kip) + { + pvmi->VirtualSize = kip->ki_size; + pvmi->PeakVirtualSize = kip->ki_size; + pvmi->WorkingSetSize = kip->ki_rssize << PAGE_SHIFT; + pvmi->PeakWorkingSetSize = kip->ki_rusage.ru_maxrss * 1024; + procstat_freeprocs( pstat, kip ); + } + procstat_close( pstat ); + } +} + #else void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid )

1 0

Damjan Jovanovic : ntdll: Populate MEMORY_WORKING_SET_EX_INFORMATION on FreeBSD.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: fbb633750f14feae15d162b512fc946c974646d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbb633750f14feae15d162b5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 31 17:50:09 2021 +0200 ntdll: Populate MEMORY_WORKING_SET_EX_INFORMATION on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index facecffcf37..756a7388a22 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -43,6 +43,21 @@ #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +# include <sys/queue.h> +#endif +#ifdef HAVE_SYS_USER_H +# include <sys/user.h> +#endif +#ifdef HAVE_LIBPROCSTAT_H +# include <libprocstat.h> +#endif #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_VALGRIND_VALGRIND_H @@ -4242,7 +4257,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, MEMORY_WORKING_SET_EX_INFORMATION *info, SIZE_T len, SIZE_T *res_len ) { - FILE *f; + FILE *f = NULL; MEMORY_WORKING_SET_EX_INFORMATION *p; sigset_t sigset; @@ -4252,6 +4267,58 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, return STATUS_INVALID_INFO_CLASS; } +#if defined(HAVE_LIBPROCSTAT) + { + struct procstat *pstat; + unsigned int proc_count; + struct kinfo_proc *kip = NULL; + unsigned int vmentry_count = 0; + struct kinfo_vmentry *vmentries = NULL; + + pstat = procstat_open_sysctl(); + if (pstat) + kip = procstat_getprocs( pstat, KERN_PROC_PID, getpid(), &proc_count ); + if (kip) + vmentries = procstat_getvmmap( pstat, kip, &vmentry_count ); + if (vmentries == NULL) + WARN( "couldn't get process vmmap, errno %d\n", errno ); + + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + for (p = info; (UINT_PTR)(p + 1) <= (UINT_PTR)info + len; p++) + { + int i; + struct kinfo_vmentry *entry = NULL; + BYTE vprot; + struct file_view *view; + + for (i = 0; i < vmentry_count && entry == NULL; i++) + { + if (vmentries[i].kve_start <= (ULONG_PTR)p->VirtualAddress && (ULONG_PTR)p->VirtualAddress <= vmentries[i].kve_end) + entry = &vmentries[i]; + } + memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) ); + if ((view = find_view( p->VirtualAddress, 0 )) && + get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) && + (vprot & VPROT_COMMITTED)) + { + p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && entry && entry->kve_type != KVME_TYPE_SWAP; + p->VirtualAttributes.Shared = !is_view_valloc( view ); + if (p->VirtualAttributes.Shared && p->VirtualAttributes.Valid) + p->VirtualAttributes.ShareCount = 1; /* FIXME */ + if (p->VirtualAttributes.Valid) + p->VirtualAttributes.Win32Protection = get_win32_prot( vprot, view->protect ); + } + } + server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + + if (vmentries) + procstat_freevmmap( pstat, vmentries ); + if (kip) + procstat_freeprocs( pstat, kip ); + if (pstat) + procstat_close( pstat ); + } +#else f = fopen( "/proc/self/pagemap", "rb" ); if (!f) { @@ -4288,6 +4355,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, } } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); +#endif if (f) fclose( f );

1 0

Zebediah Figura : wmvcore/tests: Add tests for asynchronous reader streaming.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: c9f5903e5a315989d03d48e4a53291be48fd8d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f5903e5a315989d03d48e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 23:51:44 2021 -0500 wmvcore/tests: Add tests for asynchronous reader streaming. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 291 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 283 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9f5903e5a315989d03d…

1 0

Zebediah Figura : wmvcore/tests: Add tests for asynchronous reader media types.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 4398e8aba2d2c96ee209f59658c2aa6caf26687a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4398e8aba2d2c96ee209f596… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 23:51:45 2021 -0500 wmvcore/tests: Add tests for asynchronous reader media types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 254 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 253 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4398e8aba2d2c96ee209…

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced2::OpenStream().
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 42c82012c7ac992a98930011647482fc94c63a87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42c82012c7ac992a98930011… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 23:51:46 2021 -0500 winegstreamer: Implement IWMReaderAdvanced2::OpenStream(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 58 ++++++++++++++++++++++++++++++++----- dlls/wmvcore/tests/wmvcore.c | 21 +++++++------- 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 4fec89a2100..3448e156fa0 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -31,8 +31,20 @@ struct async_reader IWMReaderStreamClock IWMReaderStreamClock_iface; IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IReferenceClock IReferenceClock_iface; + + IWMReaderCallback *callback; + void *context; }; +static void open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) +{ + static const DWORD zero; + + IWMReaderCallback_AddRef(reader->callback = callback); + reader->context = context; + IWMReaderCallback_OnStatus(callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, context); +} + static struct async_reader *impl_from_IWMReader(IWMReader *iface) { return CONTAINING_RECORD(iface, struct async_reader, IWMReader_iface); @@ -68,9 +80,26 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReade static HRESULT WINAPI WMReader_Close(IWMReader *iface) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReader(iface); + static const DWORD zero; + HRESULT hr; + + TRACE("reader %p.\n", reader); + + EnterCriticalSection(&reader->reader.cs); + + hr = wm_reader_close(&reader->reader); + if (reader->callback) + { + IWMReaderCallback_OnStatus(reader->callback, WMT_CLOSED, S_OK, + WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); + IWMReaderCallback_Release(reader->callback); + } + reader->callback = NULL; + + LeaveCriticalSection(&reader->reader.cs); + + return hr; } static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) @@ -427,12 +456,21 @@ static HRESULT WINAPI WMReaderAdvanced2_StopBuffering(IWMReaderAdvanced6 *iface) return E_NOTIMPL; } -static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, IStream *stream, - IWMReaderCallback *callback, void *context) +static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, + IStream *stream, IWMReaderCallback *callback, void *context) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p %p)\n", This, stream, callback, context); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + HRESULT hr; + + TRACE("reader %p, stream %p, callback %p, context %p.\n", reader, stream, callback, context); + + EnterCriticalSection(&reader->reader.cs); + + if (SUCCEEDED(hr = wm_reader_open_stream(&reader->reader, stream))) + open_stream(reader, callback, context); + + LeaveCriticalSection(&reader->reader.cs); + return hr; } static HRESULT WINAPI WMReaderAdvanced3_StopNetStreaming(IWMReaderAdvanced6 *iface) @@ -1256,6 +1294,10 @@ static void async_reader_destroy(struct wm_reader *iface) TRACE("reader %p.\n", reader); wm_reader_close(&reader->reader); + + if (reader->callback) + IWMReaderCallback_Release(reader->callback); + wm_reader_cleanup(&reader->reader); free(reader); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 8f4cc6eb482..9d9c4a571f2 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1255,9 +1255,7 @@ static void test_async_reader_streaming(void) IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - goto out; + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); @@ -1315,19 +1313,18 @@ static void test_async_reader_streaming(void) test_reader_attributes(profile); hr = IWMReader_Close(reader); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); callback_cleanup(&callback); -out: ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); hr = IWMReader_Close(reader); - todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); IWMReaderAdvanced2_Release(advanced); IWMProfile_Release(profile); @@ -1368,9 +1365,7 @@ static void test_async_reader_types(void) IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - goto out; + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); @@ -1403,6 +1398,11 @@ static void test_async_reader_types(void) 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; + } ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); @@ -1564,7 +1564,6 @@ static void test_async_reader_types(void) todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); -out: IWMReaderAdvanced2_Release(advanced); IWMProfile_Release(profile); ref = IWMReader_Release(reader);

1 0

Zebediah Figura : winegstreamer: Implement IWMReader::GetOutputCount().
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 34d85311f33335d2babff3983bb96fb0ce9bae5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d85311f33335d2babff398… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 23:51:47 2021 -0500 winegstreamer: Implement IWMReader::GetOutputCount(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 12 ++++++------ dlls/wmvcore/tests/wmvcore.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 3448e156fa0..8caf21a2de0 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -102,15 +102,15 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) return hr; } -static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) +static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *count) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%p)\n", This, outputs); + struct async_reader *reader = impl_from_IWMReader(iface); - if(!outputs) - return E_INVALIDARG; + TRACE("reader %p, count %p.\n", reader, count); - *outputs = 0; + EnterCriticalSection(&reader->reader.cs); + *count = reader->reader.stream_count; + LeaveCriticalSection(&reader->reader.cs); return S_OK; } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9d9c4a571f2..553f79656d6 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1264,7 +1264,7 @@ static void test_async_reader_streaming(void) count = 0xdeadbeef; hr = IWMReader_GetOutputCount(reader, &count); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(count == 2, "Got count %u.\n", count); + ok(count == 2, "Got count %u.\n", count); for (i = 0; i < 2; ++i) {

1 0