wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Nikolay Sivov : mfplat: Use RTWQ* type in BeginGetEvent().
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 3d6669cca37ad90b32afa27671481c674d7ff80a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6669cca37ad90b32afa276… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 14 09:49:08 2021 +0300 mfplat: Use RTWQ* type in BeginGetEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 9078702c854..de2b5c6ee51 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7109,7 +7109,7 @@ static void queue_notify_subscriber(struct event_queue *queue) static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsyncCallback *callback, IUnknown *state) { struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); - MFASYNCRESULT *result_data; + RTWQASYNCRESULT *result_data; HRESULT hr; TRACE("%p, %p, %p.\n", iface, callback, state); @@ -7121,9 +7121,9 @@ static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsy if (queue->is_shut_down) hr = MF_E_SHUTDOWN; - else if ((result_data = (MFASYNCRESULT *)queue->subscriber)) + else if ((result_data = (RTWQASYNCRESULT *)queue->subscriber)) { - if (result_data->pCallback == callback) + if (result_data->pCallback == (IRtwqAsyncCallback *)callback) hr = IRtwqAsyncResult_GetStateNoAddRef(queue->subscriber) == state ? MF_S_MULTIPLE_BEGIN : MF_E_MULTIPLE_BEGIN; else

1 0

Andrew Eikum : windows.media.devices: Stub DefaultAudio{Capture,Render}DeviceChanged events.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 8335099b7923bdd996073e1f83d9f1431243f89b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8335099b7923bdd996073e1f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 17:20:04 2021 -0500 windows.media.devices: Stub DefaultAudio{Capture,Render}DeviceChanged events. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.devices/main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c index 8d4c63f329a..1254ab87816 100644 --- a/dlls/windows.media.devices/main.c +++ b/dlls/windows.media.devices/main.c @@ -309,7 +309,10 @@ static HRESULT WINAPI media_device_statics_add_DefaultAudioCaptureDeviceChanged( EventRegistrationToken *token) { FIXME("iface %p, handler %p token %p stub!\n", iface, handler, token); - return E_NOTIMPL; + if(!token) + return E_POINTER; + token->value = 1; + return S_OK; } static HRESULT WINAPI media_device_statics_remove_DefaultAudioCaptureDeviceChanged( @@ -317,7 +320,7 @@ static HRESULT WINAPI media_device_statics_remove_DefaultAudioCaptureDeviceChang EventRegistrationToken token) { FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI media_device_statics_add_DefaultAudioRenderDeviceChanged( @@ -326,7 +329,10 @@ static HRESULT WINAPI media_device_statics_add_DefaultAudioRenderDeviceChanged( EventRegistrationToken *token) { FIXME("iface %p, handler %p token %p stub!\n", iface, handler, token); - return E_NOTIMPL; + if(!token) + return E_POINTER; + token->value = 1; + return S_OK; } static HRESULT WINAPI media_device_statics_remove_DefaultAudioRenderDeviceChanged( @@ -334,7 +340,7 @@ static HRESULT WINAPI media_device_statics_remove_DefaultAudioRenderDeviceChange EventRegistrationToken token) { FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return E_NOTIMPL; + return S_OK; } static IMediaDeviceStaticsVtbl media_device_statics_vtbl = {

1 0

Andrew Eikum : windows.media.devices: Implement IMediaDeviceStatics::GetDefaultAudio{Capture,Render}Id.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: c767dc4361a3fb94ffca97616d0cb30246689c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c767dc4361a3fb94ffca9761… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 17:19:59 2021 -0500 windows.media.devices: Implement IMediaDeviceStatics::GetDefaultAudio{Capture,Render}Id. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.devices/main.c | 85 ++++++++++- dlls/windows.media.devices/tests/devices.c | 223 ++++++++++++++++++++++++++++- 2 files changed, 303 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c767dc4361a3fb94ffca…

1 0

Andrew Eikum : mmdevapi: Support device ID paths in ActivateAudioInterfaceAsync.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 6de9bd06bace6f57aa987c357b7a9fdb8c311756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de9bd06bace6f57aa987c35… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 17:19:54 2021 -0500 mmdevapi: Support device ID paths in ActivateAudioInterfaceAsync. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index eac1da28f18..455e6682001 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -413,6 +413,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev static const WCHAR DEVINTERFACE_AUDIO_RENDER_WSTR[] = L"{E6327CAD-DCEC-4949-AE8A-991E976A79D2}"; static const WCHAR DEVINTERFACE_AUDIO_CAPTURE_WSTR[] = L"{2EEF81BE-33FA-4800-9670-1CD474972C3F}"; + static const WCHAR MMDEV_PATH_PREFIX[] = L"\\\\?\\SWD#MMDEVAPI#"; hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); if (FAILED(hr)) { @@ -424,8 +425,15 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, mmdev); } else if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_CAPTURE_WSTR)){ hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eCapture, eMultimedia, mmdev); + } else if (!memcmp(path, MMDEV_PATH_PREFIX, sizeof(MMDEV_PATH_PREFIX) - sizeof(WCHAR))) { + WCHAR device_id[56]; /* == strlen("{0.0.1.00000000}.{fd47d9cc-4218-4135-9ce2-0c195c87405b}") + 1 */ + + wcsncpy(device_id, path + (ARRAY_SIZE(MMDEV_PATH_PREFIX) - 1), ARRAY_SIZE(device_id)); + device_id[ARRAY_SIZE(device_id) - 1] = 0; + + hr = IMMDeviceEnumerator_GetDevice(devenum, device_id, mmdev); } else { - FIXME("How to map path to device id? %s\n", debugstr_w(path)); + FIXME("Unrecognized device id format: %s\n", debugstr_w(path)); hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); }

1 0

Zebediah Figura : kernel32/tests: Add a test for special characters in pipe names.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 80276752d15914aa343a4a733ad45e5008227a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80276752d15914aa343a4a73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:33:18 2021 -0500 kernel32/tests: Add a test for special characters in pipe names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28995 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0ac356c8483..1ed4ecec7e6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -673,6 +673,14 @@ static void test_CreateNamedPipe(int pipemode) CloseHandle(hnp); + hnp = CreateNamedPipeA("\\\\.\\pipe\\a<>*?|\"/b", PIPE_ACCESS_DUPLEX, + PIPE_TYPE_BYTE, 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hnp != INVALID_HANDLE_VALUE, "failed to create pipe, error %u\n", GetLastError()); + hFile = CreateFileA("\\\\.\\pipe\\a<>*?|\"/b", 0, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hFile != INVALID_HANDLE_VALUE, "failed to open pipe, error %u\n", GetLastError()); + CloseHandle(hFile); + CloseHandle(hnp); + if (winetest_debug > 1) trace("test_CreateNamedPipe returning\n"); }

1 0

Alexandre Julliard : include: Update PROCESS_BASIC_INFORMATION definition.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: c6393968754d64189f111e9277fb9060ec415fae URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6393968754d64189f111e92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 19:38:14 2021 +0200 include: Update PROCESS_BASIC_INFORMATION definition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 7632cfcb999..dd2bdbbebbe 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2040,10 +2040,10 @@ typedef struct _OBJECT_TYPES_INFORMATION typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ - DWORD_PTR ExitStatus; - PPEB PebBaseAddress; - DWORD_PTR AffinityMask; - DWORD_PTR BasePriority; + NTSTATUS ExitStatus; + PEB *PebBaseAddress; + ULONG_PTR AffinityMask; + LONG BasePriority; ULONG_PTR UniqueProcessId; ULONG_PTR InheritedFromUniqueProcessId; #else

1 0

Connor McAdams : mfplat: Add corresponding 'IYUV' type alongside 'I420'.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 55228c2b2ca068a4197072a0b36da9a09a63566a URL: https://source.winehq.org/git/wine.git/?a=commit;h=55228c2b2ca068a4197072a0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Apr 13 12:40:51 2021 -0400 mfplat: Add corresponding 'IYUV' type alongside 'I420'. Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 85219c74dd5..c8028b2a46f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2634,6 +2634,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, { &MFVideoFormat_IMC4, 1, 0, 0, 1 }, + { &MFVideoFormat_IYUV, 1, 0, 0, 1 }, { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, @@ -2716,6 +2717,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -2758,6 +2760,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c33d540ba4b..603dbbe22ff 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3979,6 +3979,12 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_I420, 4, 3, 18 }, { &MFVideoFormat_I420, 320, 240, 115200 }, + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, @@ -5307,6 +5313,10 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_I420, 2, 2 }, { &MFVideoFormat_I420, 3, 3 }, { &MFVideoFormat_I420, 320, 320 }, + { &MFVideoFormat_IYUV, 1, 1 }, + { &MFVideoFormat_IYUV, 2, 2 }, + { &MFVideoFormat_IYUV, 3, 3 }, + { &MFVideoFormat_IYUV, 320, 320 }, }; unsigned int i; LONG stride;

1 0

Andrew Eikum : windows.media.devices: Stub implement IMediaDeviceStatics.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 089b9d9029131b1fa3a36cb84b697030eefc0ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=089b9d9029131b1fa3a36cb8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 10:50:57 2021 -0500 windows.media.devices: Stub implement IMediaDeviceStatics. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/windows.media.devices/Makefile.in | 2 + dlls/windows.media.devices/classes.idl | 24 +++++ dlls/windows.media.devices/main.c | 149 ++++++++++++++++++++++++++- dlls/windows.media.devices/tests/Makefile.in | 5 + dlls/windows.media.devices/tests/devices.c | 123 ++++++++++++++++++++++ include/Makefile.in | 1 + include/windows.media.devices.idl | 126 ++++++++++++++++++++++ 9 files changed, 431 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=089b9d9029131b1fa3a3…

1 0

Andrew Eikum : windows.media.devices: Stub DLL.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 4e86287a2e9a4cf252cdbf982e1926373d4d11fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e86287a2e9a4cf252cdbf98… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 10:50:52 2021 -0500 windows.media.devices: Stub DLL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/windows.media.devices/Makefile.in | 7 + dlls/windows.media.devices/main.c | 158 +++++++++++++++++++++ .../windows.media.devices.spec | 3 + 5 files changed, 171 insertions(+) diff --git a/configure b/configure index 9add96280dd..a9e1efc38fe 100755 --- a/configure +++ b/configure @@ -1664,6 +1664,7 @@ enable_wiaservc enable_wimgapi enable_windows_gaming_input enable_windows_globalization +enable_windows_media_devices enable_windows_media_speech enable_windowscodecs enable_windowscodecsext @@ -21128,6 +21129,7 @@ wine_fn_config_makefile dlls/windows.gaming.input enable_windows_gaming_input wine_fn_config_makefile dlls/windows.gaming.input/tests enable_tests wine_fn_config_makefile dlls/windows.globalization enable_windows_globalization wine_fn_config_makefile dlls/windows.globalization/tests enable_tests +wine_fn_config_makefile dlls/windows.media.devices enable_windows_media_devices wine_fn_config_makefile dlls/windows.media.speech enable_windows_media_speech wine_fn_config_makefile dlls/windows.media.speech/tests enable_tests wine_fn_config_makefile dlls/windowscodecs enable_windowscodecs diff --git a/configure.ac b/configure.ac index 5c364bef0d9..408612324b8 100644 --- a/configure.ac +++ b/configure.ac @@ -3801,6 +3801,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) WINE_CONFIG_MAKEFILE(dlls/windows.globalization/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in new file mode 100644 index 00000000000..b5a3482277c --- /dev/null +++ b/dlls/windows.media.devices/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.media.devices.dll +IMPORTS = combase + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c new file mode 100644 index 00000000000..8e83c4e4061 --- /dev/null +++ b/dlls/windows.media.devices/main.c @@ -0,0 +1,158 @@ +/* + * Copyright 2021 Andrew Eikum for CodeWeavers + * Copyright 2021 Rémi Bernon 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "initguid.h" +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "activation.h" + +#include "windows.foundation.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_media_devices +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_media_devices *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_devices, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_media_devices_AddRef( + IActivationFactory *iface) +{ + struct windows_media_devices *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_media_devices_Release( + IActivationFactory *iface) +{ + struct windows_media_devices *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_media_devices_QueryInterface, + windows_media_devices_AddRef, + windows_media_devices_Release, + /* IInspectable methods */ + windows_media_devices_GetIids, + windows_media_devices_GetRuntimeClassName, + windows_media_devices_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_devices_ActivateInstance, +}; + +static struct windows_media_devices windows_media_devices = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_media_devices.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.media.devices/windows.media.devices.spec b/dlls/windows.media.devices/windows.media.devices.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.media.devices/windows.media.devices.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Arkadiusz Hiler : setupapi: Demote ERR on opening driver key to a TRACE.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 268fb3d1d603b1bc3d479984735099d3178ea4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=268fb3d1d603b1bc3d479984… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 13 18:31:12 2021 +0300 setupapi: Demote ERR on opening driver key to a TRACE. open_driver_key() is called by create_driver_key() and SetupDiOpenDevRegKey() which depend on the failure path to detect the presence of the key. This causes a lot of unnecessary errors being printed out. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0758fef5603..dd1ddaa9d33 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -560,7 +560,7 @@ static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key) RegCloseKey(class_key); return l; } - ERR("Failed to open driver key, error %u.\n", l); + TRACE("Failed to open driver key, error %u.\n", l); } RegCloseKey(class_key);

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021