April 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Make sure that the virtual heap doesn't overlap the preloader range.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 2e0a96a483bdb2e7609993ac8c55378dbec4dcec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e0a96a483bdb2e7609993ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 17:19:26 2021 +0200 ntdll: Make sure that the virtual heap doesn't overlap the preloader range. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50963 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b0ff26ade53..8521dc11258 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2575,11 +2575,23 @@ struct alloc_virtual_heap static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) { struct alloc_virtual_heap *alloc = arg; + void *end = (char *)base + size; if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; - if (size < alloc->size) return 0; if (is_win64 && base < (void *)0x80000000) return 0; - alloc->base = anon_mmap_fixed( (char *)base + size - alloc->size, alloc->size, PROT_READ|PROT_WRITE, 0 ); + if (preload_reserve_end >= end) + { + if (preload_reserve_start <= base) return 0; /* no space in that area */ + if (preload_reserve_start < end) end = preload_reserve_start; + } + else if (preload_reserve_end > base) + { + if (preload_reserve_start <= base) base = preload_reserve_end; + else if ((char *)end - (char *)preload_reserve_end >= alloc->size) base = preload_reserve_end; + else end = preload_reserve_start; + } + if ((char *)end - (char *)base < alloc->size) return 0; + alloc->base = anon_mmap_fixed( (char *)end - alloc->size, alloc->size, PROT_READ|PROT_WRITE, 0 ); return (alloc->base != MAP_FAILED); }

1 0

Alistair Leslie-Hughes : xactengine: Use nameless unions.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 1cdd046daea75c8ec271a838831fdfc8af380e91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cdd046daea75c8ec271a838… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 22 15:25:44 2021 +1000 xactengine: Use nameless unions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 2 +- include/xact3wb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 63eec707363..9b8f480829e 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -434,7 +434,7 @@ typedef struct XACT_NOTIFICATION XACT_NOTIFICATION_VARIABLE variable; XACT_NOTIFICATION_GUI gui; XACT_NOTIFICATION_WAVE wave; - } DUMMYUNIONNAME; + }; } XACT_NOTIFICATION, *LPXACT_NOTIFICATION; typedef const XACT_NOTIFICATION *LPCXACT_NOTIFICATION; diff --git a/include/xact3wb.h b/include/xact3wb.h index 6d157a466f9..834b3e1ef54 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -121,7 +121,7 @@ typedef struct WAVEBANKENTRY DWORD Duration : 28; } DUMMYSTRUCTNAME; DWORD dwFlagsAndDuration; - } DUMMYUNIONNAME; + }; WAVEBANKMINIWAVEFORMAT Format; WAVEBANKREGION PlayRegion;

1 0

Connor McAdams : include: Don't pack XACT_RUNTIME_PARAMETERS structure.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: a1069854cfb2de481c6be2eef16952dd48ac56e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1069854cfb2de481c6be2ee… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 22 16:10:10 2021 -0400 include: Don't pack XACT_RUNTIME_PARAMETERS structure. Move the XACT_RUNTIME_PARAMETERS structure definition outside of the packing directive that the other structures are placed within. It isn't packed in Windows, and was included with the others by mistake. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 9b8f480829e..a1df1a51330 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -354,23 +354,6 @@ typedef struct XACT_NOTIFICATION_CUE } XACT_NOTIFICATION_CUE, *LPXACT_NOTIFICATION_CUE; typedef const XACT_NOTIFICATION_CUE *LPCXACT_NOTIFICATION_CUE; -typedef struct XACT_WAVE_PROPERTIES -{ - char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; - WAVEBANKMINIWAVEFORMAT format; - DWORD durationInSamples; - WAVEBANKSAMPLEREGION loopRegion; - BOOL streaming; -} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES; -typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES; - -typedef struct XACT_WAVE_INSTANCE_PROPERTIES -{ - XACT_WAVE_PROPERTIES properties; - BOOL backgroundMusic; -} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES; -typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES; - typedef struct XACT_NOTIFICATION_MARKER { XACTINDEX cueIndex; @@ -442,6 +425,25 @@ typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( const XACT_NOTIFICATION *pNotification ); +#include <poppack.h> + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES; +typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES; + +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES properties; + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES; +typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES; + typedef struct XACT_RUNTIME_PARAMETERS { DWORD lookAheadTime; @@ -457,8 +459,6 @@ typedef struct XACT_RUNTIME_PARAMETERS } XACT_RUNTIME_PARAMETERS, *LPXACT_RUNTIME_PARAMETERS; typedef const XACT_RUNTIME_PARAMETERS *LPCXACT_RUNTIME_PARAMETERS; -#include <poppack.h> - #define XACT_FLAG_CUE_STOP_RELEASE XACT_FLAG_STOP_RELEASE #define XACT_FLAG_CUE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 9eed661621330e4c4fee5de98f05a301f9b0a1fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eed661621330e4c4fee5de9… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 23 11:01:50 2021 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/po/de.po b/po/de.po index 43238a82890..bbe265cb7d0 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-03-29 11:49+0200\n" +"PO-Revision-Date: 2021-04-23 10:59+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3968,7 +3968,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Eigenschaft '|' kann nicht definiert werden: Objekt nicht erweiterbar" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14574,10 +14574,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Der Vorgang wurde erfolgreich abgeschlossen\n" +msgstr "reg: Der Vorgang wurde erfolgreich abgeschlossen\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14592,12 +14590,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg: Das System konnte den angegebenen Schlüssel oder Wert nicht finden\n" +msgstr "reg: Der angegebene Wert wurde nicht gefunden\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14620,10 +14614,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "Der Wert '%1' existiert bereits. Möchten Sie ihn ersetzen?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Der Registrierungsvorgang wurde abgebrochen\n" +msgstr "reg: Der Registrierungsvorgang wurde abgebrochen\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14776,28 +14768,20 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Ungültiger Systemschlüssel [%1]\n" +msgstr "reg: Ungültiger Systemschlüssel\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Die Datei '%1' existiert bereits. Möchten Sie sie ersetzen?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg: Das System konnte den angegebenen Schlüssel oder Wert nicht finden\n" +msgstr "reg: Der angegebene Schlüssel wurde nicht gefunden\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "reg: Der Schlüssel '%1' konnte nicht importiert werden\n" #: programs/reg/reg.rc:179 msgid "" @@ -14808,6 +14792,12 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Registrierungszugriff unter Verwendung der 32-Bit-Ansicht.\n" +"\n" +" /reg:64\n" +" Registrierungszugriff unter Verwendung der 64-Bit-Ansicht.\n" +"\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Rémi Bernon : winebus.sys: Create stub Wine HID keyboard device.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 709c801fb1f5b8a7679bbd655cd76757f42e7b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=709c801fb1f5b8a7679bbd65… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 21:26:49 2021 +0200 winebus.sys: Create stub Wine HID keyboard device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winehid.sys/winehid.inf | 1 + 2 files changed, 71 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index acd166758e7..99f834d2f40 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -97,6 +97,7 @@ static const struct product_desc XBOX_CONTROLLERS[] = { static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; +static DEVICE_OBJECT *keyboard_obj; /* The root-enumerated device stack. */ DEVICE_OBJECT *bus_pdo; @@ -540,6 +541,74 @@ static void mouse_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) +{ + TRACE("buffer %p, length %u.\n", buffer, length); + + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + return STATUS_BUFFER_TOO_SMALL; + + memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); + memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; + buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_KEYBOARD; + + return STATUS_SUCCESS; +} + +static NTSTATUS keyboard_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) +{ + static const WCHAR nameW[] = {'W','i','n','e',' ','H','I','D',' ','k','e','y','b','o','a','r','d',0}; + if (index != HID_STRING_ID_IPRODUCT) + return STATUS_NOT_IMPLEMENTED; + if (length < ARRAY_SIZE(nameW)) + return STATUS_BUFFER_TOO_SMALL; + strcpyW(buffer, nameW); + return STATUS_SUCCESS; +} + +static NTSTATUS keyboard_begin_report_processing(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS keyboard_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS keyboard_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS keyboard_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static const platform_vtbl keyboard_vtbl = +{ + .get_reportdescriptor = keyboard_get_reportdescriptor, + .get_string = keyboard_get_string, + .begin_report_processing = keyboard_begin_report_processing, + .set_output_report = keyboard_set_output_report, + .get_feature_report = keyboard_get_feature_report, + .set_feature_report = keyboard_set_feature_report, +}; + +static void keyboard_device_create(void) +{ + static const WCHAR busidW[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; + + keyboard_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &keyboard_vtbl, 0); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); +} + static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; @@ -554,6 +623,7 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) break; case IRP_MN_START_DEVICE: mouse_device_create(); + keyboard_device_create(); if (check_bus_option(&SDL_enabled, 1)) { diff --git a/dlls/winehid.sys/winehid.inf b/dlls/winehid.sys/winehid.inf index 566448e4a51..f9ed4091217 100644 --- a/dlls/winehid.sys/winehid.inf +++ b/dlls/winehid.sys/winehid.inf @@ -12,6 +12,7 @@ Wine IOHID device=device_section,IOHID Wine libevent device=device_section,LNXEV Wine SDL HID device=device_section,SDLJOY Wine mouse device=device_section,WINEMOUSE +Wine keyboard device=device_section,WINEKEYBOARD [device_section.Services] AddService = winehid,0x2,svc_section

1 0

Rémi Bernon : include: Add GUID_DEVINTERFACE_KEYBOARD to ntddkbd.h.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: bcc24d69da8bc2537b2fc310d2e22b11378b64df URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc24d69da8bc2537b2fc310… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 21:26:50 2021 +0200 include: Add GUID_DEVINTERFACE_KEYBOARD to ntddkbd.h. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ntddkbd.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 8e40b90a3da..0d9db037ca7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -529,6 +529,7 @@ SOURCES = \ nserror.h \ nspapi.h \ ntddcdrm.h \ + ntddkbd.h \ ntddmou.h \ ntddndis.h \ ntddscsi.h \ diff --git a/include/ntddkbd.h b/include/ntddkbd.h new file mode 100644 index 00000000000..fab28a024c9 --- /dev/null +++ b/include/ntddkbd.h @@ -0,0 +1,24 @@ +/* + * 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 + */ + +#ifndef _NTDDKBD_ +#define _NTDDKBD_ + +DEFINE_GUID(GUID_DEVINTERFACE_KEYBOARD,0x884b96c3,0x56ef,0x11d1,0xbc,0x8c,0x00,0xa0,0xc9,0x14,0x05,0xdd); + +#endif

1 0

Rémi Bernon : hidclass.sys: Register GUID_DEVINTERFACE_KEYBOARD interface.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 8e4d668e345928b003e7fd829a752dd2fbb39edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e4d668e345928b003e7fd82… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 21:26:51 2021 +0200 hidclass.sys: Register GUID_DEVINTERFACE_KEYBOARD interface. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 1 + dlls/hidclass.sys/hid.h | 2 ++ dlls/hidclass.sys/pnp.c | 11 +++++++++++ 3 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 35cc40c01ea..a7825080deb 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -32,6 +32,7 @@ #include "ddk/wdm.h" #include "devguid.h" #include "ntddmou.h" +#include "ntddkbd.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); WINE_DECLARE_DEBUG_CHANNEL(hid_report); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 9e829332bdc..5a502840691 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -69,6 +69,8 @@ typedef struct _BASE_DEVICE_EXTENSION BOOL is_mouse; UNICODE_STRING mouse_link_name; + BOOL is_keyboard; + UNICODE_STRING keyboard_link_name; } pdo; } u; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index de6f409a16b..3d81c16356e 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include "hid.h" #include "ntddmou.h" +#include "ntddkbd.h" #include "ddk/hidtypes.h" #include "ddk/wdm.h" #include "regstr.h" @@ -399,10 +400,18 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) if (!IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_MOUSE, NULL, &ext->u.pdo.mouse_link_name)) ext->u.pdo.is_mouse = TRUE; } + if (ext->u.pdo.preparsed_data->caps.UsagePage == HID_USAGE_PAGE_GENERIC + && ext->u.pdo.preparsed_data->caps.Usage == HID_USAGE_GENERIC_KEYBOARD) + { + if (!IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_KEYBOARD, NULL, &ext->u.pdo.keyboard_link_name)) + ext->u.pdo.is_keyboard = TRUE; + } IoSetDeviceInterfaceState(&ext->u.pdo.link_name, TRUE); if (ext->u.pdo.is_mouse) IoSetDeviceInterfaceState(&ext->u.pdo.mouse_link_name, TRUE); + if (ext->u.pdo.is_keyboard) + IoSetDeviceInterfaceState(&ext->u.pdo.keyboard_link_name, TRUE); status = STATUS_SUCCESS; break; @@ -413,6 +422,8 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) IoSetDeviceInterfaceState(&ext->u.pdo.link_name, FALSE); if (ext->u.pdo.is_mouse) IoSetDeviceInterfaceState(&ext->u.pdo.mouse_link_name, FALSE); + if (ext->u.pdo.is_keyboard) + IoSetDeviceInterfaceState(&ext->u.pdo.keyboard_link_name, TRUE); if (ext->u.pdo.thread) {

1 0

Rémi Bernon : user32: Enumerate keyboard rawinput devices.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 91066bd5e08cd4e51a5ae219379782e5e289e289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91066bd5e08cd4e51a5ae219… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 21:26:52 2021 +0200 user32: Enumerate keyboard rawinput devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 7796a65641e..129c1933c36 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -39,6 +39,7 @@ #include "initguid.h" #include "ntddmou.h" +#include "ntddkbd.h" WINE_DEFAULT_DEBUG_CHANNEL(rawinput); @@ -211,6 +212,21 @@ static void find_devices(void) SetupDiDestroyDeviceInfoList(set); + set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_KEYBOARD, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_KEYBOARD, idx, &iface); ++idx) + { + static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; + + if (!(device = add_device(set, &iface))) + continue; + + device->info.dwType = RIM_TYPEKEYBOARD; + device->info.u.keyboard = keyboard_info; + } + + SetupDiDestroyDeviceInfoList(set); + LeaveCriticalSection(&rawinput_devices_cs); }

1 0

Dmitry Timoshkov : msxml3: Don't unlink the XML declaration when saving document.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: b896230547bc4c6103797336aad3a6cd83aa0e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b896230547bc4c6103797336… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 16 13:55:46 2021 +0300 msxml3: Don't unlink the XML declaration when saving document. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 11 ++-------- dlls/msxml3/tests/domdoc.c | 53 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 80c32e9ba99..cf4f0433218 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2534,7 +2534,6 @@ static HRESULT WINAPI domdoc_save( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); xmlSaveCtxtPtr ctx = NULL; - xmlNodePtr xmldecl; HRESULT ret = S_OK; TRACE("(%p)->(%s)\n", This, debugstr_variant(&destination)); @@ -2567,9 +2566,8 @@ static HRESULT WINAPI domdoc_save( ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); if(ret == S_OK) { - int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; ctx = xmlSaveToIO(domdoc_stream_save_writecallback, - domdoc_stream_save_closecallback, stream, NULL, options); + domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); if(!ctx) { @@ -2583,8 +2581,6 @@ static HRESULT WINAPI domdoc_save( case VT_BSTR: case VT_BSTR | VT_BYREF: { - int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; - /* save with file path */ HANDLE handle = CreateFileW( (V_VT(&destination) & VT_BYREF)? *V_BSTRREF(&destination) : V_BSTR(&destination), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -2594,9 +2590,8 @@ static HRESULT WINAPI domdoc_save( return E_FAIL; } - /* disable top XML declaration */ ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, options); + handle, NULL, XML_SAVE_NO_DECL); if (!ctx) { CloseHandle(handle); @@ -2610,9 +2605,7 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } - xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; - xmldoc_link_xmldecl(get_doc(This), xmldecl); /* will release resources through close callback */ xmlSaveClose(ctx); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5bc2fe1d5c3..6f8e2b44ed3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8524,6 +8524,9 @@ static void test_createProcessingInstruction(void) { static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; static const char xml2[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\r\n<test/>\r\n"; + static const char xml2_wine[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n<test/>\n"; + static const char xml3[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\r\n<test/>\r\n"; + static const char xml3_wine[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; IXMLDOMNode *node; @@ -8533,6 +8536,8 @@ static void test_createProcessingInstruction(void) VARIANT var; HRESULT hr; IStream *stream; + LARGE_INTEGER off; + VARIANT_BOOL b; HGLOBAL global; char *p; @@ -8582,11 +8587,55 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); p[GlobalSize(global)] = 0; -todo_wine - ok(!strcmp(p, xml2), "got %s\n", wine_dbgstr_a(p)); + ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + + /* Verify the result after load+save */ + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_load(doc, var, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + p = GlobalLock(global); + p[GlobalSize(global)] = 0; + ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); + IStream_Release(stream); + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\" standalone=\"yes\"?>\r\n<test/>\r\n"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + + p = GlobalLock(global); + p[GlobalSize(global)] = 0; + ok(!strcmp(p, xml3) || !strcmp(p, xml3_wine), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + + IStream_Release(stream); IXMLDOMDocument_Release(doc); }

1 0

Andrey Gusev : iphlpapi: Fix misplaced parentheses.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 771abe5a0362b4f79a3cffc1726d05380773f447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=771abe5a0362b4f79a3cffc1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 23 16:26:42 2021 +0300 iphlpapi: Fix misplaced parentheses. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a15a0abad22..3cf0e811437 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2620,10 +2620,10 @@ static int compare_tcp6_basic_rows(const void *a, const void *b) const MIB_TCP6ROW *rowB = b; int ret; - if ((ret = memcmp(&rowA->LocalAddr, &rowB->LocalAddr, sizeof(rowA->LocalAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->LocalAddr, &rowB->LocalAddr, sizeof(rowA->LocalAddr))) != 0) return ret; if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; if ((ret = rowA->dwLocalPort - rowB->dwLocalPort) != 0) return ret; - if ((ret = memcmp(&rowA->RemoteAddr, &rowB->RemoteAddr, sizeof(rowA->RemoteAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->RemoteAddr, &rowB->RemoteAddr, sizeof(rowA->RemoteAddr))) != 0) return ret; if ((ret = rowA->dwRemoteScopeId - rowB->dwRemoteScopeId) != 0) return ret; return rowA->dwRemotePort - rowB->dwRemotePort; } @@ -2634,10 +2634,10 @@ static int compare_tcp6_owner_rows(const void *a, const void *b) const MIB_TCP6ROW_OWNER_PID *rowB = b; int ret; - if ((ret = memcmp(&rowA->ucLocalAddr, &rowB->ucLocalAddr, sizeof(rowA->ucLocalAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->ucLocalAddr, &rowB->ucLocalAddr, sizeof(rowA->ucLocalAddr))) != 0) return ret; if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; if ((ret = rowA->dwLocalPort - rowB->dwLocalPort) != 0) return ret; - if ((ret = memcmp(&rowA->ucRemoteAddr, &rowB->ucRemoteAddr, sizeof(rowA->ucRemoteAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->ucRemoteAddr, &rowB->ucRemoteAddr, sizeof(rowA->ucRemoteAddr))) != 0) return ret; if ((ret = rowA->dwRemoteScopeId - rowB->dwRemoteScopeId) != 0) return ret; return rowA->dwRemotePort - rowB->dwRemotePort; } @@ -2679,7 +2679,7 @@ static int compare_udp6_rows(const void *a, const void *b) const MIB_UDP6ROW *rowB = b; int ret; - if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr))) != 0) return ret; if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; return rowA->dwLocalPort - rowB->dwLocalPort; }

1 0