wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

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

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 : 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 : 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

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

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

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

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

Alexandre Julliard : ntdll: Implement NtQuerySystemInformationEx(SystemSupportedProcessorArchitectures).
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 126a14ac9ade799f9cb88fb0c509b964c5d98e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=126a14ac9ade799f9cb88fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 12:14:35 2021 +0200 ntdll: Implement NtQuerySystemInformationEx(SystemSupportedProcessorArchitectures). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 38 ++++++++++++++++ 2 files changed, 152 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 56b6687467b..3a71a9f245c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2884,6 +2884,119 @@ static void test_query_data_alignment(void) #endif } +static void test_process_architecture( HANDLE process, USHORT expect_machine, USHORT expect_native ) +{ + NTSTATUS status; + ULONG i, len, buffer[8]; + + len = 0xdead; + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, sizeof(buffer), &len ); + ok( !status, "failed %x\n", status ); + ok( !(len & 3), "wrong len %x\n", len ); + len /= sizeof(DWORD); + for (i = 0; i < len - 1; i++) + { + USHORT flags = HIWORD(buffer[i]); + USHORT machine = LOWORD(buffer[i]); + + if (flags & 8) + ok( machine == expect_machine, "wrong current machine %x\n", buffer[i]); + else + ok( machine != expect_machine, "wrong machine %x\n", buffer[i]); + + /* FIXME: not quite sure what the other flags mean, + * observed on amd64 Windows: (flags & 7) == 7 for MACHINE_AMD64 and 2 for MACHINE_I386 + */ + if (flags & 4) + ok( machine == expect_native, "wrong native machine %x\n", buffer[i]); + else + ok( machine != expect_native, "wrong machine %x\n", buffer[i]); + } + ok( !buffer[i], "missing terminating null\n" ); + + len = i * sizeof(DWORD); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, len, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "failed %x\n", status ); + ok( len == (i + 1) * sizeof(DWORD), "wrong len %u\n", len ); +} + +static void test_query_architectures(void) +{ +#ifdef __i386__ + USHORT current_machine = IMAGE_FILE_MACHINE_I386; + USHORT native_machine = is_wow64 ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; +#elif defined __x86_64__ + USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; + USHORT native_machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined __arm__ + USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; + USHORT native_machine = is_wow64 ? IMAGE_FILE_MACHINE_ARM64 : IMAGE_FILE_MACHINE_ARMNT; +#elif defined __aarch64__ + USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; + USHORT native_machine = IMAGE_FILE_MACHINE_ARM64; +#else + USHORT current_machine = 0; + USHORT native_machine = 0; +#endif + PROCESS_INFORMATION pi; + STARTUPINFOA si = { sizeof(si) }; + NTSTATUS status; + HANDLE process; + ULONG len, buffer[8]; + + if (!pNtQuerySystemInformationEx) return; + + process = GetCurrentProcess(); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, sizeof(buffer), &len ); + if (status == STATUS_INVALID_INFO_CLASS) + { + win_skip( "SystemSupportedProcessorArchitectures not supported\n" ); + return; + } + ok( !status, "failed %x\n", status ); + + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_HANDLE, "failed %x\n", status ); + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, 3, + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_PARAMETER || broken(status == STATUS_INVALID_HANDLE), + "failed %x\n", status ); + process = GetCurrentProcess(); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, 3, + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_PARAMETER || broken( status == STATUS_SUCCESS), + "failed %x\n", status ); + status = pNtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, NULL, 0, + &buffer, sizeof(buffer), &len ); + ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + + test_process_architecture( GetCurrentProcess(), current_machine, native_machine ); + test_process_architecture( 0, 0, native_machine ); + + if (CreateProcessA( "C:\\Program Files\\Internet Explorer\\iexplore.exe", NULL, NULL, NULL, + FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) + { + test_process_architecture( pi.hProcess, native_machine, native_machine ); + TerminateProcess( pi.hProcess, 0 ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + if (CreateProcessA( "C:\\Program Files (x86)\\Internet Explorer\\iexplore.exe", NULL, NULL, NULL, + FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi )) + { + test_process_architecture( pi.hProcess, IMAGE_FILE_MACHINE_I386, native_machine ); + TerminateProcess( pi.hProcess, 0 ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } +} + static void test_thread_lookup(void) { OBJECT_BASIC_INFORMATION obj_info; @@ -3145,6 +3258,7 @@ START_TEST(info) test_query_cpusetinfo(); test_query_firmware(); test_query_data_alignment(); + test_query_architectures(); /* NtPowerInformation */ test_query_battery(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index d3e380b8c32..491cdb37b8f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2926,6 +2926,44 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, return ret; break; } + + case SystemSupportedProcessorArchitectures: + { + HANDLE process; + ULONG i; + USHORT machine = 0; + + if (!query || query_len < sizeof(HANDLE)) return STATUS_INVALID_PARAMETER; + process = *(HANDLE *)query; + if (process) + { + SERVER_START_REQ( get_process_info ) + { + req->handle = wine_server_obj_handle( process ); + if (!(ret = wine_server_call( req ))) machine = reply->machine; + } + SERVER_END_REQ; + if (ret) return ret; + } + + len = (supported_machines_count + 1) * sizeof(ULONG); + if (size < len) + { + ret = STATUS_BUFFER_TOO_SMALL; + break; + } + for (i = 0; i < supported_machines_count; i++) + { + USHORT flags = 2; /* supported (?) */ + if (!i) flags |= 5; /* native machine (?) */ + if (supported_machines[i] == machine) flags |= 8; /* current machine */ + ((DWORD *)info)[i] = MAKELONG( supported_machines[i], flags ); + } + ((DWORD *)info)[i] = 0; + ret = STATUS_SUCCESS; + break; + } + default: FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size ); break;

1 0

Alexandre Julliard : server: Return the process machine from the main exe instead of a CPU flag.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: a51f26badfe6b3c23dd569b0540801a622e3bde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51f26badfe6b3c23dd569b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 12:14:04 2021 +0200 server: Return the process machine from the main exe instead of a CPU flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 3 ++- include/wine/server_protocol.h | 6 +++--- server/mapping.c | 1 + server/process.c | 2 +- server/process.h | 3 ++- server/protocol.def | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6112dd74c4a..6347d9d7c27 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1259,7 +1259,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class { req->handle = wine_server_obj_handle( handle ); if (!(ret = wine_server_call( req ))) - val = (reply->cpu != CPU_x86_64 && reply->cpu != CPU_ARM64); + val = (reply->machine != IMAGE_FILE_MACHINE_AMD64 && + reply->machine != IMAGE_FILE_MACHINE_ARM64); } SERVER_END_REQ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a0300dc0d31..e9fbc2cca24 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1010,9 +1010,9 @@ struct get_process_info_reply timeout_t end_time; int exit_code; int priority; - client_cpu_t cpu; + unsigned short machine; /* VARARG(image,pe_image_info); */ - char __pad_60[4]; + char __pad_58[6]; }; @@ -6219,7 +6219,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 693 +#define SERVER_PROTOCOL_VERSION 694 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 8ac3189f9a4..3c4b707f282 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -362,6 +362,7 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) else if (!(view->image.image_charact & IMAGE_FILE_DLL)) { /* main exe */ + process->machine = view->image.machine; list_add_head( &process->views, &view->entry ); if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; diff --git a/server/process.c b/server/process.c index d819f03a615..780a2076a71 100644 --- a/server/process.c +++ b/server/process.c @@ -1317,7 +1317,7 @@ DECL_HANDLER(get_process_info) reply->peb = process->peb; reply->start_time = process->start_time; reply->end_time = process->end_time; - reply->cpu = process->cpu; + reply->machine = process->machine; if (get_reply_max_size()) { client_ptr_t base; diff --git a/server/process.h b/server/process.h index 58a211f2d0c..b49b8c9b919 100644 --- a/server/process.h +++ b/server/process.h @@ -53,6 +53,7 @@ struct process process_id_t group_id; /* group id of the process */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ enum cpu_type cpu; /* client CPU type */ + unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */ int running_threads; /* number of threads running in this process */ @@ -66,7 +67,7 @@ struct process unsigned int is_terminating:1;/* is process terminating? */ data_size_t imagelen; /* length of image path in bytes */ WCHAR *image; /* main exe image full path */ - struct job *job; /* job object ascoicated with this process */ + struct job *job; /* job object associated with this process */ struct list job_entry; /* list entry for job object */ struct list asyncs; /* list of async object owned by the process */ struct list locks; /* list of file locks owned by the process */ diff --git a/server/protocol.def b/server/protocol.def index e9d7d1b0b5e..7c22faef794 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -963,7 +963,7 @@ typedef struct timeout_t end_time; /* process end time */ int exit_code; /* process exit code */ int priority; /* priority class */ - client_cpu_t cpu; /* CPU that this process is running on */ + unsigned short machine; /* process architecture */ VARARG(image,pe_image_info); /* image info for main exe */ @END diff --git a/server/request.h b/server/request.h index 063065a49c2..b8424b675c7 100644 --- a/server/request.h +++ b/server/request.h @@ -783,7 +783,7 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 56 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_debug_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index 6feacc48af1..96747333971 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1503,7 +1503,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_timeout( ", end_time=", &req->end_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); - dump_client_cpu( ", cpu=", &req->cpu ); + fprintf( stderr, ", machine=%04x", req->machine ); dump_varargs_pe_image_info( ", image=", cur_size ); }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021