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

Zebediah Figura : user32: Use GUID_DEVINTERFACE_HID directly.
by Alexandre Julliard June 2, 2022

June 2, 2022

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: Handle failure from HID APIs.
by Alexandre Julliard June 2, 2022

June 2, 2022

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: Populate the RID_DEVICE_INFO structure in add_device().
by Alexandre Julliard June 2, 2022

June 2, 2022

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

Andrew Eikum : d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: a64ec46e4e33aea801cfbe033e68591abdddfb14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64ec46e4e33aea801cfbe03… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:05:25 2022 -0500 d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation. The game Planetary Annihilation: TITANS depends on this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 22 ++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index fc148aca4a8..86ac7cf5109 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4925,12 +4925,24 @@ static void test_pinned_buffers(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9Ex *device; D3DCOLOR color; ULONG refcount; HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); if (!(device = create_device(window, NULL))) { @@ -4954,6 +4966,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* test device with NULL HWND */ + device = create_device(NULL, NULL); + ok(!!device, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9Ex_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9Ex_Release(device); } START_TEST(d3d9ex) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5d8fe10fc79..025cd556ee4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26202,6 +26202,7 @@ static void test_nrm_instruction(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9 *device; IDirect3D9 *d3d; D3DCOLOR color; @@ -26209,6 +26210,17 @@ static void test_desktop_window(void) HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -26236,6 +26248,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + /* test device with NULL HWND */ + device = create_device(d3d, NULL, NULL, TRUE); + ok(device != NULL, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); }

1 0

Jacek Caban : winemac: Use unixlib interface for macdrv_ime_query_char_rect.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 8bfe37c880aeb58ca0d8cf55222e7ba31813ce92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bfe37c880aeb58ca0d8cf55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 22:42:27 2022 +0200 winemac: Use unixlib interface for macdrv_ime_query_char_rect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 1 + dlls/winemac.drv/event.c | 32 ++++++++++++++++++++++++++++ dlls/winemac.drv/ime.c | 52 +++++++++++++++++++++------------------------- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/unixlib.h | 21 ++++++++++++++++++- 5 files changed, 78 insertions(+), 30 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 27eda4d2ac8..d38e7cf9164 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -29,6 +29,7 @@ HMODULE macdrv_module = 0; typedef NTSTATUS (WINAPI *kernel_callback)(void *params, ULONG size); static const kernel_callback kernel_callbacks[] = { + macdrv_ime_query_char_rect, macdrv_ime_set_text, }; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 68b66d610fe..43cd3f85bcd 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -179,6 +179,38 @@ static void macdrv_sent_text_input(const macdrv_event *event) } +/************************************************************************** + * query_ime_char_rect + */ +BOOL query_ime_char_rect(macdrv_query* query) +{ + HWND hwnd = macdrv_get_window_hwnd(query->window); + void *himc = query->ime_char_rect.data; + CFRange *range = &query->ime_char_rect.range; + CGRect *rect = &query->ime_char_rect.rect; + struct ime_query_char_rect_result result = {0}; + struct ime_query_char_rect_params params; + BOOL ret; + + TRACE_(imm)("win %p/%p himc %p range %ld-%ld\n", hwnd, query->window, himc, range->location, + range->length); + + params.hwnd = hwnd; + params.data = himc; + params.result = &result; + params.location = range->location; + params.length = range->length; + ret = macdrv_client_func(client_func_ime_query_char_rect, &params, sizeof(params)); + *range = CFRangeMake(result.location, result.length); + *rect = cgrect_from_rect(result.rect); + + TRACE_(imm)(" -> %s range %ld-%ld rect %s\n", ret ? "TRUE" : "FALSE", range->location, + range->length, wine_dbgstr_cgrect(*rect)); + + return ret; +} + + /*********************************************************************** * macdrv_query_event * diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 2cf3aefb79d..251c22d5005 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1438,43 +1438,42 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size) } /************************************************************************** - * query_ime_char_rect + * macdrv_ime_query_char_rect */ -BOOL query_ime_char_rect(macdrv_query* query) +NTSTATUS WINAPI macdrv_ime_query_char_rect(void *arg, ULONG size) { - HWND hwnd = macdrv_get_window_hwnd(query->window); - void *himc = query->ime_char_rect.data; - CFRange* range = &query->ime_char_rect.range; - CGRect* rect = &query->ime_char_rect.rect; + struct ime_query_char_rect_params *params = arg; + struct ime_query_char_rect_result *result = params->result; + void *himc = params->data; IMECHARPOSITION charpos; BOOL ret = FALSE; - TRACE("win %p/%p himc %p range %ld-%ld\n", hwnd, query->window, himc, range->location, - range->length); + result->location = params->location; + result->length = params->length; if (!himc) himc = RealIMC(FROM_MACDRV); charpos.dwSize = sizeof(charpos); - charpos.dwCharPos = range->location; + charpos.dwCharPos = params->location; if (ImmRequestMessageW(himc, IMR_QUERYCHARPOSITION, (ULONG_PTR)&charpos)) { int i; - *rect = CGRectMake(charpos.pt.x, charpos.pt.y, 0, charpos.cLineHeight); + SetRect(&result->rect, charpos.pt.x, charpos.pt.y, 0, charpos.pt.y + charpos.cLineHeight); /* iterate over rest of length to extend rect */ - for (i = 1; i < range->length; i++) + for (i = 1; i < params->length; i++) { charpos.dwSize = sizeof(charpos); - charpos.dwCharPos = range->location + i; + charpos.dwCharPos = params->location + i; if (!ImmRequestMessageW(himc, IMR_QUERYCHARPOSITION, (ULONG_PTR)&charpos) || - charpos.pt.y != rect->origin.y) + charpos.pt.y != result->rect.top) { - range->length = i; + result->length = i; break; } - rect->size.width = charpos.pt.x - rect->origin.x; + result->rect.right = charpos.pt.x; } ret = TRUE; @@ -1501,15 +1500,15 @@ BOOL query_ime_char_rect(macdrv_query* query) if (private->textfont) oldfont = SelectObject(dc, private->textfont); - if (range->location > compstr->dwCompStrLen) - range->location = compstr->dwCompStrLen; - if (range->location + range->length > compstr->dwCompStrLen) - range->length = compstr->dwCompStrLen - range->location; + if (result->location > compstr->dwCompStrLen) + result->location = compstr->dwCompStrLen; + if (result->location + result->length > compstr->dwCompStrLen) + result->length = compstr->dwCompStrLen - result->location; - GetTextExtentPoint32W(dc, str, range->location, &size); + GetTextExtentPoint32W(dc, str, result->location, &size); charpos.rcDocument.left = size.cx; charpos.rcDocument.top = 0; - GetTextExtentPoint32W(dc, str, range->location + range->length, &size); + GetTextExtentPoint32W(dc, str, result->location + result->length, &size); charpos.rcDocument.right = size.cx; charpos.rcDocument.bottom = size.cy; @@ -1518,7 +1517,7 @@ BOOL query_ime_char_rect(macdrv_query* query) LPtoDP(dc, (POINT*)&charpos.rcDocument, 2); MapWindowPoints(private->hwndDefault, 0, (POINT*)&charpos.rcDocument, 2); - *rect = cgrect_from_rect(charpos.rcDocument); + result->rect = charpos.rcDocument; ret = TRUE; if (oldfont) @@ -1540,16 +1539,13 @@ BOOL query_ime_char_rect(macdrv_query* query) if (GetGUIThreadInfo(0, &gti)) { MapWindowPoints(gti.hwndCaret, 0, (POINT*)&gti.rcCaret, 2); - *rect = cgrect_from_rect(gti.rcCaret); + result->rect = gti.rcCaret; ret = TRUE; } } - if (ret && range->length && !rect->size.width) - rect->size.width = 1; - - TRACE(" -> %s range %ld-%ld rect %s\n", ret ? "TRUE" : "FALSE", range->location, - range->length, wine_dbgstr_cgrect(*rect)); + if (ret && result->length && result->rect.left == result->rect.right) + result->rect.right++; return ret; } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index c9fcf1dbf4b..de8384d5437 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -290,7 +290,7 @@ extern NTSTATUS macdrv_init(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI macdrv_ime_set_text(void *params, ULONG size) DECLSPEC_HIDDEN; -extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECLSPEC_HIDDEN; /* unixlib interface */ diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 20447f1f3b9..dd03cd4de95 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -66,10 +66,29 @@ struct notify_icon_params /* driver client callbacks exposed with KernelCallbackTable interface */ enum macdrv_client_funcs { - client_func_ime_set_text = NtUserDriverCallbackFirst, + client_func_ime_query_char_rect = NtUserDriverCallbackFirst, + client_func_ime_set_text, client_func_last }; +/* macdrv_ime_query_char_rect result */ +struct ime_query_char_rect_result +{ + RECT rect; + UINT32 location; + UINT32 length; +}; + +/* macdrv_ime_query_char_rect params */ +struct ime_query_char_rect_params +{ + HWND hwnd; + void *data; + UINT32 location; + UINT32 length; + struct ime_query_char_rect_result *result; /* FIXME: Use NtCallbackReturn instead */ +}; + /* macdrv_ime_set_text params */ struct ime_set_text_params {

1 0

Jacek Caban : winemac: Use unixlib interface for macdrv_ime_set_text calls.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 7fa47e47c995d84d9753d5128a93e4c1ab8a75d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa47e47c995d84d9753d512… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 21:06:20 2022 +0200 winemac: Use unixlib interface for macdrv_ime_set_text calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 17 ++++++++++++++++- dlls/winemac.drv/event.c | 28 ++++++++++++++++++++++++++++ dlls/winemac.drv/ime.c | 42 ++++++++++++++---------------------------- dlls/winemac.drv/macdrv.h | 5 ++++- dlls/winemac.drv/macdrv_main.c | 8 ++++++++ dlls/winemac.drv/unixlib.h | 19 +++++++++++++++++++ 6 files changed, 89 insertions(+), 30 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 23a1e6e2218..27eda4d2ac8 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -26,9 +26,19 @@ HMODULE macdrv_module = 0; +typedef NTSTATUS (WINAPI *kernel_callback)(void *params, ULONG size); +static const kernel_callback kernel_callbacks[] = +{ + macdrv_ime_set_text, +}; + +C_ASSERT(NtUserDriverCallbackFirst + ARRAYSIZE(kernel_callbacks) == client_func_last); + + static BOOL process_attach(void) { struct init_params params; + void **callback_table; struct localized_string *str; struct localized_string strings[] = { @@ -53,7 +63,12 @@ static BOOL process_attach(void) str->len = LoadStringW(macdrv_module, str->id, (WCHAR *)&str->str, 0); params.strings = strings; - return !MACDRV_CALL(init, &params); + if (MACDRV_CALL(init, &params)) return FALSE; + + callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; + memcpy( callback_table + NtUserDriverCallbackFirst, kernel_callbacks, sizeof(kernel_callbacks) ); + + return TRUE; } BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 9e53bef981a..68b66d610fe 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -141,6 +141,34 @@ static macdrv_event_mask get_event_mask(DWORD mask) } +/*********************************************************************** + * macdrv_im_set_text + */ +static void macdrv_im_set_text(const macdrv_event *event) +{ + HWND hwnd = macdrv_get_window_hwnd(event->window); + struct ime_set_text_params *params; + CFIndex length = 0, size; + + TRACE_(imm)("win %p/%p himc %p text %s complete %u\n", hwnd, event->window, event->im_set_text.data, + debugstr_cf(event->im_set_text.text), event->im_set_text.complete); + + if (event->im_set_text.text) + length = CFStringGetLength(event->im_set_text.text); + + size = offsetof(struct ime_set_text_params, text[length]); + if (!(params = malloc(size))) return; + params->hwnd = hwnd; + params->data = event->im_set_text.data; + params->cursor_pos = event->im_set_text.cursor_pos; + params->complete = event->im_set_text.complete; + + if (length) + CFStringGetCharacters(event->im_set_text.text, CFRangeMake(0, length), params->text); + + macdrv_client_func(client_func_ime_set_text, params, size); +} + /*********************************************************************** * macdrv_sent_text_input */ diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 00d4d9f1852..2cf3aefb79d 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1395,38 +1395,25 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOpti /* Interfaces to other parts of the Mac driver */ /*********************************************************************** - * macdrv_im_set_text + * macdrv_ime_set_text */ -void macdrv_im_set_text(const macdrv_event *event) +NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size) { - HWND hwnd = macdrv_get_window_hwnd(event->window); - void *himc = event->im_set_text.data; - - TRACE("win %p/%p himc %p text %s complete %u\n", hwnd, event->window, himc, - debugstr_cf(event->im_set_text.text), event->im_set_text.complete); + struct ime_set_text_params *params = arg; + ULONG length = (size - offsetof(struct ime_set_text_params, text)) / sizeof(WCHAR); + void *himc = params->data; if (!himc) himc = RealIMC(FROM_MACDRV); - if (event->im_set_text.text) + if (length) { - CFIndex length = CFStringGetLength(event->im_set_text.text); - const UniChar *chars = CFStringGetCharactersPtr(event->im_set_text.text); - UniChar *buffer = NULL; - - if (!chars) - { - buffer = HeapAlloc(GetProcessHeap(), 0, length * sizeof(*buffer)); - CFStringGetCharacters(event->im_set_text.text, CFRangeMake(0, length), buffer); - chars = buffer; - } - if (himc) - IME_SetCompositionString(himc, SCS_SETSTR, chars, length * sizeof(*chars), - event->im_set_text.cursor_pos, !event->im_set_text.complete); + IME_SetCompositionString(himc, SCS_SETSTR, params->text, length * sizeof(WCHAR), + params->cursor_pos, !params->complete); else { INPUT input; - CFIndex i; + unsigned int i; input.type = INPUT_KEYBOARD; input.ki.wVk = 0; @@ -1435,20 +1422,19 @@ void macdrv_im_set_text(const macdrv_event *event) for (i = 0; i < length; i++) { - input.ki.wScan = chars[i]; + input.ki.wScan = params->text[i]; input.ki.dwFlags = KEYEVENTF_UNICODE; - __wine_send_input(hwnd, &input, NULL); + __wine_send_input(params->hwnd, &input, NULL); input.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; - __wine_send_input(hwnd, &input, NULL); + __wine_send_input(params->hwnd, &input, NULL); } } - - HeapFree(GetProcessHeap(), 0, buffer); } - if (event->im_set_text.complete) + if (params->complete) IME_NotifyComplete(himc); + return 0; } /************************************************************************** diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 95ed36ff7e0..c9fcf1dbf4b 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -289,13 +289,16 @@ extern NTSTATUS macdrv_init(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN; -extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_ime_set_text(void *params, ULONG size) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; /* unixlib interface */ extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; +extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, + ULONG size) DECLSPEC_HIDDEN; + /* user helpers */ static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4a183747796..bf06d96b407 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -607,6 +607,14 @@ BOOL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, } +NTSTATUS macdrv_client_func(enum macdrv_client_funcs id, const void *params, ULONG size) +{ + /* FIXME: use KeUserModeCallback instead */ + NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + return func(params, size); +} + + static NTSTATUS macdrv_ime_using_input_method(void *arg) { return macdrv_using_input_method(); diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index dc1b314c8cb..20447f1f3b9 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -62,3 +62,22 @@ struct notify_icon_params DWORD msg; struct _NOTIFYICONDATAW *data; }; + +/* driver client callbacks exposed with KernelCallbackTable interface */ +enum macdrv_client_funcs +{ + client_func_ime_set_text = NtUserDriverCallbackFirst, + client_func_last +}; + +/* macdrv_ime_set_text params */ +struct ime_set_text_params +{ + HWND hwnd; + void *data; + UINT32 cursor_pos; + UINT32 complete; + WCHAR text[1]; +}; + +C_ASSERT(client_func_last <= NtUserDriverCallbackLast + 1);

1 0

Ziqing Hui : xmllite/tests: Test depth for MoveToAttributeByName().
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: e97ef040055e5c684d0011feea807d052e6d13d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e97ef040055e5c684d0011fe… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 2 15:09:59 2022 +0800 xmllite/tests: Test depth for MoveToAttributeByName(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c1778a9764e..7b68365ac48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2570,11 +2570,13 @@ static void test_attribute_by_name(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 0); hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 1); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); @@ -2590,14 +2592,17 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); @@ -2608,18 +2613,22 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c"); IXmlReader_Release(reader);

1 0

Alexandre Julliard : kernelbase: Add a helper function to map an entire buffer to half width.
by Alexandre Julliard June 2, 2022

June 2, 2022

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 map an entire buffer to full width.
by Alexandre Julliard June 2, 2022

June 2, 2022

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 case-map an entire buffer.
by Alexandre Julliard June 2, 2022

June 2, 2022

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