June 2022 - Wine-commits - list.winehq.org

Zebediah Figura : user32: Populate the RID_DEVICE_INFO structure in add_device().
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 8962ec5a83286488da6f839ceba3c39ad1cf00b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8962ec5a83286488da6f839c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 14:17:12 2022 -0500 user32: Populate the RID_DEVICE_INFO structure in add_device(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 84 ++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index d706e19d64f..1867e213223 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -94,15 +94,21 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, DWORD type ) { + static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + PHIDP_PREPARSED_DATA preparsed_data = NULL; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; struct device *device = NULL; + RID_DEVICE_INFO info; + HIDD_ATTRIBUTES attr; + HIDP_CAPS caps; UINT32 handle; + DWORD i, size; HANDLE file; WCHAR *pos; - DWORD i, size, type; SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) @@ -138,6 +144,40 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } + memset( &info, 0, sizeof(info) ); + info.cbSize = sizeof(info); + info.dwType = type; + + switch (type) + { + case RIM_TYPEHID: + attr.Size = sizeof(HIDD_ATTRIBUTES); + if (!HidD_GetAttributes( device->file, &attr )) + WARN("Failed to get attributes.\n"); + + info.hid.dwVendorId = attr.VendorID; + info.hid.dwProductId = attr.ProductID; + info.hid.dwVersionNumber = attr.VersionNumber; + + if (!HidD_GetPreparsedData( file, &preparsed_data )) + WARN("Failed to get preparsed data.\n"); + + if (!HidP_GetCaps( preparsed_data, &caps )) + WARN("Failed to get caps.\n"); + + info.hid.usUsagePage = caps.UsagePage; + info.hid.usUsage = caps.Usage; + break; + + case RIM_TYPEMOUSE: + info.mouse = mouse_info; + break; + + case RIM_TYPEKEYBOARD: + info.keyboard = keyboard_info; + break; + } + for (i = 0; i < rawinput_devices_count && !device; ++i) if (rawinput_devices[i].handle == UlongToHandle(handle)) device = rawinput_devices + i; @@ -166,8 +206,8 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) device->detail = detail; device->file = file; device->handle = ULongToHandle(handle); - device->info.cbSize = sizeof(RID_DEVICE_INFO); - device->data = NULL; + device->info = info; + device->data = preparsed_data; return device; } @@ -176,8 +216,6 @@ void rawinput_update_device_list(void) { SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; - HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; DWORD idx; @@ -201,26 +239,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { - if (!(device = add_device(set, &iface))) + if (!(device = add_device( set, &iface, RIM_TYPEHID ))) continue; - - attr.Size = sizeof(HIDD_ATTRIBUTES); - if (!HidD_GetAttributes(device->file, &attr)) - WARN("Failed to get attributes.\n"); - - device->info.dwType = RIM_TYPEHID; - device->info.hid.dwVendorId = attr.VendorID; - device->info.hid.dwProductId = attr.ProductID; - device->info.hid.dwVersionNumber = attr.VersionNumber; - - if (!HidD_GetPreparsedData(device->file, &device->data)) - WARN("Failed to get preparsed data.\n"); - - if (!HidP_GetCaps(device->data, &caps)) - WARN("Failed to get caps.\n"); - - device->info.hid.usUsagePage = caps.UsagePage; - device->info.hid.usUsage = caps.Usage; } SetupDiDestroyDeviceInfoList(set); @@ -229,13 +249,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx) { - static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - - if (!(device = add_device(set, &iface))) + if (!(device = add_device( set, &iface, RIM_TYPEMOUSE ))) continue; - - device->info.dwType = RIM_TYPEMOUSE; - device->info.mouse = mouse_info; } SetupDiDestroyDeviceInfoList(set); @@ -244,13 +259,8 @@ void rawinput_update_device_list(void) 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))) + if (!(device = add_device( set, &iface, RIM_TYPEHID ))) continue; - - device->info.dwType = RIM_TYPEKEYBOARD; - device->info.keyboard = keyboard_info; } SetupDiDestroyDeviceInfoList(set);

1 0

Zebediah Figura : user32: Handle failure from HID APIs.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 4c4c64bf3254e103d58534e821ef7d932ba0de5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4c64bf3254e103d58534e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 14:20:47 2022 -0500 user32: Handle failure from HID APIs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 1867e213223..a103751a109 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -153,17 +153,26 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, case RIM_TYPEHID: attr.Size = sizeof(HIDD_ATTRIBUTES); if (!HidD_GetAttributes( device->file, &attr )) - WARN("Failed to get attributes.\n"); + { + ERR( "Failed to get attributes.\n" ); + goto fail; + } info.hid.dwVendorId = attr.VendorID; info.hid.dwProductId = attr.ProductID; info.hid.dwVersionNumber = attr.VersionNumber; if (!HidD_GetPreparsedData( file, &preparsed_data )) - WARN("Failed to get preparsed data.\n"); + { + ERR( "Failed to get preparsed data.\n" ); + goto fail; + } if (!HidP_GetCaps( preparsed_data, &caps )) - WARN("Failed to get caps.\n"); + { + ERR( "Failed to get caps.\n" ); + goto fail; + } info.hid.usUsagePage = caps.UsagePage; info.hid.usUsage = caps.Usage; @@ -198,9 +207,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, else { ERR("Failed to allocate memory.\n"); - CloseHandle(file); - free(detail); - return NULL; + goto fail; } device->detail = detail; @@ -210,6 +217,12 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, device->data = preparsed_data; return device; + +fail: + free( preparsed_data ); + CloseHandle( file ); + free( detail ); + return NULL; } void rawinput_update_device_list(void)

1 0

Zebediah Figura : user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: c55980a47cf17079597e11291d97611355bab244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55980a47cf17079597e1129… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 14:18:37 2022 -0500 user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a103751a109..e9ac5e9aff2 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -101,10 +101,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, SP_DEVINFO_DATA device_data = {sizeof(device_data)}; PHIDP_PREPARSED_DATA preparsed_data = NULL; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; + struct hid_preparsed_data *preparsed; struct device *device = NULL; RID_DEVICE_INFO info; HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; UINT32 handle; DWORD i, size; HANDLE file; @@ -167,15 +167,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, ERR( "Failed to get preparsed data.\n" ); goto fail; } + preparsed = (struct hid_preparsed_data *)preparsed_data; - if (!HidP_GetCaps( preparsed_data, &caps )) - { - ERR( "Failed to get caps.\n" ); - goto fail; - } - - info.hid.usUsagePage = caps.UsagePage; - info.hid.usUsage = caps.Usage; + info.hid.usUsagePage = preparsed->usage_page; + info.hid.usUsage = preparsed->usage; break; case RIM_TYPEMOUSE:

1 0

Zebediah Figura : user32: Use GUID_DEVINTERFACE_HID directly.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: a448ae89ca8974b7fc1f954b662c52aaaef87295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a448ae89ca8974b7fc1f954b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 14:20:46 2022 -0500 user32: Use GUID_DEVINTERFACE_HID directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e9ac5e9aff2..c9afc18ea53 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -38,6 +38,7 @@ #include "user_private.h" #include "initguid.h" +#include "ddk/hidclass.h" #include "devpkey.h" #include "ntddmou.h" #include "ntddkbd.h" @@ -224,14 +225,11 @@ void rawinput_update_device_list(void) { SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; - GUID hid_guid; HDEVINFO set; DWORD idx; TRACE("\n"); - HidD_GetHidGuid(&hid_guid); - EnterCriticalSection(&rawinput_devices_cs); /* destroy previous list */ @@ -243,9 +241,9 @@ void rawinput_update_device_list(void) } rawinput_devices_count = 0; - set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_HID, idx, &iface); ++idx) { if (!(device = add_device( set, &iface, RIM_TYPEHID ))) continue;

1 0

Zebediah Figura : user32: Use HID ioctls directly.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 879ef36148b489f82a3d99d2113b01eb7eb985a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=879ef36148b489f82a3d99d2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 14:37:01 2022 -0500 user32: Use HID ioctls directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/Makefile.in | 2 +- dlls/user32/rawinput.c | 53 +++++++++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 3f4115c5679..79821929390 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -3,7 +3,7 @@ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u EXTRAINCL = $(PNG_PE_CFLAGS) -DELAYIMPORTS = hid setupapi imm32 +DELAYIMPORTS = setupapi imm32 C_SRCS = \ button.c \ diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index c9afc18ea53..5f5c898be0e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -26,11 +26,11 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winioctl.h" #include "winnls.h" #include "winreg.h" #include "winuser.h" #include "setupapi.h" -#include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" #include "wine/hid.h" @@ -53,7 +53,7 @@ struct device HANDLE file; HANDLE handle; RID_DEVICE_INFO info; - PHIDP_PREPARSED_DATA data; + struct hid_preparsed_data *data; }; static struct device *rawinput_devices; @@ -100,12 +100,13 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - PHIDP_PREPARSED_DATA preparsed_data = NULL; + struct hid_preparsed_data *preparsed = NULL; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct hid_preparsed_data *preparsed; + HID_COLLECTION_INFORMATION hid_info; struct device *device = NULL; RID_DEVICE_INFO info; - HIDD_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; UINT32 handle; DWORD i, size; HANDLE file; @@ -152,23 +153,33 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, switch (type) { case RIM_TYPEHID: - attr.Size = sizeof(HIDD_ATTRIBUTES); - if (!HidD_GetAttributes( device->file, &attr )) + status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + IOCTL_HID_GET_COLLECTION_INFORMATION, + NULL, 0, &hid_info, sizeof(hid_info) ); + if (status) { - ERR( "Failed to get attributes.\n" ); + ERR( "Failed to get collection information, status %#lx.\n", status ); goto fail; } - info.hid.dwVendorId = attr.VendorID; - info.hid.dwProductId = attr.ProductID; - info.hid.dwVersionNumber = attr.VersionNumber; + info.hid.dwVendorId = hid_info.VendorID; + info.hid.dwProductId = hid_info.ProductID; + info.hid.dwVersionNumber = hid_info.VersionNumber; + + if (!(preparsed = malloc( hid_info.DescriptorSize ))) + { + ERR( "Failed to allocate memory.\n" ); + goto fail; + } - if (!HidD_GetPreparsedData( file, &preparsed_data )) + status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + IOCTL_HID_GET_COLLECTION_DESCRIPTOR, + NULL, 0, preparsed, hid_info.DescriptorSize ); + if (status) { - ERR( "Failed to get preparsed data.\n" ); + ERR( "Failed to get collection descriptor, status %#lx.\n", status ); goto fail; } - preparsed = (struct hid_preparsed_data *)preparsed_data; info.hid.usUsagePage = preparsed->usage_page; info.hid.usUsage = preparsed->usage; @@ -190,7 +201,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, if (device) { TRACE("Updating device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); - HidD_FreePreparsedData(device->data); + free(device->data); CloseHandle(device->file); free(device->detail); } @@ -210,12 +221,12 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, device->file = file; device->handle = ULongToHandle(handle); device->info = info; - device->data = preparsed_data; + device->data = preparsed; return device; fail: - free( preparsed_data ); + free( preparsed ); CloseHandle( file ); free( detail ); return NULL; @@ -235,7 +246,7 @@ void rawinput_update_device_list(void) /* destroy previous list */ for (idx = 0; idx < rawinput_devices_count; ++idx) { - HidD_FreePreparsedData(rawinput_devices[idx].data); + free(rawinput_devices[idx].data); CloseHandle(rawinput_devices[idx].file); free(rawinput_devices[idx].detail); } @@ -779,12 +790,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT break; case RIDI_PREPARSEDDATA: - if (!(preparsed = (struct hid_preparsed_data *)device->data)) len = 0; + if (!(preparsed = device->data)) len = 0; else len = preparsed->caps_size + FIELD_OFFSET(struct hid_preparsed_data, value_caps[0]) + preparsed->number_link_collection_nodes * sizeof(struct hid_collection_node); - if (device->data && len <= data_len && data) - memcpy(data, device->data, len); + if (preparsed && len <= data_len && data) + memcpy(data, preparsed, len); *data_size = len; break;

1 0

Zebediah Figura : user32: Factor out raw input device enumeration.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 0881d42e7b2080d12baa5e2fb46c66b6a339a054 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0881d42e7b2080d12baa5e2f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 12:10:02 2022 -0500 user32: Factor out raw input device enumeration. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 49 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 5f5c898be0e..90ca074f2a4 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -232,13 +232,24 @@ fail: return NULL; } -void rawinput_update_device_list(void) +static void enumerate_devices( DWORD type, const GUID *guid ) { - SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; - struct device *device; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; HDEVINFO set; DWORD idx; + set = SetupDiGetClassDevsW( guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + + for (idx = 0; SetupDiEnumDeviceInterfaces( set, NULL, &GUID_DEVINTERFACE_HID, idx, &iface); ++idx ) + add_device( set, &iface, type ); + + SetupDiDestroyDeviceInfoList( set ); +} + +void rawinput_update_device_list(void) +{ + DWORD idx; + TRACE("\n"); EnterCriticalSection(&rawinput_devices_cs); @@ -252,35 +263,9 @@ void rawinput_update_device_list(void) } rawinput_devices_count = 0; - set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - - for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_HID, idx, &iface); ++idx) - { - if (!(device = add_device( set, &iface, RIM_TYPEHID ))) - continue; - } - - SetupDiDestroyDeviceInfoList(set); - - set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_MOUSE, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - - for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx) - { - if (!(device = add_device( set, &iface, RIM_TYPEMOUSE ))) - continue; - } - - 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) - { - if (!(device = add_device( set, &iface, RIM_TYPEHID ))) - continue; - } - - SetupDiDestroyDeviceInfoList(set); + enumerate_devices( RIM_TYPEHID, &GUID_DEVINTERFACE_HID ); + enumerate_devices( RIM_TYPEMOUSE, &GUID_DEVINTERFACE_MOUSE ); + enumerate_devices( RIM_TYPEKEYBOARD, &GUID_DEVINTERFACE_KEYBOARD ); LeaveCriticalSection(&rawinput_devices_cs); }

1 0

Alexandre Julliard : kernelbase: Add a helper function to case-map an entire buffer.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 9c98e968423b91ee7b9033fbfd66f81f82254081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c98e968423b91ee7b9033fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 2 09:51:58 2022 +0200 kernelbase: Add a helper function to case-map an entire buffer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 51 +++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 5a6022addc9..0fccc29bc6f 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2000,6 +2000,16 @@ static inline WORD get_char_type( DWORD type, WCHAR ch ) } +static int casemap_string( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + int pos, ret = srclen; + + for (pos = 0; pos < dstlen && srclen; pos++, src++, srclen--) + dst[pos] = casemap( table, *src ); + return ret; +} + + static union char_weights get_char_weights( WCHAR c, UINT except ) { union char_weights ret; @@ -2205,13 +2215,12 @@ static NTSTATUS expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int static NTSTATUS fold_digits( const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) { - int i, len = *dstlen; + NTSTATUS ret = STATUS_SUCCESS; + int len = casemap_string( charmaps[CHARMAP_FOLDDIGITS], src, srclen, dst, *dstlen ); - *dstlen = srclen; - if (!len) return STATUS_SUCCESS; - if (srclen > len) return STATUS_BUFFER_TOO_SMALL; - for (i = 0; i < srclen; i++) dst[i] = casemap( charmaps[CHARMAP_FOLDDIGITS], src[i] ); - return STATUS_SUCCESS; + if (*dstlen && *dstlen < len) ret = STATUS_BUFFER_TOO_SMALL; + *dstlen = len; + return ret; } @@ -6403,18 +6412,19 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co *dst_ptr++ = *src; len--; } + len = dst_ptr - dst; goto done; } if (flags & LCMAP_TRADITIONAL_CHINESE) { - for (len = dstlen, dst_ptr = dst; srclen && len; srclen--, len--) - *dst_ptr++ = casemap( charmaps[CHARMAP_TRADITIONAL], *src++ ); + len = casemap_string( charmaps[CHARMAP_TRADITIONAL], src, srclen, dst, dstlen ); + goto done; } if (flags & LCMAP_SIMPLIFIED_CHINESE) { - for (len = dstlen, dst_ptr = dst; srclen && len; srclen--, len--) - *dst_ptr++ = casemap( charmaps[CHARMAP_SIMPLIFIED], *src++ ); + len = casemap_string( charmaps[CHARMAP_SIMPLIFIED], src, srclen, dst, dstlen ); + goto done; } if (flags & (LCMAP_FULLWIDTH | LCMAP_HALFWIDTH | LCMAP_HIRAGANA | LCMAP_KATAKANA)) @@ -6450,8 +6460,13 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co } else *dst_ptr = wch; } + if (srclen) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + len = dst_ptr - dst; if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE)) || srclen) goto done; - srclen = dst_ptr - dst; src = dst; } @@ -6460,25 +6475,21 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co { const USHORT *table = sort.casemap + (flags & LCMAP_LINGUISTIC_CASING ? sortid->casemap : 0); table = table + 2 + (flags & LCMAP_LOWERCASE ? table[1] : 0); - for (len = dstlen, dst_ptr = dst; srclen && len; src++, srclen--, len--) - *dst_ptr++ = casemap( table, *src ); + len = casemap_string( table, src, srclen, dst, dstlen ); } else { - len = min( srclen, dstlen ); - memcpy( dst, src, len * sizeof(WCHAR) ); - dst_ptr = dst + len; - srclen -= len; + len = srclen; + memcpy( dst, src, min( srclen, dstlen ) * sizeof(WCHAR) ); } done: - if (srclen) + if (dstlen && dstlen < len) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); return 0; } - - return dst_ptr - dst; + return len; }

1 0

Alexandre Julliard : kernelbase: Add a helper function to map an entire buffer to full width.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: cd44979ce1794a092a4c2b99c74d49ed88d4098d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd44979ce1794a092a4c2b99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 2 09:56:19 2022 +0200 kernelbase: Add a helper function to map an entire buffer to full width. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 6 +++ dlls/kernelbase/locale.c | 111 ++++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 53 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 125d0c1f2ca..87c12430dac 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2490,6 +2490,12 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ret2 = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, halfwidth_text, -1, NULL, 0); ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* LCMAP_FULLWIDTH | LCMAP_KATAKANA maps to full-width first */ + ret = func_ptr(LCMAP_FULLWIDTH | LCMAP_KATAKANA, halfwidth_text, -1, buf, ARRAY_SIZE(buf)); + ok(ret == lstrlenW(katakana_text) + 1, "%s ret %d, error %ld, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(katakana_text) + 1); + ok(!lstrcmpW(buf, katakana_text), "%s string compare mismatch\n", func_name); + /* test LCMAP_HALFWIDTH */ ret = func_ptr(LCMAP_HALFWIDTH, japanese_text, -1, buf, ARRAY_SIZE(buf)); ok(ret == lstrlenW(halfwidth_text) + 1, "%s ret %d, error %ld, expected value %d\n", func_name, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 0fccc29bc6f..a0e4a74658f 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3901,40 +3901,53 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH } -/* compose a full-width katakana. return consumed source characters. */ -static int map_to_fullwidth( const WCHAR *src, int srclen, WCHAR *dst ) -{ - *dst = casemap( charmaps[CHARMAP_FULLWIDTH], *src ); - if (srclen <= 1) return 1; - - switch (src[1]) - { - case 0xff9e: /* datakuten (voiced sound) */ - if ((*src >= 0xff76 && *src <= 0xff84) || (*src >= 0xff8a && *src <= 0xff8e) || *src == 0x30fd) - *dst += 1; - else if (*src == 0xff73) - *dst = 0x30f4; /* KATAKANA LETTER VU */ - else if (*src == 0xff9c) - *dst = 0x30f7; /* KATAKANA LETTER VA */ - else if (*src == 0x30f0) - *dst = 0x30f8; /* KATAKANA LETTER VI */ - else if (*src == 0x30f1) - *dst = 0x30f9; /* KATAKANA LETTER VE */ - else if (*src == 0xff66) - *dst = 0x30fa; /* KATAKANA LETTER VO */ - else - return 1; - break; - case 0xff9f: /* handakuten (semi-voiced sound) */ - if (*src >= 0xff8a && *src <= 0xff8e) - *dst += 2; - else - return 1; - break; - default: - return 1; +/* map buffer to full-width katakana */ +static int map_to_fullwidth( const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + int pos; + + for (pos = 0; srclen; pos++, src++, srclen--) + { + WCHAR wch = casemap( charmaps[CHARMAP_FULLWIDTH], *src ); + if (srclen > 1) + { + switch (src[1]) + { + case 0xff9e: /* dakuten (voiced sound) */ + if ((*src >= 0xff76 && *src <= 0xff84) || + (*src >= 0xff8a && *src <= 0xff8e) || + *src == 0x30fd) + wch++; + else if (*src == 0xff73) + wch = 0x30f4; /* KATAKANA LETTER VU */ + else if (*src == 0xff9c) + wch = 0x30f7; /* KATAKANA LETTER VA */ + else if (*src == 0x30f0) + wch = 0x30f8; /* KATAKANA LETTER VI */ + else if (*src == 0x30f1) + wch = 0x30f9; /* KATAKANA LETTER VE */ + else if (*src == 0xff66) + wch = 0x30fa; /* KATAKANA LETTER VO */ + else + break; + src++; + srclen--; + break; + case 0xff9f: /* handakuten (semi-voiced sound) */ + if (*src >= 0xff8a && *src <= 0xff8e) + { + wch += 2; + src++; + srclen--; + } + break; + default: + break; + } + } + if (pos < dstlen) dst[pos] = wch; } - return 2; + return pos; } /* map single full-width character to single or double half-width characters. */ @@ -6373,15 +6386,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co } else if (flags & LCMAP_FULLWIDTH) { - WCHAR wch; - for (len = 0; srclen; src++, srclen--, len++) - { - if (map_to_fullwidth( src, srclen, &wch ) == 2) - { - src++; - srclen--; - } - } + len = map_to_fullwidth( src, srclen, NULL, 0 ); } else if (flags & LCMAP_HALFWIDTH) { @@ -6429,20 +6434,20 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co if (flags & (LCMAP_FULLWIDTH | LCMAP_HALFWIDTH | LCMAP_HIRAGANA | LCMAP_KATAKANA)) { - for (len = dstlen, dst_ptr = dst; len && srclen; src++, srclen--, len--, dst_ptr++) + if (flags & LCMAP_FULLWIDTH) { - WCHAR wch; - if (flags & LCMAP_FULLWIDTH) + len = map_to_fullwidth( src, srclen, dst, dstlen ); + if (dstlen && dstlen < len) { - /* map half-width character to full-width one, - e.g. U+FF71 -> U+30A2, U+FF8C U+FF9F -> U+30D7. */ - if (map_to_fullwidth( src, srclen, &wch ) == 2) - { - src++; - srclen--; - } + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; } - else wch = *src; + srclen = len; + src = dst; + } + for (len = dstlen, dst_ptr = dst; len && srclen; src++, srclen--, len--, dst_ptr++) + { + WCHAR wch = *src; if (flags & LCMAP_KATAKANA) wch = casemap( charmaps[CHARMAP_KATAKANA], wch ); else if (flags & LCMAP_HIRAGANA) wch = casemap( charmaps[CHARMAP_HIRAGANA], wch );

1 0

Alexandre Julliard : kernelbase: Add a helper function to map an entire buffer to half width.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 86941c44d90fd449c9411ea8679b8ac615a49aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=86941c44d90fd449c9411ea8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 2 10:10:44 2022 +0200 kernelbase: Add a helper function to map an entire buffer to half width. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 6 +++ dlls/kernelbase/locale.c | 98 ++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 59 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 87c12430dac..4e86da2be34 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2515,6 +2515,12 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ret2 = func_ptr(LCMAP_HALFWIDTH | LCMAP_KATAKANA, japanese_text, -1, NULL, 0); ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* LCMAP_HALFWIDTH | LCMAP_HIRAGANA maps to Hiragana first */ + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_HIRAGANA, japanese_text, -1, buf, ARRAY_SIZE(buf)); + ret2 = func_ptr(LCMAP_HALFWIDTH, hiragana_text, -1, buf2, ARRAY_SIZE(buf2)); + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + ok(!lstrcmpW(buf, buf2), "%s string compare mismatch %s vs %s\n", func_name, debugstr_w(buf), debugstr_w(buf2)); + /* test buffer overflow */ SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_UPPERCASE, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index a0e4a74658f..9283c17e926 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3902,7 +3902,7 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH /* map buffer to full-width katakana */ -static int map_to_fullwidth( const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +static int map_to_fullwidth( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { int pos; @@ -3945,13 +3945,13 @@ static int map_to_fullwidth( const WCHAR *src, int srclen, WCHAR *dst, int dstle break; } } - if (pos < dstlen) dst[pos] = wch; + if (pos < dstlen) dst[pos] = table ? casemap( table, wch ) : wch; } return pos; } -/* map single full-width character to single or double half-width characters. */ -static int map_to_halfwidth( WCHAR c, WCHAR *dst, int dstlen ) +/* map full-width characters to single or double half-width characters. */ +static int map_to_halfwidth( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { static const BYTE katakana_map[] = { @@ -3967,20 +3967,30 @@ static int map_to_halfwidth( WCHAR c, WCHAR *dst, int dstlen ) 0x00, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x08, /* U+30f0- */ 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x01 /* U+30f8- */ }; - USHORT shift = c - 0x30ac; - BYTE k; + int pos; - if (shift < ARRAY_SIZE(katakana_map) && (k = katakana_map[shift])) + for (pos = 0; srclen; src++, srclen--) { - if (dstlen >= 2) + WCHAR ch = table ? casemap( table, *src ) : *src; + USHORT shift = ch - 0x30ac; + BYTE k; + + if (shift < ARRAY_SIZE(katakana_map) && (k = katakana_map[shift])) + { + if (pos < dstlen - 1) + { + dst[pos] = casemap( charmaps[CHARMAP_HALFWIDTH], ch - k ); + dst[pos + 1] = (k == 2) ? 0xff9f : 0xff9e; + } + pos += 2; + } + else { - dst[0] = casemap( charmaps[CHARMAP_HALFWIDTH], c - k ); - dst[1] = (k == 2) ? 0xff9f : 0xff9e; + if (pos < dstlen) dst[pos] = casemap( charmaps[CHARMAP_HALFWIDTH], ch ); + pos++; } - return 2; } - if (dstlen >= 1) dst[0] = casemap( charmaps[CHARMAP_HALFWIDTH], c ); - return 1; + return pos; } @@ -6386,17 +6396,12 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co } else if (flags & LCMAP_FULLWIDTH) { - len = map_to_fullwidth( src, srclen, NULL, 0 ); + len = map_to_fullwidth( NULL, src, srclen, NULL, 0 ); } else if (flags & LCMAP_HALFWIDTH) { - for (len = 0; srclen; src++, srclen--, len++) - { - WCHAR wch = *src; - /* map Hiragana to Katakana before decomposition if needed */ - if (flags & LCMAP_KATAKANA) wch = casemap( charmaps[CHARMAP_KATAKANA], wch ); - if (map_to_halfwidth( wch, NULL, 0 ) == 2) len++; - } + len = map_to_halfwidth( (flags & LCMAP_KATAKANA) ? charmaps[CHARMAP_KATAKANA] : NULL, + src, srclen, NULL, 0 ); } else len = srclen; return len; @@ -6434,47 +6439,27 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co if (flags & (LCMAP_FULLWIDTH | LCMAP_HALFWIDTH | LCMAP_HIRAGANA | LCMAP_KATAKANA)) { - if (flags & LCMAP_FULLWIDTH) - { - len = map_to_fullwidth( src, srclen, dst, dstlen ); - if (dstlen && dstlen < len) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return 0; - } - srclen = len; - src = dst; - } - for (len = dstlen, dst_ptr = dst; len && srclen; src++, srclen--, len--, dst_ptr++) - { - WCHAR wch = *src; + const USHORT *table = NULL; - if (flags & LCMAP_KATAKANA) wch = casemap( charmaps[CHARMAP_KATAKANA], wch ); - else if (flags & LCMAP_HIRAGANA) wch = casemap( charmaps[CHARMAP_HIRAGANA], wch ); + if (flags & LCMAP_KATAKANA) table = charmaps[CHARMAP_KATAKANA]; + else if (flags & LCMAP_HIRAGANA) table = charmaps[CHARMAP_HIRAGANA]; - if (flags & LCMAP_HALFWIDTH) - { - /* map full-width character to half-width one, - e.g. U+30A2 -> U+FF71, U+30D7 -> U+FF8C U+FF9F. */ - if (map_to_halfwidth(wch, dst_ptr, len) == 2) - { - len--; - dst_ptr++; - if (!len) break; - } - } - else *dst_ptr = wch; - } - if (srclen) + if (flags & LCMAP_FULLWIDTH) + len = map_to_fullwidth( table, src, srclen, dst, dstlen ); + else if (flags & LCMAP_HALFWIDTH) + len = map_to_halfwidth( table, src, srclen, dst, dstlen ); + else + len = casemap_string( table, src, srclen, dst, dstlen ); + + if (dstlen && dstlen < len) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); return 0; } - len = dst_ptr - dst; - if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE)) || srclen) goto done; - srclen = dst_ptr - dst; src = dst; + srclen = len; } + else len = 0; if (flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE)) { @@ -6482,11 +6467,6 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co table = table + 2 + (flags & LCMAP_LOWERCASE ? table[1] : 0); len = casemap_string( table, src, srclen, dst, dstlen ); } - else - { - len = srclen; - memcpy( dst, src, min( srclen, dstlen ) * sizeof(WCHAR) ); - } done: if (dstlen && dstlen < len)

1 0

Alexandre Julliard : kernelbase: Add a helper function to simplify flags checking in LCMapStringEx().
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: ef0eb994e6c7231fd305c38b50dcfb700ad01bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef0eb994e6c7231fd305c38b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 2 10:54:02 2022 +0200 kernelbase: Add a helper function to simplify flags checking in LCMapStringEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 239 +++++++++++++++++++++++------------------------ 1 file changed, 115 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef0eb994e6c7231fd305…

1 0