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

Alexandre Julliard : kernel32/tests: Add tests for NtInitializeNlsFiles() and RtlGetLocaleFileMappingAddress().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: e195a9b0c398c12f87a5bf645fdbe94f68666ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e195a9b0c398c12f87a5bf64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:53:24 2022 +0100 kernel32/tests: Add tests for NtInitializeNlsFiles() and RtlGetLocaleFileMappingAddress(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ee9aad33312..ad644cf5a3e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -94,6 +94,8 @@ static DWORD (WINAPI *pIsValidNLSVersion)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX* static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*); static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); +static NTSTATUS (WINAPI *pNtInitializeNlsFiles)(void**,LCID*,LARGE_INTEGER*); +static NTSTATUS (WINAPI *pRtlGetLocaleFileMappingAddress)(void**,LCID*,LARGE_INTEGER*); static void (WINAPI *pRtlInitCodePageTable)(USHORT*,CPTABLEINFO*); static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD*,const char*,DWORD); static NTSTATUS (WINAPI *pRtlGetSystemPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); @@ -146,8 +148,10 @@ static void InitFunctionPointers(void) X(RtlNormalizeString); X(RtlIsNormalizedString); X(NtGetNlsSectionPtr); + X(NtInitializeNlsFiles); X(RtlInitCodePageTable); X(RtlCustomCPToUnicodeN); + X(RtlGetLocaleFileMappingAddress); X(RtlGetSystemPreferredUILanguages); X(RtlGetThreadPreferredUILanguages); X(RtlGetUserPreferredUILanguages); @@ -6804,6 +6808,55 @@ static void test_NLSVersion(void) else win_skip( "IsValidNLSVersion not available\n" ); } +static void test_locale_nls(void) +{ + NTSTATUS status; + void *addr, *addr2; + UINT *ptr; + LCID lcid; + LARGE_INTEGER size; + + if (!pNtInitializeNlsFiles || !pRtlGetLocaleFileMappingAddress) + { + win_skip( "locale.nls functions not supported\n" ); + return; + } + size.QuadPart = 0xdeadbeef; + status = pNtInitializeNlsFiles( &addr, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + trace( "locale %04lx size %I64x\n", lcid, size.QuadPart ); + ptr = addr; + ok( size.QuadPart == 0xdeadbeef || size.QuadPart == ptr[4] || size.QuadPart == ptr[4] + 8, + "wrong offset %x / %I64x\n", ptr[4], size.QuadPart ); + ptr = (UINT *)((char *)addr + ptr[4]); + ok( ptr[0] == 8, "wrong offset %u\n", ptr[0] ); + ok( ptr[3] == 0x5344534e, "wrong magic %x\n", ptr[3] ); + + status = pNtInitializeNlsFiles( &addr2, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + ok( addr != addr2, "got same address %p\n", addr ); + ok( !memcmp( addr, addr2, ptr[4] ), "contents differ\n" ); + status = NtUnmapViewOfSection( GetCurrentProcess(), addr ); + ok( !status, "NtUnmapViewOfSection failed %lx\n", status ); + status = NtUnmapViewOfSection( GetCurrentProcess(), addr2 ); + ok( !status, "NtUnmapViewOfSection failed %lx\n", status ); + + size.QuadPart = 0xdeadbeef; + status = pRtlGetLocaleFileMappingAddress( &addr, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + ptr = addr; + ok( size.QuadPart == 0xdeadbeef || size.QuadPart == ptr[4] || size.QuadPart == ptr[4] + 8, + "wrong offset %x / %I64x\n", ptr[4], size.QuadPart ); + ptr = (UINT *)((char *)addr + ptr[4]); + ok( ptr[0] == 8, "wrong offset %u\n", ptr[0] ); + ok( ptr[3] == 0x5344534e, "wrong magic %x\n", ptr[3] ); + + /* RtlGetLocaleFileMappingAddress caches the pointer */ + status = pRtlGetLocaleFileMappingAddress( &addr2, &lcid, &size ); + ok( !status, "NtInitializeNlsFiles failed %lx\n", status ); + ok( addr == addr2, "got different address %p / %p\n", addr, addr2 ); +} + static void test_geo_name(void) { WCHAR reg_name[32], buf[32], set_name[32], nation[32], region[32]; @@ -7192,6 +7245,7 @@ START_TEST(locale) test_NormalizeString(); test_SpecialCasing(); test_NLSVersion(); + test_locale_nls(); test_geo_name(); test_sorting(); test_EnumCalendarInfoA();

1 0

Rémi Bernon : dinput/tests: Add more HID device and extension pointers tests.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: c44ba8735c54de5ef759e31b3da4ecb3b763d4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44ba8735c54de5ef759e31b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 09:54:15 2022 +0100 dinput/tests: Add more HID device and extension pointers tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver.c | 50 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/driver.c b/dlls/dinput/tests/driver.c index 579d82cfeed..54a281072f9 100644 --- a/dlls/dinput/tests/driver.c +++ b/dlls/dinput/tests/driver.c @@ -406,6 +406,33 @@ struct hid_device KSPIN_LOCK lock; }; +static DRIVER_OBJECT *expect_driver; +static DEVICE_OBJECT *expect_bus_pdo; +static DEVICE_OBJECT *expect_hid_fdo; +static DEVICE_OBJECT *expect_hid_pdo; +static struct hid_device *expect_hid_ext; + +static void check_device( DEVICE_OBJECT *device ) +{ + static int checked_fdo, checked_pdo; + HID_DEVICE_EXTENSION *ext = device->DeviceExtension; + + ok( device == expect_hid_pdo || device == expect_hid_fdo, "got device %p\n", device ); + ok( device->DriverObject == expect_driver, "got DriverObject %p\n", device->DriverObject ); + if (!device->NextDevice) ok( device == expect_hid_fdo, "got device %p\n", device ); + else ok( device->NextDevice == expect_hid_fdo, "got NextDevice %p\n", device->NextDevice ); + ok( !device->AttachedDevice, "got AttachedDevice %p\n", device->AttachedDevice ); + + if (device == expect_hid_pdo && checked_pdo++) return; + if (device == expect_hid_fdo && checked_fdo++) return; + + todo_wine_if( device != expect_hid_fdo ) + ok( ext->MiniDeviceExtension == expect_hid_ext, "got MiniDeviceExtension %p\n", ext->MiniDeviceExtension ); + if (ext->MiniDeviceExtension != expect_hid_ext) return; + ok( ext->PhysicalDeviceObject == expect_bus_pdo, "got PhysicalDeviceObject %p\n", ext->PhysicalDeviceObject ); + ok( ext->NextDeviceObject == expect_bus_pdo, "got NextDeviceObject %p\n", ext->NextDeviceObject ); +} + static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -493,6 +520,9 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + ok( expect_hid_fdo == device, "got device %p\n", device ); + check_device( device ); + ok( got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n" ); irp->IoStatus.Information = 0; @@ -706,7 +736,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) return ret; } -static NTSTATUS( WINAPI *hidclass_driver_ioctl )(DEVICE_OBJECT *device, IRP *irp); +static NTSTATUS (WINAPI *hidclass_driver_ioctl)( DEVICE_OBJECT *device, IRP *irp ); static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -716,6 +746,10 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + if (!expect_hid_pdo) expect_hid_pdo = device; + else ok( expect_hid_pdo == device, "got device %p\n", device ); + check_device( device ); + switch (code) { case IOCTL_WINETEST_HID_SET_EXPECT: @@ -750,12 +784,14 @@ static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT * if (winetest_debug > 1) trace( "%s: driver %p, device %p\n", __func__, driver, device ); - /* We should be given the FDO, not the PDO. */ - ok( !!ext->PhysicalDeviceObject, "expected non-NULL pdo\n" ); - ok( ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", - ext->PhysicalDeviceObject, ext->NextDeviceObject ); + expect_hid_fdo = device; + expect_bus_pdo = ext->PhysicalDeviceObject; + expect_hid_ext = ext->MiniDeviceExtension; + todo_wine - ok( ext->NextDeviceObject->AttachedDevice == device, "wrong attached device\n" ); + ok( expect_bus_pdo->AttachedDevice == device, "got AttachedDevice %p\n", expect_bus_pdo->AttachedDevice ); + ok( driver == expect_driver, "got driver %p\n", driver ); + check_device( device ); ret = IoRegisterDeviceInterface( ext->PhysicalDeviceObject, &control_class, NULL, &control_symlink ); ok( !ret, "got %#lx\n", ret ); @@ -809,6 +845,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) HANDLE hkey; DWORD size; + expect_driver = driver; + if ((ret = winetest_init())) return ret; if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver );

1 0

Rémi Bernon : dinput/tests: Introduce a new find_hid_device_path helper.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: d470e7832cd632d88b1561b208103e950ccf83e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d470e7832cd632d88b1561b2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 09:54:14 2022 +0100 dinput/tests: Introduce a new find_hid_device_path helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hid.c | 106 ++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 58 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index b5683b18850..6203f67bb25 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -489,6 +489,42 @@ static void pnp_driver_stop(void) ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); } +static BOOL find_hid_device_path( WCHAR *device_path ) +{ + char buffer[FIELD_OFFSET( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )] = {0}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(SP_DEVICE_INTERFACE_DATA)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail = (void *)buffer; + SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; + ULONG i, len = wcslen( device_path ); + HDEVINFO set; + BOOL ret; + + set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + ok( set != INVALID_HANDLE_VALUE, "Failed to get device list, error %#lx\n", GetLastError() ); + + for (i = 0; SetupDiEnumDeviceInfo( set, i, &device ); ++i) + { + ret = SetupDiEnumDeviceInterfaces( set, &device, &GUID_DEVINTERFACE_HID, 0, &iface ); + ok( ret, "Failed to get interface, error %#lx\n", GetLastError() ); + ok( IsEqualGUID( &iface.InterfaceClassGuid, &GUID_DEVINTERFACE_HID ), "wrong class %s\n", + debugstr_guid( &iface.InterfaceClassGuid ) ); + ok( iface.Flags == SPINT_ACTIVE, "got flags %#lx\n", iface.Flags ); + + iface_detail->cbSize = sizeof(*iface_detail); + ret = SetupDiGetDeviceInterfaceDetailW( set, &iface, iface_detail, sizeof(buffer), NULL, NULL ); + ok( ret, "Failed to get interface path, error %#lx\n", GetLastError() ); + + if (!wcsncmp( iface_detail->DevicePath, device_path, len )) break; + } + + ret = SetupDiDestroyDeviceInfoList( set ); + ok( ret, "Failed to destroy set, error %lu\n", GetLastError() ); + + ret = !wcsncmp( iface_detail->DevicePath, device_path, len ); + if (ret) wcscpy( device_path, iface_detail->DevicePath ); + return ret; +} + static BOOL pnp_driver_start(void) { static const WCHAR hardware_id[] = L"test_hardware_id\0"; @@ -2337,50 +2373,22 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle static void test_hid_device( DWORD report_id, DWORD polled, const HIDP_CAPS *expect_caps ) { - char buffer[FIELD_OFFSET( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )]; - SP_DEVICE_INTERFACE_DATA iface = {sizeof(SP_DEVICE_INTERFACE_DATA)}; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail = (void *)buffer; - SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; ULONG count, poll_freq, out_len; + WCHAR device_path[MAX_PATH]; HANDLE file, async_file; - BOOL ret, found = FALSE; OBJECT_ATTRIBUTES attr; UNICODE_STRING string; IO_STATUS_BLOCK io; NTSTATUS status; - unsigned int i; - HDEVINFO set; + BOOL ret; winetest_push_context( "id %ld%s", report_id, polled ? " poll" : "" ); - set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); - ok( set != INVALID_HANDLE_VALUE, "failed to get device list, error %#lx\n", GetLastError() ); - - for (i = 0; SetupDiEnumDeviceInfo( set, i, &device ); ++i) - { - ret = SetupDiEnumDeviceInterfaces( set, &device, &GUID_DEVINTERFACE_HID, 0, &iface ); - ok( ret, "failed to get interface, error %#lx\n", GetLastError() ); - ok( IsEqualGUID( &iface.InterfaceClassGuid, &GUID_DEVINTERFACE_HID ), "wrong class %s\n", - debugstr_guid( &iface.InterfaceClassGuid ) ); - ok( iface.Flags == SPINT_ACTIVE, "got flags %#lx\n", iface.Flags ); - - iface_detail->cbSize = sizeof(*iface_detail); - ret = SetupDiGetDeviceInterfaceDetailW( set, &iface, iface_detail, sizeof(buffer), NULL, NULL ); - ok( ret, "failed to get interface path, error %#lx\n", GetLastError() ); - - if (wcsstr( iface_detail->DevicePath, L"\\\\?\\hid#winetest#1" )) - { - found = TRUE; - break; - } - } - - SetupDiDestroyDeviceInfoList( set ); - - todo_wine - ok( found, "didn't find device\n" ); + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#winetest#" ); + ret = find_hid_device_path( device_path ); + ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); - file = CreateFileW( iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + file = CreateFileW( device_path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); ok( file != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError() ); @@ -2411,7 +2419,7 @@ static void test_hid_device( DWORD report_id, DWORD polled, const HIDP_CAPS *exp ok( ret, "HidD_GetNumInputBuffers failed last error %lu\n", GetLastError() ); ok( count == 16, "HidD_GetNumInputBuffers returned %lu\n", count ); - async_file = CreateFileW( iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + async_file = CreateFileW( device_path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL ); ok( async_file != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError() ); @@ -3133,17 +3141,13 @@ static void test_hidp_kdr(void) }, }; - char buffer[FIELD_OFFSET( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )]; - SP_DEVICE_INTERFACE_DATA iface = {sizeof(SP_DEVICE_INTERFACE_DATA)}; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail = (void *)buffer; - SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; PHIDP_PREPARSED_DATA preparsed_data; DWORD i, report_id = 0, polled = 0; + WCHAR device_path[MAX_PATH]; struct hidp_kdr *kdr; char context[64]; LSTATUS status; - HDEVINFO set; HANDLE file; HKEY hkey; BOOL ret; @@ -3183,25 +3187,11 @@ static void test_hidp_kdr(void) if (!hid_device_start()) goto done; - set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); - ok( set != INVALID_HANDLE_VALUE, "failed to get device list, error %#lx\n", GetLastError() ); - for (i = 0; SetupDiEnumDeviceInfo( set, i, &device ); ++i) - { - ret = SetupDiEnumDeviceInterfaces( set, &device, &GUID_DEVINTERFACE_HID, 0, &iface ); - ok( ret, "failed to get interface, error %#lx\n", GetLastError() ); - ok( IsEqualGUID( &iface.InterfaceClassGuid, &GUID_DEVINTERFACE_HID ), "wrong class %s\n", - debugstr_guid( &iface.InterfaceClassGuid ) ); - ok( iface.Flags == SPINT_ACTIVE, "got flags %#lx\n", iface.Flags ); - - iface_detail->cbSize = sizeof(*iface_detail); - ret = SetupDiGetDeviceInterfaceDetailW( set, &iface, iface_detail, sizeof(buffer), NULL, NULL ); - ok( ret, "failed to get interface path, error %#lx\n", GetLastError() ); - - if (wcsstr( iface_detail->DevicePath, L"\\\\?\\hid#winetest#1" )) break; - } - SetupDiDestroyDeviceInfoList( set ); + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#winetest#" ); + ret = find_hid_device_path( device_path ); + ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); - file = CreateFileW( iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + file = CreateFileW( device_path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); ok( file != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError() );

1 0

Alexandre Julliard : make_unicode: Generate locale.nls using the Unicode CLDR data.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 8cdb593f5a7e026caee10b6787cf686f3276b65b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cdb593f5a7e026caee10b67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:45:05 2022 +0100 make_unicode: Generate locale.nls using the Unicode CLDR data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + nls/Makefile.in | 1 + nls/locale.nls | Bin 0 -> 625428 bytes tools/make_unicode | 1874 +++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 1875 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cdb593f5a7e026caee1…

1 0

Rémi Bernon : dinput/tests: Remove the HID driver IRP_MJ_POWER handler.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: acbfddd38c2803d99a6d6fa74caa9776e26a6640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acbfddd38c2803d99a6d6fa7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 09:54:13 2022 +0100 dinput/tests: Remove the HID driver IRP_MJ_POWER handler. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/dinput/tests/driver.c b/dlls/dinput/tests/driver.c index e4101853833..579d82cfeed 100644 --- a/dlls/dinput/tests/driver.c +++ b/dlls/dinput/tests/driver.c @@ -457,18 +457,6 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) return IoCallDriver( ext->NextDeviceObject, irp ); } -static NTSTATUS WINAPI driver_power( DEVICE_OBJECT *device, IRP *irp ) -{ - HID_DEVICE_EXTENSION *ext = device->DeviceExtension; - - /* We do not expect power IRPs as part of normal operation. */ - ok( 0, "unexpected call\n" ); - - PoStartNextPowerIrp( irp ); - IoSkipCurrentIrpStackLocation( irp ); - return PoCallDriver( ext->NextDeviceObject, irp ); -} - #define check_buffer( a, b ) check_buffer_( __LINE__, a, b ) static void check_buffer_( int line, HID_XFER_PACKET *packet, struct hid_expect *expect ) { @@ -889,7 +877,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; - driver->MajorFunction[IRP_MJ_POWER] = driver_power; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_ioctl; driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = driver_internal_ioctl; driver->MajorFunction[IRP_MJ_CREATE] = driver_create;

1 0

Alexandre Julliard : ntdll: Implement NtInitializeNlsFiles().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 5ed078dc14c7c40815c3f65a8718207d861d0320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ed078dc14c7c40815c3f65a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:51:13 2022 +0100 ntdll: Implement NtInitializeNlsFiles(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/env.c | 63 +++++++++++++++++++++++++++++++++++------------- dlls/ntdll/unix/loader.c | 3 ++- include/winternl.h | 1 + 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d514bca5e11..6d134770596 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -235,6 +235,7 @@ @ stdcall -syscall NtImpersonateAnonymousToken(long) # @ stub NtImpersonateClientOfPort # @ stub NtImpersonateThread +@ stdcall -syscall NtInitializeNlsFiles(ptr ptr ptr) # @ stub NtInitializeRegistry @ stdcall -syscall NtInitiatePowerAction (long long long long) @ stdcall -syscall NtIsProcessInJob(long long) @@ -1257,6 +1258,7 @@ @ stdcall -private -syscall ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken # @ stub ZwImpersonateClientOfPort # @ stub ZwImpersonateThread +@ stdcall -private -syscall ZwInitializeNlsFiles(ptr ptr ptr) NtInitializeNlsFiles # @ stub ZwInitializeRegistry @ stdcall -private -syscall ZwInitiatePowerAction(long long long long) NtInitiatePowerAction @ stdcall -private -syscall ZwIsProcessInJob(long long) NtIsProcessInJob diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 227bcdbfa0f..2302ee46e86 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -153,22 +153,15 @@ static void *read_nls_file( ULONG type, ULONG id ) return ret; } -static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) +static NTSTATUS open_nls_data_file( const char *path, const WCHAR *sysdir, HANDLE *file ) { - static const WCHAR sortdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', - 's','o','r','t','i','n','g','\\',0}; - NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; OBJECT_ATTRIBUTES attr; UNICODE_STRING valueW; - WCHAR buffer[ARRAY_SIZE(sortdirW) + 16]; - char *p, *path = get_nls_file_path( type, id ); - - if (!path) return STATUS_OBJECT_NAME_NOT_FOUND; + WCHAR buffer[64]; + char *p, *ntpath; - /* try to open file in system dir */ - wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : system_dir ); + wcscpy( buffer, system_dir ); p = strrchr( path, '/' ) + 1; ascii_to_unicode( buffer + wcslen(buffer), p, strlen(p) + 1 ); init_unicode_string( &valueW, buffer ); @@ -176,13 +169,12 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); - free( path ); if (status != STATUS_NO_SUCH_FILE) return status; - if ((status = nt_to_unix_file_name( &attr, &path, FILE_OPEN ))) return status; - status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, + if ((status = nt_to_unix_file_name( &attr, &ntpath, FILE_OPEN ))) return status; + status = open_unix_file( file, ntpath, GENERIC_READ, &attr, 0, FILE_SHARE_READ, FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); - free( path ); + free( ntpath ); return status; } @@ -2438,6 +2430,9 @@ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCES */ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void **ptr, SIZE_T *size ) { + static const WCHAR sortdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', + 's','o','r','t','i','n','g','\\',0}; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; WCHAR name[32]; @@ -2450,7 +2445,12 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); if ((status = NtOpenSection( &handle, SECTION_MAP_READ, &attr ))) { - if ((status = open_nls_data_file( type, id, &file ))) return status; + char *path = get_nls_file_path( type, id ); + + if (!path) return STATUS_OBJECT_NAME_NOT_FOUND; + status = open_nls_data_file( path, type == NLS_SECTION_SORTKEYS ? sortdirW : system_dir, &file ); + free( path ); + if (status) return status; attr.Attributes = OBJ_OPENIF | OBJ_PERMANENT; status = NtCreateSection( &handle, SECTION_MAP_READ, &attr, NULL, PAGE_READONLY, SEC_COMMIT, file ); NtClose( file ); @@ -2461,8 +2461,37 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** status = map_section( handle, ptr, size, PAGE_READONLY ); NtClose( handle ); } + return status; +} + + +/************************************************************************** + * NtInitializeNlsFiles (NTDLL.@) + */ +NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *size ) +{ + const char *dir = build_dir ? build_dir : data_dir; + char *path; + HANDLE handle, file; + SIZE_T mapsize; + NTSTATUS status; + + if (!(path = malloc( strlen(dir) + sizeof("/nls/locale.nls") ))) return STATUS_NO_MEMORY; + strcpy( path, dir ); + strcat( path, "/nls/locale.nls" ); + status = open_nls_data_file( path, system_dir, &file ); + free( path ); + if (!status) + { + status = NtCreateSection( &handle, SECTION_MAP_READ, NULL, NULL, PAGE_READONLY, SEC_COMMIT, file ); + NtClose( file ); + } + if (!status) + { + status = map_section( handle, ptr, &mapsize, PAGE_READONLY ); + NtClose( handle ); } - NtClose( handle ); + *lcid = system_lcid; return status; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 97fb624d6d2..d1c42ddc0f3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -196,7 +196,8 @@ static void * const syscalls[] = NtGetNlsSectionPtr, NtGetWriteWatch, NtImpersonateAnonymousToken, - NtInitiatePowerAction , + NtInitializeNlsFiles, + NtInitiatePowerAction, NtIsProcessInJob, NtListenPort, NtLoadDriver, diff --git a/include/winternl.h b/include/winternl.h index 4c49f5eae47..68c174d6086 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3995,6 +3995,7 @@ NTSYSAPI NTSTATUS WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG NTSYSAPI NTSTATUS WINAPI NtImpersonateAnonymousToken(HANDLE); NTSYSAPI NTSTATUS WINAPI NtImpersonateClientOfPort(HANDLE,PPORT_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtImpersonateThread(HANDLE,HANDLE,PSECURITY_QUALITY_OF_SERVICE); +NTSYSAPI NTSTATUS WINAPI NtInitializeNlsFiles(void**,LCID*,LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtInitializeRegistry(BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtInitiatePowerAction(POWER_ACTION,SYSTEM_POWER_STATE,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtIsProcessInJob(HANDLE,HANDLE);

1 0

Alexandre Julliard : ntdll: Add a helper function to map a section.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: cd4fcf9a112181149c5dde9cbd0b481de6161b4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd4fcf9a112181149c5dde9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:50:33 2022 +0100 ntdll: Add a helper function to map a section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 7 +++---- dlls/ntdll/unix/loader.c | 6 +----- dlls/ntdll/unix/unix_private.h | 8 ++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3f9f7f1b3b7..227bcdbfa0f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2458,10 +2458,9 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** } if (!status) { - *ptr = NULL; - *size = 0; - status = NtMapViewOfSection( handle, GetCurrentProcess(), ptr, 0, 0, NULL, size, - ViewShare, 0, PAGE_READONLY ); + status = map_section( handle, ptr, size, PAGE_READONLY ); + NtClose( handle ); + } } NtClose( handle ); return status; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5eb201bd90b..97fb624d6d2 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2032,11 +2032,7 @@ static void load_apiset_dll(void) } if (!status) { - ptr = NULL; - size = 0; - status = NtMapViewOfSection( mapping, NtCurrentProcess(), &ptr, - is_win64 && wow_peb ? 0x7fffffff : 0, 0, NULL, - &size, ViewShare, 0, PAGE_READONLY ); + status = map_section( mapping, &ptr, &size, PAGE_READONLY ); NtClose( mapping ); } if (!status) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b1595c792c0..434f98cdc5a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -450,4 +450,12 @@ static inline void init_unicode_string( UNICODE_STRING *str, const WCHAR *data ) str->Buffer = (WCHAR *)data; } +static inline NTSTATUS map_section( HANDLE mapping, void **ptr, SIZE_T *size, ULONG protect ) +{ + *ptr = NULL; + *size = 0; + return NtMapViewOfSection( mapping, NtCurrentProcess(), ptr, is_win64 && wow_peb ? 0x7fffffff : 0, + 0, NULL, size, ViewShare, 0, protect ); +} + #endif /* __NTDLL_UNIX_PRIVATE_H */

1 0

Jacek Caban : win32u: Don't use CDECL for window surface functions.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 747f7b543ca777e4596a3f3f6811fcbec73a07f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=747f7b543ca777e4596a3f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:14:10 2022 +0100 win32u: Don't use CDECL for window surface functions. They are no longer used from PE code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dce.c | 42 +++++++++++++++++++++--------------------- dlls/wineandroid.drv/window.c | 14 +++++++------- dlls/winemac.drv/surface.c | 14 +++++++------- dlls/winex11.drv/bitblt.c | 14 +++++++------- include/wine/gdi_driver.h | 20 ++++++++++++-------- 5 files changed, 54 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=747f7b543ca777e4596a…

1 0

Jacek Caban : user32: Store current spy indent in user_thread_info struct.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 65fe0f6521954e5b44798a994ada31b555d10278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65fe0f6521954e5b44798a99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:14:39 2022 +0100 user32: Store current spy indent in user_thread_info struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 13 ++----------- dlls/win32u/ntuser_private.h | 1 + 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 4d22acb43c2..141843e15bb 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2028,14 +2028,12 @@ typedef struct WCHAR wnd_name[16]; /* window name for message */ } SPY_INSTANCE; -static LONG indent_tls_index = TLS_OUT_OF_INDEXES; - /*********************************************************************** * get_indent_level */ static inline INT_PTR get_indent_level(void) { - return (INT_PTR)TlsGetValue( indent_tls_index ); + return get_user_thread_info()->spy_indent; } @@ -2044,7 +2042,7 @@ static inline INT_PTR get_indent_level(void) */ static inline void set_indent_level( INT_PTR level ) { - TlsSetValue( indent_tls_index, (void *)level ); + get_user_thread_info()->spy_indent = level; } @@ -2539,13 +2537,6 @@ static BOOL spy_init(void) if (!TRACE_ON(message)) return FALSE; - if (indent_tls_index == TLS_OUT_OF_INDEXES) - { - DWORD index = TlsAlloc(); - if (InterlockedCompareExchange( &indent_tls_index, index, TLS_OUT_OF_INDEXES ) != TLS_OUT_OF_INDEXES) - TlsFree( index ); - } - if (spy_exclude) return TRUE; exclude = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, SPY_MAX_MSGNUM + 2 ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 03017af9882..4710c45ebc0 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -159,6 +159,7 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */ + UINT spy_indent; /* Current spy indent */ }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) );

1 0

Alexandre Julliard : wow64win: Add missing syscall for NtUserGetClassName().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 65d0c15014d45552e9f069c6d8c38162c71c1be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65d0c15014d45552e9f069c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 16:13:56 2022 +0100 wow64win: Add missing syscall for NtUserGetClassName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 007459457b2..a90c4c20d40 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserGetAncestor ) \ SYSCALL_ENTRY( NtUserGetAtomName ) \ + SYSCALL_ENTRY( NtUserGetClassName ) \ SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \ SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index fb237bfff47..9d957673ceb 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -199,6 +199,17 @@ NTSTATUS WINAPI wow64_NtUserGetAtomName( UINT *args ) return NtUserGetAtomName( atom, unicode_str_32to64( &str, str32 )); } +NTSTATUS WINAPI wow64_NtUserGetClassName( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + BOOL real = get_ulong( &args ); + UNICODE_STRING32 *str32 = get_ptr( &args ); + + UNICODE_STRING str; + + return NtUserGetClassName( hwnd, real, unicode_str_32to64( &str, str32 )); +} + NTSTATUS WINAPI wow64_NtUserGetAncestor( UINT *args ) { HWND hwnd = get_handle( &args );

1 0