September 2021 - Wine-commits

Alexandre Julliard : Wine release 6.18
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: website Branch: master Commit: 1fa3e5842a2960a29f44212d30730c9652e013c4 URL: https://source.winehq.org/git/website.git/?a=commit;h=1fa3e5842a2960a29f442… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 22:32:20 2021 +0200 Wine release 6.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021092401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021092401.xml b/news/en/2021092401.xml new file mode 100644 index 00000000..21cb5633 --- /dev/null +++ b/news/en/2021092401.xml @@ -0,0 +1,18 @@ +<news> +<date>September 24, 2021</date> +<title>Wine 6.18 Released</title> +<body> + The Wine development release 6.18 is now available. + <a href="{$root}/announce/6.18">What's new</a> in this release: +<ul> + <li>Shell32 and WineBus libraries converted to PE.</li> + <li>Unicode data updated to Unicode version 14.</li> + <li>Mono engine updated to version 6.4.0, with COM improvements.</li> + <li>More work towards Dwarf 3/4 debug support.</li> + <li>HID joystick enabled by default.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 6.18.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 2660cd9fcbb23897b041c43bcac1dc2a7aa3c01f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2660cd9fcbb23897b041c43b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 22:30:05 2021 +0200 Release 6.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1016 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 576 insertions(+), 460 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2660cd9fcbb23897b041…

1 0

Tag wine-6.18 : Alexandre Julliard : Release 6.18
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: refs/tags/wine-6.18 Tag: b588381c267d2f49625d35d839b4063665c0b7f2 URL: https://source.winehq.org/git/wine.git/?a=tag;h=b588381c267d2f49625d35d839b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 22:30:05 2021 +0200 Release 6.18

1 0

Rémi Bernon : joy.cpl: Add a dedicated connected list for xinput devices.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: cf2e17e8ba383817fc2db713b01d7836fa4db508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf2e17e8ba383817fc2db713… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:10:32 2021 +0200 joy.cpl: Add a dedicated connected list for xinput devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.h | 25 ++++++++++++++----------- dlls/joy.cpl/joy.rc | 16 +++++++++------- dlls/joy.cpl/main.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- po/ar.po | 20 +++++++++++++------- po/ast.po | 18 +++++++++++------- po/bg.po | 18 +++++++++++------- po/ca.po | 20 +++++++++++++------- po/cs.po | 20 +++++++++++++------- po/da.po | 20 +++++++++++++------- po/de.po | 20 +++++++++++++------- po/el.po | 18 +++++++++++------- po/en.po | 18 +++++++++++------- po/en_US.po | 18 +++++++++++------- po/eo.po | 18 +++++++++++------- po/es.po | 20 +++++++++++++------- po/fa.po | 18 +++++++++++------- po/fi.po | 20 +++++++++++++------- po/fr.po | 20 +++++++++++++------- po/he.po | 18 +++++++++++------- po/hi.po | 18 +++++++++++------- po/hr.po | 20 +++++++++++++------- po/hu.po | 20 +++++++++++++------- po/it.po | 20 +++++++++++++------- po/ja.po | 20 +++++++++++++------- po/ko.po | 20 +++++++++++++------- po/lt.po | 20 +++++++++++++------- po/ml.po | 18 +++++++++++------- po/nb_NO.po | 20 +++++++++++++------- po/nl.po | 20 +++++++++++++------- po/or.po | 18 +++++++++++------- po/pa.po | 18 +++++++++++------- po/pl.po | 20 +++++++++++++------- po/pt_BR.po | 20 +++++++++++++------- po/pt_PT.po | 20 +++++++++++++------- po/rm.po | 18 +++++++++++------- po/ro.po | 20 +++++++++++++------- po/ru.po | 20 +++++++++++++------- po/si.po | 20 +++++++++++++------- po/sk.po | 20 +++++++++++++------- po/sl.po | 20 +++++++++++++------- po/sr_RS(a)cyrillic.po | 18 +++++++++++------- po/sr_RS(a)latin.po | 18 +++++++++++------- po/sv.po | 20 +++++++++++++------- po/ta.po | 18 +++++++++++------- po/te.po | 18 +++++++++++------- po/th.po | 18 +++++++++++------- po/tr.po | 20 +++++++++++++------- po/uk.po | 20 +++++++++++++------- po/wa.po | 18 +++++++++++------- po/wine.pot | 18 +++++++++++------- po/zh_CN.po | 20 +++++++++++++------- po/zh_TW.po | 20 +++++++++++++------- 52 files changed, 661 insertions(+), 370 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf2e17e8ba383817fc2d…

1 0

Rémi Bernon : winexinput.sys: Override the product string for internal devices.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: ffdcafb9bf02c72cb951ff679ddcfa8512d53cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffdcafb9bf02c72cb951ff67… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:10:33 2021 +0200 winexinput.sys: Override the product string for internal devices. So DirectInput registry keys can match both the gamepad and the internal device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 667ce867269..79c566e7cc8 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -323,14 +323,14 @@ struct device_strings static const struct device_strings device_strings[] = { - { .id = L"VID_045E&PID_028E&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_028F&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_02D1&IG_00", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02DD&IG_00", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02E3&IG_00", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02EA&IG_00", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02FD&IG_00", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_0719&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_02D1", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02DD", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02E3", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02EA", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02FD", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, }; static const WCHAR *find_product_string(const WCHAR *device_id) @@ -339,7 +339,7 @@ static const WCHAR *find_product_string(const WCHAR *device_id) DWORD i; for (i = 0; i < ARRAY_SIZE(device_strings); ++i) - if (!wcsicmp(device_strings[i].id, match_id)) + if (!wcsnicmp(device_strings[i].id, match_id, 17)) return device_strings[i].product; return NULL; @@ -459,7 +459,7 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); if (code == IOCTL_HID_READ_REPORT) return try_complete_pending_read(device, irp); - if (impl->is_gamepad) return gamepad_internal_ioctl(device, irp); + if (impl->is_gamepad || code == IOCTL_HID_GET_STRING) return gamepad_internal_ioctl(device, irp); IoSkipCurrentIrpStackLocation(irp); return IoCallDriver(fdo->bus_device, irp);

1 0

Rémi Bernon : xinput1_3: Introduce a new override registry mechanism to force dinput.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 4ba54cb44833cd38964718ac7e33692416ad3ab9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba54cb44833cd38964718ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:10:34 2021 +0200 xinput1_3: Introduce a new override registry mechanism to force dinput. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 2 +- dlls/xinput1_2/Makefile.in | 2 +- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_3/main.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_4/Makefile.in | 2 +- dlls/xinput9_1_0/Makefile.in | 2 +- 6 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index a07b0c7c8b6..328435a110f 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +DELAYIMPORTS = hid setupapi advapi32 C_SRCS = \ main.c diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 4a624521498..e66b6e67261 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +DELAYIMPORTS = hid setupapi advapi32 C_SRCS = \ main.c diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 7786838b5e7..15ce3a691dd 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput -DELAYIMPORTS = hid setupapi +DELAYIMPORTS = hid setupapi advapi32 C_SRCS = \ main.c diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 2881a370534..81d11e5d38f 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -394,6 +394,52 @@ failed: return FALSE; } +static void get_registry_keys(HKEY *defkey, HKEY *appkey) +{ + WCHAR buffer[MAX_PATH + 26], *name = buffer, *tmp; + DWORD len; + HKEY hkey; + + *appkey = 0; + if (RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Wine\\DirectInput\\Joysticks", defkey)) + *defkey = 0; + + if (!(len = GetModuleFileNameW(0, buffer, MAX_PATH)) || len >= MAX_PATH) + return; + + if (!RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Wine\\AppDefaults", &hkey)) + { + if ((tmp = wcsrchr(name, '/'))) name = tmp + 1; + if ((tmp = wcsrchr(name, '\\'))) name = tmp + 1; + wcscat(name, L"\\DirectInput\\Joysticks"); + if (RegOpenKeyW(hkey, name, appkey)) *appkey = 0; + RegCloseKey(hkey); + } +} + +static BOOL device_is_overriden(HANDLE device) +{ + WCHAR name[MAX_PATH], buffer[MAX_PATH]; + DWORD size = sizeof(buffer); + BOOL disable = FALSE; + HKEY defkey, appkey; + + if (!HidD_GetProductString(device, name, MAX_PATH)) return FALSE; + + get_registry_keys(&defkey, &appkey); + if (!defkey && !appkey) return FALSE; + if ((appkey && !RegQueryValueExW(appkey, name, 0, NULL, (LPBYTE)buffer, &size)) || + (defkey && !RegQueryValueExW(defkey, name, 0, NULL, (LPBYTE)buffer, &size))) + { + if ((disable = !wcscmp(buffer, L"override"))) + TRACE("Disabling gamepad '%s' based on registry key.\n", debugstr_w(name)); + } + + if (appkey) RegCloseKey(appkey); + if (defkey) RegCloseKey(defkey); + return disable; +} + static void update_controller_list(void) { char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; @@ -437,6 +483,8 @@ static void update_controller_list(void) else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); + else if (device_is_overriden(device)) + WARN("ignoring HID device, overriden for dinput\n"); else if (!controller_init(&controllers[i], preparsed, &caps, device, detail->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 5e4ab8969e2..b21a3d3ce53 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +DELAYIMPORTS = hid setupapi advapi32 C_SRCS = \ main.c diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index 6c9e9016537..f014e67dea3 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,6 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +DELAYIMPORTS = hid setupapi advapi32 C_SRCS = \ main.c

1 0

Rémi Bernon : dinput: Open the WINEXINPUT interface when the override key is set.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 6217705391ab88b0fba2bb8519ce4a211cf8256f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6217705391ab88b0fba2bb85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:10:35 2021 +0200 dinput: Open the WINEXINPUT interface when the override key is set. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 18 ++++++++++-------- dlls/dinput/joystick_hid.c | 35 ++++++++++++++++++++++++++++++++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_private.h | 4 ++-- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index d4f5b819471..6e573e8741a 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -271,23 +271,25 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) } } -BOOL device_disabled_registry(const char* name, BOOL disable) +BOOL device_disabled_registry(const char* name) { DIDEVICEINSTANCEW instance; MultiByteToWideChar( CP_ACP, 0, name, -1, instance.tszInstanceName, MAX_PATH ); - return device_instance_is_disabled( &instance, disable ); + return device_instance_is_disabled( &instance, NULL ); } -BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL disable ) +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) { static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; - static const WCHAR enabled_str[] = {'e', 'n', 'a', 'b', 'l', 'e', 'd', 0}; + static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; WCHAR buffer[MAX_PATH]; HKEY hkey, appkey, temp; + BOOL disable = FALSE; get_app_key(&hkey, &appkey); + if (override) *override = FALSE; /* Joystick settings are in the 'joysticks' subkey */ if (appkey) @@ -307,15 +309,15 @@ BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL disable ) /* Look for the "controllername"="disabled" key */ if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) { - if (!disable && !strcmpW( disabled_str, buffer )) + if (!strcmpW( disabled_str, buffer )) { TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); disable = TRUE; } - else if (disable && !strcmpW( enabled_str, buffer )) + else if (override && !strcmpW( override_str, buffer )) { - TRACE( "Enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - disable = FALSE; + TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + *override = TRUE; } } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 81fa3eefe7a..30e63c16cb8 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x47,0x67,0x50,0xc5,0xe1,0xa6 ); DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); @@ -1107,13 +1108,17 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DWORD version ) { + static const WCHAR ig_w[] = {'&','I','G','_',0}; + static const WCHAR xi_w[] = {'&','X','I','_',0}; char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {.cbSize = sizeof(iface)}; SP_DEVINFO_DATA devinfo = {.cbSize = sizeof(devinfo)}; DIDEVICEINSTANCEW instance = *filter; + WCHAR device_id[MAX_PATH], *tmp; + HDEVINFO set, xi_set; UINT32 i = 0, handle; - HDEVINFO set; + BOOL override; DWORD type; GUID hid; @@ -1124,6 +1129,7 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W set = SetupDiGetClassDevsW( &hid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); if (set == INVALID_HANDLE_VALUE) return DIERR_DEVICENOTREG; + xi_set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_WINEXINPUT, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); *device = NULL; *preparsed = NULL; @@ -1140,6 +1146,29 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W attrs, caps, &instance, version )) continue; + if (device_instance_is_disabled( &instance, &override )) + goto next; + + if (override) + { + if (!SetupDiGetDeviceInstanceIdW( set, &devinfo, device_id, MAX_PATH, NULL ) || + !(tmp = strstrW( device_id, ig_w ))) + goto next; + memcpy( tmp, xi_w, sizeof(xi_w) - sizeof(WCHAR) ); + if (!SetupDiOpenDeviceInfoW( xi_set, device_id, NULL, 0, &devinfo )) + goto next; + if (!SetupDiEnumDeviceInterfaces( xi_set, &devinfo, &GUID_DEVINTERFACE_WINEXINPUT, 0, &iface )) + goto next; + if (!SetupDiGetDeviceInterfaceDetailW( xi_set, &iface, detail, sizeof(buffer), NULL, &devinfo )) + goto next; + + CloseHandle( *device ); + HidD_FreePreparsedData( *preparsed ); + if (!hid_joystick_device_try_open( handle, detail->DevicePath, device, preparsed, + attrs, caps, &instance, version )) + continue; + } + /* enumerate device by GUID */ if (index < 0 && IsEqualGUID( &filter->guidProduct, &instance.guidProduct )) break; if (index < 0 && IsEqualGUID( &filter->guidInstance, &instance.guidInstance )) break; @@ -1147,12 +1176,14 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W /* enumerate all devices */ if (index >= 0 && !index--) break; + next: CloseHandle( *device ); HidD_FreePreparsedData( *preparsed ); *device = NULL; *preparsed = NULL; } + if (xi_set != INVALID_HANDLE_VALUE) SetupDiDestroyDeviceInfoList( xi_set ); SetupDiDestroyDeviceInfoList( set ); if (!*device || !*preparsed) return DIERR_DEVICENOTREG; @@ -1187,8 +1218,6 @@ static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTAN if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) return S_FALSE; - if (device_instance_is_disabled( instance, FALSE )) return DIERR_DEVICENOTREG; - TRACE( "found device %s, usage %04x:%04x, product %s, instance %s, name %s\n", debugstr_w(device_path), instance->wUsagePage, instance->wUsage, debugstr_guid( &instance->guidProduct ), debugstr_guid( &instance->guidInstance ), debugstr_w(instance->tszInstanceName) ); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index c439cca81c3..5b54e352c20 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -175,7 +175,7 @@ static INT find_joystick_devices(void) /* Append driver name */ strcat(joydev.name, JOYDEVDRIVER); - if (device_disabled_registry(joydev.name, FALSE)) { + if (device_disabled_registry(joydev.name)) { close(fd); continue; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8279ffbf74a..949fd1da081 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -264,7 +264,7 @@ static void find_joydevs(void) else joydev.name = joydev.device; - if (device_disabled_registry(joydev.name, FALSE)) { + if (device_disabled_registry(joydev.name)) { close(fd); HeapFree(GetProcessHeap(), 0, joydev.name); if (joydev.name != joydev.device) diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 4fe51d17067..32265edef03 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -57,8 +57,8 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; -BOOL device_disabled_registry(const char* name, BOOL disable) DECLSPEC_HIDDEN; -BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL disable ) DECLSPEC_HIDDEN; +BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface);

1 0

Rémi Bernon : joy.cpl: Add a XInput / DInput override configuration control.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: afd63fa6a75cfabac450c42a3e9ccd78596b7728 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd63fa6a75cfabac450c42a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:10:36 2021 +0200 joy.cpl: Add a XInput / DInput override configuration control. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.h | 3 +++ dlls/joy.cpl/joy.rc | 2 ++ dlls/joy.cpl/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ po/ar.po | 32 ++++++++++++++++++++++---------- po/ast.po | 33 +++++++++++++++++++++++---------- po/bg.po | 32 ++++++++++++++++++++++---------- po/ca.po | 32 ++++++++++++++++++++++---------- po/cs.po | 32 ++++++++++++++++++++++---------- po/da.po | 32 ++++++++++++++++++++++---------- po/de.po | 32 ++++++++++++++++++++++---------- po/el.po | 30 ++++++++++++++++++++---------- po/en.po | 28 ++++++++++++++++++---------- po/en_US.po | 28 ++++++++++++++++++---------- po/eo.po | 32 ++++++++++++++++++++++---------- po/es.po | 32 ++++++++++++++++++++++---------- po/fa.po | 29 +++++++++++++++++++---------- po/fi.po | 32 ++++++++++++++++++++++---------- po/fr.po | 32 ++++++++++++++++++++++---------- po/he.po | 31 +++++++++++++++++++++---------- po/hi.po | 28 ++++++++++++++++++---------- po/hr.po | 32 ++++++++++++++++++++++---------- po/hu.po | 32 ++++++++++++++++++++++---------- po/it.po | 32 ++++++++++++++++++++++---------- po/ja.po | 32 ++++++++++++++++++++++---------- po/ko.po | 32 ++++++++++++++++++++++---------- po/lt.po | 32 ++++++++++++++++++++++---------- po/ml.po | 28 ++++++++++++++++++---------- po/nb_NO.po | 32 ++++++++++++++++++++++---------- po/nl.po | 32 ++++++++++++++++++++++---------- po/or.po | 28 ++++++++++++++++++---------- po/pa.po | 28 ++++++++++++++++++---------- po/pl.po | 32 ++++++++++++++++++++++---------- po/pt_BR.po | 32 ++++++++++++++++++++++---------- po/pt_PT.po | 32 ++++++++++++++++++++++---------- po/rm.po | 29 +++++++++++++++++++---------- po/ro.po | 32 ++++++++++++++++++++++---------- po/ru.po | 32 ++++++++++++++++++++++---------- po/si.po | 32 ++++++++++++++++++++++---------- po/sk.po | 32 ++++++++++++++++++++++---------- po/sl.po | 32 ++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 31 +++++++++++++++++++++---------- po/sr_RS(a)latin.po | 32 ++++++++++++++++++++++---------- po/sv.po | 32 ++++++++++++++++++++++---------- po/ta.po | 30 ++++++++++++++++++++---------- po/te.po | 28 ++++++++++++++++++---------- po/th.po | 30 ++++++++++++++++++++---------- po/tr.po | 32 ++++++++++++++++++++++---------- po/uk.po | 32 ++++++++++++++++++++++---------- po/wa.po | 29 +++++++++++++++++++---------- po/wine.pot | 28 ++++++++++++++++++---------- po/zh_CN.po | 32 ++++++++++++++++++++++---------- po/zh_TW.po | 32 ++++++++++++++++++++++---------- 52 files changed, 1080 insertions(+), 490 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afd63fa6a75cfabac450…

1 0

Nikolay Sivov : ole32/tests: Simplify test monikers creation helper.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 23390c9a358ac6bd64d72f2e526ae52f2f9880ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=23390c9a358ac6bd64d72f2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 15:51:44 2021 +0300 ole32/tests: Simplify test monikers creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 66 +++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 272c4e4c568..6b21a2e732e 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -127,33 +127,41 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } -static HRESULT create_moniker_from_desc(const char *desc, unsigned int *eaten, +static HRESULT create_moniker_parse_desc(const char *desc, unsigned int *eaten, IMoniker **moniker) { + unsigned int comp_len = 0; + WCHAR itemnameW[3] = L"Ix"; IMoniker *left, *right; - WCHAR nameW[3]; HRESULT hr; - desc += *eaten; - switch (*desc) { case 'I': - nameW[0] = desc[0]; - nameW[1] = desc[1]; - nameW[2] = 0; - *eaten += 2; - return CreateItemMoniker(L"!", nameW, moniker); + itemnameW[1] = desc[1]; + *eaten = 2; + return CreateItemMoniker(L"!", itemnameW, moniker); case 'A': - *eaten += 2; + *eaten = 2; *moniker = create_antimoniker(desc[1] - '0'); return S_OK; case 'C': - (*eaten)++; - hr = create_moniker_from_desc(desc, eaten, &left); + *eaten = 1; + desc++; + + comp_len = 0; + hr = create_moniker_parse_desc(desc, &comp_len, &left); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = create_moniker_from_desc(desc, eaten, &right); + + *eaten += comp_len; + desc += comp_len; + + comp_len = 0; + hr = create_moniker_parse_desc(desc, &comp_len, &right); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + *eaten += comp_len; + hr = CreateGenericComposite(left, right, moniker); IMoniker_Release(left); IMoniker_Release(right); @@ -164,6 +172,12 @@ static HRESULT create_moniker_from_desc(const char *desc, unsigned int *eaten, } } +static HRESULT create_moniker_from_desc(const char *desc, IMoniker **moniker) +{ + unsigned int eaten = 0; + return create_moniker_parse_desc(desc, &eaten, moniker); +} + static SIZE_T round_global_size(SIZE_T size) { static SIZE_T global_size_alignment = -1; @@ -2642,8 +2656,7 @@ todo_wine /* Simplification has to through generic composite logic, even when resolved to non-composite, generic composite option has to be enabled. */ - eaten = 0; - hr = create_moniker_from_desc("CA1A3", &eaten, &c); + hr = create_moniker_from_desc("CA1A3", &c); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_ComposeWith(moniker, c, TRUE, &moniker2); ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr); @@ -2972,7 +2985,6 @@ static void test_generic_composite_moniker(void) IMoniker *moniker, *inverse, *moniker1, *moniker2; IEnumMoniker *enummoniker; IRunningObjectTable *rot; - unsigned int eaten, i; DWORD hash, cookie; HRESULT hr; IBindCtx *bindctx; @@ -2981,6 +2993,7 @@ static void test_generic_composite_moniker(void) IROTData *rotdata; IMarshal *marshal; IStream *stream; + unsigned int i; FILETIME ft; WCHAR *str; ULONG len; @@ -2991,16 +3004,14 @@ static void test_generic_composite_moniker(void) for (i = 0; i < ARRAY_SIZE(simplify_tests); ++i) { IMoniker *left, *right, *composite = NULL; - unsigned int moniker_type, eaten; + unsigned int moniker_type; WCHAR *name; winetest_push_context("simplify[%u]", i); - eaten = 0; - hr = create_moniker_from_desc(simplify_tests[i].left, &eaten, &left); + hr = create_moniker_from_desc(simplify_tests[i].left, &left); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - eaten = 0; - hr = create_moniker_from_desc(simplify_tests[i].right, &eaten, &right); + hr = create_moniker_from_desc(simplify_tests[i].right, &right); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = CreateGenericComposite(left, right, &composite); ok(hr == S_OK, "Failed to create a composite, hr %#x.\n", hr); @@ -3162,12 +3173,10 @@ todo_wine IMoniker_Release(moniker); /* GetTimeOfLastChange() */ - eaten = 0; - hr = create_moniker_from_desc("CI1I2", &eaten, &moniker); + hr = create_moniker_from_desc("CI1I2", &moniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - eaten = 0; - hr = create_moniker_from_desc("I1", &eaten, &moniker1); + hr = create_moniker_from_desc("I1", &moniker1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* See if non-generic composition is possible */ @@ -3224,7 +3233,6 @@ static void test_pointer_moniker(void) IStream *stream; IROTData *rotdata; LPOLESTR display_name; - unsigned int eaten; IMarshal *marshal; LARGE_INTEGER pos; CLSID clsid; @@ -3417,8 +3425,7 @@ static void test_pointer_moniker(void) even when resolved to non-composite, generic composite option has to be enabled. */ /* P + (A,A3) -> A3 */ - eaten = 0; - hr = create_moniker_from_desc("CA1A3", &eaten, &c); + hr = create_moniker_from_desc("CA1A3", &c); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_ComposeWith(moniker, c, TRUE, &moniker2); ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr); @@ -3432,8 +3439,7 @@ static void test_pointer_moniker(void) IMoniker_Release(c); /* P + (A,I) -> I */ - eaten = 0; - hr = create_moniker_from_desc("CA1I1", &eaten, &c); + hr = create_moniker_from_desc("CA1I1", &c); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_ComposeWith(moniker, c, TRUE, &moniker2); ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : ole32/tests: Add some tests for class moniker composition.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 25061d23b042b8b5048cc47949c6a42beb7f57c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25061d23b042b8b5048cc479… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 15:51:45 2021 +0300 ole32/tests: Add some tests for class moniker composition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6b21a2e732e..ae46db110b6 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1830,7 +1830,7 @@ static void test_class_moniker(void) { L"clsid:{11111111-0000-0000-2222-444444444444", 0, MK_E_SYNTAX }, { L"clsid:11111111-0000-0000-2222-444444444444}", 43 }, }; - IMoniker *moniker, *moniker2, *inverse, *reduced, *anti; + IMoniker *moniker, *moniker2, *inverse, *reduced, *anti, *c; IEnumMoniker *enummoniker; ULONG length, eaten; ULARGE_INTEGER size; @@ -2036,13 +2036,35 @@ todo_wine ok(!moniker2, "Unexpected pointer.\n"); IMoniker_Release(anti); - /* C + A2 -> A */ + /* C + A2 -> () */ anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); ok(!moniker2, "Unexpected pointer.\n"); IMoniker_Release(anti); + /* C + (A,I) -> I */ + hr = create_moniker_from_desc("CA1I1", &c); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_ComposeWith(moniker, c, TRUE, &moniker2); + ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr); + hr = IMoniker_ComposeWith(moniker, c, FALSE, &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker2, MKSYS_ITEMMONIKER); + IMoniker_Release(moniker2); + IMoniker_Release(c); + + /* C + (A2,I) -> I */ + hr = create_moniker_from_desc("CA1I1", &c); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_ComposeWith(moniker, c, TRUE, &moniker2); + ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr); + hr = IMoniker_ComposeWith(moniker, c, FALSE, &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker2, MKSYS_ITEMMONIKER); + IMoniker_Release(moniker2); + IMoniker_Release(c); + IMoniker_Release(moniker); }

1 0