May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : dinput: Prefer IDirectInputW interfaces over IDirectInputA.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: 5ef24d1281d00ae3ff274c3bd3ec8253f53c6b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ef24d1281d00ae3ff274c3b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 11:41:29 2021 +0200 dinput: Prefer IDirectInputW interfaces over IDirectInputA. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 135 ++++++++++++++++++++++----------------------- dlls/dinput/tests/dinput.c | 30 +++++++++- 2 files changed, 95 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef24d1281d00ae3ff27…

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice ansi vtable.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: f3a07c5caeb0020ccc276953bc06746afb03abbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a07c5caeb0020ccc276953… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 11:41:28 2021 +0200 dinput: Factor out IDirectInputDevice ansi vtable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 127 +++++++++++++++++++++++++------------- dlls/dinput/device.c | 11 ++-- dlls/dinput/device_private.h | 68 +------------------- dlls/dinput/joystick_linux.c | 39 +----------- dlls/dinput/joystick_linuxinput.c | 40 +----------- dlls/dinput/joystick_osx.c | 39 +----------- dlls/dinput/keyboard.c | 39 +----------- dlls/dinput/mouse.c | 39 +----------- 8 files changed, 96 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3a07c5caeb0020ccc27…

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_TRANSMIT.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: f2305aebd9c20fd1ccc9323b4c5b081a16681efd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2305aebd9c20fd1ccc9323b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 18:57:30 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_TRANSMIT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 551 +++------------------------------------------------ 1 file changed, 32 insertions(+), 519 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2305aebd9c20fd1ccc9…

1 0

Rémi Bernon : dinput: Make device creation error handling consistent.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: ad8e3727c13d19c8ce79aad1ef00c33a3fab2a2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8e3727c13d19c8ce79aad1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 11:41:26 2021 +0200 dinput: Make device creation error handling consistent. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 21 +++++++-------------- dlls/dinput/joystick_linuxinput.c | 15 ++++++++------- dlls/dinput/joystick_osx.c | 21 +++++++-------------- dlls/dinput/keyboard.c | 15 +++++++++------ dlls/dinput/mouse.c | 16 +++++++++------- 5 files changed, 40 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad8e3727c13d19c8ce79…

1 0

Zebediah Figura : ntdll: Quiet some noisy ETW FIXMEs.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: d8968b955c9d9e78f4b9fb79e4f39403b785f837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8968b955c9d9e78f4b9fb79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 16:11:37 2021 -0500 ntdll: Quiet some noisy ETW FIXMEs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 9c7708a24a5..4b590b76ce5 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -330,7 +330,7 @@ ULONG WINAPI EtwEventActivityIdControl(ULONG code, GUID *guid) */ BOOLEAN WINAPI EtwEventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG keyword ) { - FIXME("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword)); + WARN("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword)); return FALSE; } @@ -340,7 +340,7 @@ BOOLEAN WINAPI EtwEventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) { - FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + WARN("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); if (!handle) return ERROR_INVALID_PARAMETER; @@ -353,7 +353,7 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID */ ULONG WINAPI EtwEventUnregister( REGHANDLE handle ) { - FIXME("(%s) stub.\n", wine_dbgstr_longlong(handle)); + WARN("(%s) stub.\n", wine_dbgstr_longlong(handle)); return ERROR_SUCCESS; } @@ -413,7 +413,7 @@ ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, TRACE_GUID_REGISTRATION *TraceGuidReg, const WCHAR *MofImagePath, const WCHAR *MofResourceName, TRACEHANDLE *RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); @@ -438,7 +438,7 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, TRACE_GUID_REGISTRATION *TraceGuidReg, const char *MofImagePath, const char *MofResourceName, TRACEHANDLE *RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; @@ -452,7 +452,7 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) if (!RegistrationHandle) return ERROR_INVALID_PARAMETER; - FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); + WARN("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); return ERROR_SUCCESS; } @@ -461,7 +461,7 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) */ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor ) { - FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); + WARN("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); return FALSE; }

1 0

Rémi Bernon : dinput: Move IDirectInput7 WtoA wrappers to ansi.c.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: a6d3d74ff29396f86c11e38cb9b320f141bdc186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d3d74ff29396f86c11e38c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 11:41:31 2021 +0200 dinput: Move IDirectInput7 WtoA wrappers to ansi.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 122 ++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/dinput_main.c | 124 +------------------------------------------ dlls/dinput/dinput_private.h | 1 + 3 files changed, 124 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6d3d74ff29396f86c11…

1 0

Rémi Bernon : dinput: Move IDirectInput8 WtoA wrappers to ansi.c.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: bfc805194fa33dd0f4048af3e5b0f96bdc96f04c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc805194fa33dd0f4048af3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 11:41:30 2021 +0200 dinput: Move IDirectInput8 WtoA wrappers to ansi.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 251 +++++++++++++++++++++++++++++- dlls/dinput/dinput_main.c | 354 +------------------------------------------ dlls/dinput/dinput_private.h | 5 +- 3 files changed, 249 insertions(+), 361 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bfc805194fa33dd0f404…

1 0

Zebediah Figura : ntdll: Introduce IOCTL_AFD_WINE_TRANSMIT.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: 0a6892193623802894a2c5e6d10eccd9471f0b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a6892193623802894a2c5e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 18:57:29 2021 -0500 ntdll: Introduce IOCTL_AFD_WINE_TRANSMIT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 12 +++ 2 files changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a6892193623802894a2…

1 0

Francois Gouget : ntdll: Update the STATUS_NO_SUCH_DEVICE error mapping.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: b6d5f976e33dc41d6465eb6b98088eb8bf0492c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6d5f976e33dc41d6465eb6b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 28 14:28:32 2021 +0200 ntdll: Update the STATUS_NO_SUCH_DEVICE error mapping. Windows 10 >= 1909 returns ERROR_NO_SUCH_DEVICE. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/make_errors | 2 +- dlls/ntdll/tests/error.c | 2 +- include/winerror.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors index 5b7885e0427..a994808c2ef 100755 --- a/dlls/ntdll/make_errors +++ b/dlls/ntdll/make_errors @@ -246,7 +246,7 @@ my %error_map = qw( STATUS_INVALID_CID ERROR_INVALID_PARAMETER STATUS_TIMER_NOT_CANCELED ERROR_TIMER_NOT_CANCELED STATUS_INVALID_PARAMETER ERROR_INVALID_PARAMETER - STATUS_NO_SUCH_DEVICE ERROR_FILE_NOT_FOUND + STATUS_NO_SUCH_DEVICE ERROR_NO_SUCH_DEVICE STATUS_NO_SUCH_FILE ERROR_FILE_NOT_FOUND STATUS_INVALID_DEVICE_REQUEST ERROR_INVALID_FUNCTION STATUS_END_OF_FILE ERROR_HANDLE_EOF diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index c812aa779cc..8f099e6903a 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -247,7 +247,7 @@ static void run_error_tests(void) cmp(STATUS_RESOURCE_TYPE_NOT_FOUND, ERROR_RESOURCE_TYPE_NOT_FOUND); cmp(STATUS_RESOURCE_NAME_NOT_FOUND, ERROR_RESOURCE_NAME_NOT_FOUND); cmp(STATUS_RESOURCE_LANG_NOT_FOUND, ERROR_RESOURCE_LANG_NOT_FOUND); - cmp(STATUS_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND); + cmp3(STATUS_NO_SUCH_DEVICE, ERROR_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND); cmp(STATUS_NO_SUCH_FILE, ERROR_FILE_NOT_FOUND); cmp(STATUS_INVALID_DEVICE_REQUEST, ERROR_INVALID_FUNCTION); cmp2(STATUS_VOLUME_NOT_UPGRADED, ERROR_INVALID_FUNCTION); diff --git a/include/winerror.h b/include/winerror.h index 86f7aace68e..8765e177029 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -410,6 +410,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_THREAD_MODE_NOT_BACKGROUND 401 #define ERROR_PROCESS_MODE_ALREADY_BACKGROUND 402 #define ERROR_PROCESS_MODE_NOT_BACKGROUND 403 +#define ERROR_NO_SUCH_DEVICE 433 #define ERROR_PNP_QUERY_REMOVE_DEVICE_TIMEOUT 480 #define ERROR_PNP_QUERY_REMOVE_RELATED_DEVICE_TIMEOUT 481 #define ERROR_PNP_QUERY_REMOVE_UNRELATED_DEVICE_TIMEOUT 482

1 0

Nikolay Sivov : mfplat: Add some attributes for tracing.
by Alexandre Julliard May 28, 2021

May 28, 2021

Module: wine Branch: master Commit: e4e319d032d74ce5be55a31ef3add629b257ea48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e319d032d74ce5be55a31e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 28 15:43:48 2021 +0300 mfplat: Add some attributes for tracing. 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, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1fc65f54ea2..b205dd2538e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -44,6 +44,8 @@ #include "mfmediaengine.h" #include "propvarutil.h" #include "strsafe.h" +#undef INITGUID +#include "evr.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -1518,7 +1520,6 @@ const char *debugstr_attr(const GUID *guid) X(EVRConfig_AllowBatching), X(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED), X(MF_MT_VIDEO_PROFILE), - X(MF_MT_MPEG2_PROFILE), X(MF_MT_DV_AAUX_CTRL_PACK_1), X(MF_MT_ALPHA_MODE), X(MF_MT_MPEG2_TIMECODE), @@ -1564,6 +1565,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_PD_MIME_TYPE), X(MF_MT_H264_SUPPORTED_SLICE_MODES), X(MF_PD_LAST_MODIFIED_TIME), + X(VIDEO_ZOOM_RECT), X(MF_PD_PLAYBACK_ELEMENT_ID), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9), X(MF_MT_ALL_SAMPLES_INDEPENDENT), @@ -1614,6 +1616,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID), X(MF_MT_MIN_MASTERING_LUMINANCE), X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE), + X(MF_SA_REQUIRED_SAMPLE_COUNT), X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS), X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID), X(MF_EVENT_STREAM_METADATA_SYSTEMID), @@ -1638,7 +1641,6 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), X(MF_MT_VIDEO_LEVEL), - X(MF_MT_MPEG2_LEVEL), X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), X(MF_MT_AAC_PAYLOAD_TYPE),

1 0