wine-devel April 2020

wine-devel@winehq.org

87 participants
854 discussions

[PATCH v2 1/6] wineusb.sys: New stub driver.
by Zebediah Figura 15 Apr '20

15 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Actually disable wineusb.sys when libusb is missing. configure.ac | 14 +++++++ dlls/wineusb.sys/Makefile.in | 8 ++++ dlls/wineusb.sys/wineusb.c | 61 +++++++++++++++++++++++++++++++ dlls/wineusb.sys/wineusb.sys.spec | 1 + loader/wine.inf.in | 2 + 5 files changed, 86 insertions(+) create mode 100644 dlls/wineusb.sys/Makefile.in create mode 100644 dlls/wineusb.sys/wineusb.c create mode 100644 dlls/wineusb.sys/wineusb.sys.spec diff --git a/configure.ac b/configure.ac index 862745ef62..b8d70b6fe3 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwind library (exception handling)])) +AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb library])) AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) @@ -1474,6 +1475,18 @@ fi WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], [libsane ${notice_platform}development files not found, scanners won't be supported.]) +dnl **** Check for libusb **** +if test "x$with_usb" != "xno" +then + WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb-1.0],,, + [AC_CHECK_HEADER([libusb.h], + [AC_CHECK_LIB(usb-1.0,libusb_init,[:],[USB_LIBS=""],[$USB_LIBS])], + [USB_LIBS=""])]) +fi +WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"], + [libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported.], + [enable_wineusb_sys]) + dnl **** Check for libv4l2 **** if test "x$with_v4l2" != "xno" then @@ -3781,6 +3794,7 @@ WINE_CONFIG_MAKEFILE(dlls/wineps.drv) WINE_CONFIG_MAKEFILE(dlls/wineps16.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winepulse.drv) WINE_CONFIG_MAKEFILE(dlls/wineqtdecoder) +WINE_CONFIG_MAKEFILE(dlls/wineusb.sys) WINE_CONFIG_MAKEFILE(dlls/winevulkan) WINE_CONFIG_MAKEFILE(dlls/winex11.drv) WINE_CONFIG_MAKEFILE(dlls/wing.dll16,enable_win16) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in new file mode 100644 index 0000000000..bac79f668e --- /dev/null +++ b/dlls/wineusb.sys/Makefile.in @@ -0,0 +1,8 @@ +MODULE = wineusb.sys +IMPORTS = ntoskrnl +EXTRALIBS = $(USB_LIBS) +EXTRAINCL = $(USB_CFLAGS) +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + wineusb.c diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c new file mode 100644 index 0000000000..b26f1036d8 --- /dev/null +++ b/dlls/wineusb.sys/wineusb.c @@ -0,0 +1,61 @@ +/* + * USB root device enumerator using libusb + * + * Copyright 2020 Zebediah Figura + * + * 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 <assert.h> +#include <stdarg.h> +#include <stdlib.h> +#include <libusb.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winioctl.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "ddk/usb.h" +#include "ddk/usbioctl.h" +#include "wine/asm.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wineusb); + +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + libusb_exit(NULL); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + int err; + + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + if ((err = libusb_init(NULL))) + { + ERR("Failed to initialize libusb: %s\n", libusb_strerror(err)); + return STATUS_UNSUCCESSFUL; + } + + driver->DriverUnload = driver_unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/wineusb.sys/wineusb.sys.spec b/dlls/wineusb.sys/wineusb.sys.spec new file mode 100644 index 0000000000..76421d7e35 --- /dev/null +++ b/dlls/wineusb.sys/wineusb.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d321c4c826..e1546713db 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2614,6 +2614,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,tdi.sys,- 12,,winebus.sys,- 12,,winehid.sys,- +12,,wineusb.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2665,6 +2666,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,tdi.sys 12,,winebus.sys 12,,winehid.sys +12,,wineusb.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- -- 2.26.0

1 5

[PATCH] mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx().
by Nikolay Sivov 15 Apr '20

15 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index ddbffd5441..620e144d34 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2128,7 +2128,7 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &wfex->SubFormat, &hr); + memcpy(&subtype, &wfex->SubFormat, sizeof(subtype)); if (wfex->dwChannelMask) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, wfex->dwChannelMask, &hr); @@ -2140,10 +2140,10 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA { memcpy(&subtype, &MFAudioFormat_Base, sizeof(subtype)); subtype.Data1 = format->wFormatTag; - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); mediatype_set_uint32(mediatype, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1, &hr); } + mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); if (format->nChannels) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, format->nChannels, &hr); -- 2.25.1

1 0

[PATCH] schedsvc/tests: Fix compilation with recent gcc/clang versions.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/tests/atsvcapi.c | 6 +++--- dlls/schedsvc/tests/rpcapi.c | 6 +++--- dlls/taskschd/task.c | 4 ++-- include/wine/atsvc.idl | 2 +- include/wine/schrpc.idl | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index d7d48a122c..f10c9d0723 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -31,7 +31,7 @@ #define JOB_ADD_CURRENT_DATE 0x08 #define JOB_NONINTERACTIVE 0x10 -extern handle_t rpc_handle; +extern handle_t atsvc_handle; static int test_failures, test_skipped; @@ -69,7 +69,7 @@ START_TEST(atsvcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -173,7 +173,7 @@ skip_tests_delete: skip_tests: SetUnhandledExceptionFilter(old_exception_filter); - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 9d9557fe1c..b791a047dc 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -25,7 +25,7 @@ #include "wine/test.h" -extern handle_t rpc_handle; +extern handle_t schrpc_handle; static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) { @@ -103,7 +103,7 @@ START_TEST(rpcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -537,7 +537,7 @@ todo_wine MIDL_user_free(path); } - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b75cfff8af..8d81a18b3f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V DWORD len; HRESULT hr; RPC_WSTR binding_str; - extern handle_t rpc_handle; + extern handle_t schrpc_handle; TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); @@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingW(binding_str, &schrpc_handle); RpcStringFreeW(&binding_str); if (hr != RPC_S_OK) return hr; diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index e95e6cf110..5e7121d016 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -23,7 +23,7 @@ import "ocidl.idl"; [ uuid(1ff70682-0a51-30e8-076d-740be8cee98b), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t atsvc_handle), version(1.0), pointer_default(unique) ] diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl index 4af709d8dd..944f283081 100644 --- a/include/wine/schrpc.idl +++ b/include/wine/schrpc.idl @@ -26,7 +26,7 @@ import "ocidl.idl"; [ uuid(86d35949-83c9-4044-b424-db363231fd0c), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t schrpc_handle), version(1.0), pointer_default(unique) ] -- 2.25.2

1 0

[PATCH v3 1/2] dinput: Block Acquire() until hooks are installed to prevent input being lost.
by Brendan Shanks 15 Apr '20

15 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v3: Resending, looked like a testbot hiccup caused test failures last time. dlls/dinput/dinput_main.c | 15 ++++++++++++--- dlls/dinput8/tests/device.c | 3 --- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0855cb41cd..d70e9c86f2 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1717,10 +1717,11 @@ static DWORD WINAPI hook_thread_proc(void *param) if (msg.message == WM_USER+0x10) { IDirectInputImpl *dinput; + HANDLE finished_event = (HANDLE)msg.lParam; - TRACE( "Processing hook change notification lp:%ld\n", msg.lParam ); + TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); - if (!msg.wParam && !msg.lParam) + if (!msg.wParam) { if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); @@ -1765,6 +1766,9 @@ static DWORD WINAPI hook_thread_proc(void *param) UnhookWindowsHookEx( mouse_hook ); mouse_hook = NULL; } + + if (finished_event) + SetEvent(finished_event); } TranslateMessage(&msg); DispatchMessageW(&msg); @@ -1824,6 +1828,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) static HHOOK callwndproc_hook; static ULONG foreground_cnt; IDirectInputDeviceImpl *dev = impl_from_IDirectInputDevice8W(iface); + HANDLE hook_change_finished_event; EnterCriticalSection(&dinput_hook_crit); @@ -1851,9 +1856,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) hook_thread_event = NULL; } - PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); + + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index ea5ab75109..bb82855d40 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -798,12 +798,10 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); - todo_wine ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); @@ -812,7 +810,6 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); /* Test injecting keyboard events with scancode=0. -- 2.24.1

3 4

[PATCH v2 7/7] server: Get rid of separated thread suspend_context.
by Jacek Caban 15 Apr '20

15 Apr '20

It's always the same as context now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 31 +++++++++++++------------------ server/thread.h | 3 +-- 2 files changed, 14 insertions(+), 20 deletions(-)

1 0

[PATCH v2 6/7] ntdll: Use server_select to pass context to server in send_debug_event.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 10 +++------- server/debugger.c | 26 +------------------------- server/protocol.def | 3 --- server/thread.c | 6 ------ server/thread.h | 1 - 5 files changed, 4 insertions(+), 42 deletions(-)

1 0

[PATCH v2 5/7] ntdll: Block signals in send_debug_event.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)

1 0

[PATCH v2 4/7] server: Get rid of no longer needed get_suspend_context and set_suspend_context requests.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/protocol.def | 13 ------------ server/thread.c | 49 --------------------------------------------- 2 files changed, 62 deletions(-)

1 0

[PATCH v2 3/7] ntdll: Use select request instead of get_suspend_context to transfer context back to client.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 15 --------------- dlls/ntdll/server.c | 7 +++++++ server/thread.c | 24 ++++++++++++++++++++++++ server/thread.h | 1 + 4 files changed, 32 insertions(+), 15 deletions(-)

1 0

[PATCH v2 2/7] ntdll: Use select request to pass suspend context to server.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 14 ++------------ dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 16 ++++++++++++++-- dlls/ntdll/sync.c | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-)

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
86
Older →

Jump to page:

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-devel April 2020