- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Return the correct IOSB information when creating a named pipe.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 1b9db994178fe964f826ca2a28ed7c9b53c6f0f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b9db994178fe964f826ca2a28ed7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 11:16:04 2023 +0100 ntdll: Return the correct IOSB information when creating a named pipe. --- dlls/ntdll/tests/om.c | 4 ---- dlls/ntdll/unix/file.c | 6 +++++- include/wine/server_protocol.h | 4 ++-- server/named_pipe.c | 1 + server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2b2805d0b00..3f42b7d045d 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -379,7 +379,6 @@ static void test_name_collisions(void) FILE_OPEN_IF, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_CREATED, "wrong info %Ix\n", iosb.Information ); pNtClose( h ); @@ -389,7 +388,6 @@ static void test_name_collisions(void) FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_CREATED, "wrong info %Ix\n", iosb.Information ); memset( &iosb, 0xcc, sizeof(iosb) ); @@ -398,7 +396,6 @@ static void test_name_collisions(void) FILE_OPEN, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); pNtClose(h1); @@ -408,7 +405,6 @@ static void test_name_collisions(void) FILE_OPEN_IF, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); pNtClose(h1); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ba4730eced4..4daf1a5335c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4144,7 +4144,11 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR req->insize = inbound_quota; req->timeout = timeout->QuadPart; wine_server_add_data( req, objattr, len ); - if (!(status = wine_server_call( req ))) *handle = wine_server_ptr_handle( reply->handle ); + if (!(status = wine_server_call( req ))) + { + *handle = wine_server_ptr_handle( reply->handle ); + io->Information = reply->created ? FILE_CREATED : FILE_OPENED; + } } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e2bc1a71940..c5e0182f42a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3086,7 +3086,7 @@ struct create_named_pipe_reply { struct reply_header __header; obj_handle_t handle; - char __pad_12[4]; + int created; }; @@ -6356,7 +6356,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 759 +#define SERVER_PROTOCOL_VERSION 760 /* ### protocol_version end ### */ diff --git a/server/named_pipe.c b/server/named_pipe.c index bf3b1b1bd35..9a10c2bf041 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1437,6 +1437,7 @@ DECL_HANDLER(create_named_pipe) GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + reply->created = 1; } else { diff --git a/server/protocol.def b/server/protocol.def index 2445288bbcc..69888fa643e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2279,6 +2279,7 @@ enum message_type VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the pipe */ + int created; @END /* flags in create_named_pipe and get_named_pipe_info */ diff --git a/server/request.h b/server/request.h index fe8e9c2f258..10b877b1deb 100644 --- a/server/request.h +++ b/server/request.h @@ -1459,6 +1459,7 @@ C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 40 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, flags) == 48 ); C_ASSERT( sizeof(struct create_named_pipe_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_reply, handle) == 8 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_reply, created) == 12 ); C_ASSERT( sizeof(struct create_named_pipe_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_named_pipe_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_named_pipe_info_request, flags) == 16 ); diff --git a/server/trace.c b/server/trace.c index f114039b97b..b63bc386ee8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2873,6 +2873,7 @@ static void dump_create_named_pipe_request( const struct create_named_pipe_reque static void dump_create_named_pipe_reply( const struct create_named_pipe_reply *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", created=%d", req->created ); } static void dump_set_named_pipe_info_request( const struct set_named_pipe_info_request *req )

1 0

Alexandre Julliard : kernelbase: Set ERROR_ALREADY_EXISTS for existing pipe in CreateNamedPipeW().
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 89bb2622d2b8ca7f58267f2958084a82a0cb68c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/89bb2622d2b8ca7f58267f2958084a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 11:18:13 2023 +0100 kernelbase: Set ERROR_ALREADY_EXISTS for existing pipe in CreateNamedPipeW(). Reported by Dávid Török. --- dlls/kernelbase/sync.c | 2 +- dlls/ntdll/tests/om.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index a5cda6bb49e..eabde0530d9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1305,12 +1305,12 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateNamedPipeW( LPCWSTR name, DWORD open_mode, if (instances >= PIPE_UNLIMITED_INSTANCES) instances = ~0U; time.QuadPart = (ULONGLONG)timeout * -10000; - SetLastError( 0 ); status = NtCreateNamedPipeFile( &handle, access, &attr, &iosb, sharing, FILE_OPEN_IF, options, pipe_type, read_mode, non_block, instances, in_buff, out_buff, &time ); RtlFreeUnicodeString( &nt_name ); if (!set_ntstatus( status )) return INVALID_HANDLE_VALUE; + SetLastError( iosb.Information == FILE_CREATED ? ERROR_SUCCESS : ERROR_ALREADY_EXISTS ); return handle; } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 3f42b7d045d..fb6deb19fa9 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -411,7 +411,6 @@ static void test_name_collisions(void) h1 = CreateNamedPipeA( "\\\\.\\pipe\\named_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE, 10, 256, 256, 1000, NULL ); winerr = GetLastError(); - todo_wine ok(h1 != 0 && winerr == ERROR_ALREADY_EXISTS, "CreateNamedPipeA got ret=%p (%ld)\n", h1, winerr); pNtClose(h1); pNtClose(h);

1 0

Alexandre Julliard : ntdll: Pass the NtCreateNamedPipeFile disposition to the server.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: d74b084e45ba6bf025f6638624c917ae081030f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d74b084e45ba6bf025f6638624c917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 10:32:52 2023 +0100 ntdll: Pass the NtCreateNamedPipeFile disposition to the server. --- dlls/kernelbase/sync.c | 4 +-- dlls/ntdll/tests/om.c | 61 ++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/tests/pipe.c | 6 ++--- dlls/ntdll/unix/file.c | 1 + include/wine/server_protocol.h | 4 +-- server/named_pipe.c | 19 ++++++++++--- server/protocol.def | 1 + server/request.h | 7 ++--- server/trace.c | 1 + 9 files changed, 89 insertions(+), 15 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support lit() intrinsic.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: vkd3d Branch: master Commit: d86db8bcbe5d0e2593d39864c7e5215bd643008f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d86db8bcbe5d0e2593d39864c7e52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 18:02:31 2023 +0100 vkd3d-shader/hlsl: Support lit() intrinsic. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 119 +++++++++++++++++++++++++++++++++++---- libs/vkd3d-shader/hlsl_codegen.c | 8 +-- tests/lit.shader_test | 62 ++++++++++++++++++++ 5 files changed, 176 insertions(+), 16 deletions(-)

1 0

Eric Pouech : include: Ensure that SymRefreshModuleList() is properly defined.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 417d2c0235522b61adcdb8f4b848044ee6c9c552 URL: https://gitlab.winehq.org/wine/wine/-/commit/417d2c0235522b61adcdb8f4b84804… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 20 17:28:25 2023 +0100 include: Ensure that SymRefreshModuleList() is properly defined. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/dbghelp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 31600d99429..fda8fefa35f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -510,6 +510,7 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD, DWORD64 WINAPI SymLoadModuleExW(HANDLE, HANDLE, PCWSTR, PCWSTR, DWORD64, DWORD, PMODLOAD_DATA, DWORD); BOOL WINAPI SymUnloadModule64(HANDLE, DWORD64); +BOOL WINAPI SymRefreshModuleList(HANDLE); /************************* * Symbol Handling * @@ -1227,7 +1228,6 @@ BOOL WINAPI SymGetSymPrevW(HANDLE, PIMAGEHLP_SYMBOLW); DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); BOOL WINAPI SymRegisterCallback(HANDLE, PSYMBOL_REGISTERED_CALLBACK, PVOID); BOOL WINAPI SymRegisterFunctionEntryCallback(HANDLE, PSYMBOL_FUNCENTRY_CALLBACK, PVOID); -BOOL WINAPI SymRefreshModuleList(HANDLE); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); BOOL WINAPI SymUnloadModule(HANDLE, DWORD);

1 0

Francois Gouget : gdi32/tests: Mark a couple other D3DKMTCheckOcclusion() tests as flaky.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 2436964d5678956a362a9bef34625885442740f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2436964d5678956a362a9bef346258… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 9 20:00:52 2023 +0100 gdi32/tests: Mark a couple other D3DKMTCheckOcclusion() tests as flaky. They also happen randomly on Windows (see commit 2d19baa6b576). Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51313 --- dlls/gdi32/tests/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 9f4835540fc..94f93d61207 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -799,11 +799,13 @@ static void test_D3DKMTCheckOcclusion(void) occlusion_desc.hWnd = hwnd; status = pD3DKMTCheckOcclusion(&occlusion_desc); + flaky ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + flaky ok(status == STATUS_SUCCESS || status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED, "Got unexpected return code %#lx.\n", status); destroy_device_desc.hDevice = create_device_desc.hDevice;

1 0

Zebediah Figura : Revert "ntoskrnl.exe: Enforce path case in WM_DEVICECHANGE notifications.".
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 80581c608c5d84361fff2f4a403d28d035e23bf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/80581c608c5d84361fff2f4a403d28… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 7 23:20:50 2023 -0600 Revert "ntoskrnl.exe: Enforce path case in WM_DEVICECHANGE notifications.". This reverts commit c489356d0b5bf01f2a09f6df8f5a5b9b1894fb17. --- dlls/ntoskrnl.exe/pnp.c | 8 +------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index e1c34ab57c3..59655a24777 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -725,13 +725,13 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable size_t namelen = name->Length / sizeof(WCHAR); DEV_BROADCAST_DEVICEINTERFACE_W *broadcast; - WCHAR *path, *refstr, *p, *upper_end; struct device_interface *iface; HANDLE iface_key, control_key; OBJECT_ATTRIBUTES attr = {0}; struct wine_rb_entry *entry; UNICODE_STRING control = RTL_CONSTANT_STRING( L"Control" ); UNICODE_STRING linked = RTL_CONSTANT_STRING( L"Linked" ); + WCHAR *path, *refstr, *p; UNICODE_STRING string; DWORD data = enable; NTSTATUS ret; @@ -817,12 +817,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); if (namelen > 1) broadcast->dbcc_name[1] = '\\'; - - upper_end = wcschr( broadcast->dbcc_name, '#' ); - if (upper_end) upper_end = wcschr( upper_end + 1, '#' ); - while (upper_end && upper_end-- != broadcast->dbcc_name) - *upper_end = towupper( *upper_end ); - send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast ); } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c5362e3fb2b..859dab4b3a9 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1406,7 +1406,7 @@ static LRESULT WINAPI device_notify_proc(HWND window, UINT message, WPARAM wpara else if (IsEqualGUID(&iface->dbcc_classguid, &child_class)) { ++got_child_arrival; - todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\Wine#Test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), + ok(!strcmp(iface->dbcc_name, "\\\\?\\Wine#Test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), "got name %s\n", debugstr_a(iface->dbcc_name)); } break; @@ -1434,7 +1434,7 @@ static LRESULT WINAPI device_notify_proc(HWND window, UINT message, WPARAM wpara else if (IsEqualGUID(&iface->dbcc_classguid, &child_class)) { ++got_child_removal; - todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\Wine#Test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), + ok(!strcmp(iface->dbcc_name, "\\\\?\\Wine#Test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), "got name %s\n", debugstr_a(iface->dbcc_name)); } break;

1 0

Eric Pouech : dbghelp/tests: Test that overlapped module is really unloaded.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: e138361f48f137bfa6faee34b9f36cc3228ecdb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e138361f48f137bfa6faee34b9f36c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 20 17:27:53 2023 +0100 dbghelp/tests: Test that overlapped module is really unloaded. (and not just modified in place). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 83805f3ed10..5a1e6121931 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -402,6 +402,9 @@ static void test_modules_overlap(void) const char* target1_dll = "c:\\windows\\system32\\kernel32.dll"; const char* target2_dll = "c:\\windows\\system32\\winmm.dll"; DWORD imsize = get_module_size(target1_dll); + char buffer[512]; + IMAGEHLP_SYMBOL64* sym = (void*)buffer; + int i, j; struct test_module { @@ -448,6 +451,9 @@ static void test_modules_overlap(void) base = SymLoadModuleEx(dummy, NULL, target1_dll, NULL, base1, 0, NULL, 0); ok(base == base1, "SymLoadModuleEx failed: %lu\n", GetLastError()); + ret = SymAddSymbol(dummy, base1, "winetest_symbol_virtual", base1 + (3 * imsize) / 4, 13, 0); + ok(ret, "SymAddSymbol failed: %lu\n", GetLastError()); + base = SymLoadModuleEx(dummy, NULL, tests[i].input.name, NULL, tests[i].input.base, tests[i].input.size, NULL, 0); if (tests[i].error_code != ~0) { @@ -477,6 +483,23 @@ static void test_modules_overlap(void) ok(!strcasecmp(nth.module.ModuleName, tests[i].outputs[j].name), "Wrong name\n"); } } + memset(sym, 0, sizeof(*sym)); + sym->SizeOfStruct = sizeof(*sym); + sym->MaxNameLength = sizeof(buffer) - sizeof(*sym); + ret = SymGetSymFromName64(dummy, "winetest_symbol_virtual", sym); + if (tests[i].error_code == ERROR_SUCCESS || tests[i].outputs[1].base) + { + /* first module is not unloaded, so our added symbol should be present, with right attributes */ + ok(ret, "SymGetSymFromName64 has failed: %lu (%d, %d)\n", GetLastError(), i, j); + ok(sym->Address == base1 + (3 * imsize) / 4, "Unexpected size %lu\n", sym->Size); + ok(sym->Size == 13, "Unexpected size %lu\n", sym->Size); + ok(sym->Flags & SYMFLAG_VIRTUAL, "Unexpected flag %lx\n", sym->Flags); + } + else + { + /* the first module is really unloaded, the our added symbol has disappead */ + ok(!ret, "SymGetSymFromName64 should have failed %lu\n", GetLastError()); + } ret = SymCleanup(dummy); ok(ret, "SymCleanup failed: %lu\n", GetLastError()); }

1 0

Zebediah Figura : ntoskrnl: Preserve the device instance ID case in IoRegisterDeviceInterface().
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: f745900a4b999ba5e34a93af569a50223e50d2ea URL: https://gitlab.winehq.org/wine/wine/-/commit/f745900a4b999ba5e34a93af569a50… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 8 00:20:30 2023 -0600 ntoskrnl: Preserve the device instance ID case in IoRegisterDeviceInterface(). --- dlls/ntoskrnl.exe/pnp.c | 40 +++++++++++++++++++++--------------- dlls/ntoskrnl.exe/tests/driver_pnp.c | 2 +- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 25a52d7d219..e1c34ab57c3 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -883,13 +883,12 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla SP_DEVICE_INTERFACE_DATA sp_iface = {sizeof(sp_iface)}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; UNICODE_STRING device_path; struct device_interface *iface; struct wine_rb_entry *entry; - DWORD required; HDEVINFO set; + WCHAR *p; TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n", device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link); @@ -910,22 +909,31 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; - required = 0; - SetupDiGetDeviceInterfaceDetailW( set, &sp_iface, NULL, 0, &required, NULL ); - if (required == 0) return STATUS_UNSUCCESSFUL; + /* setupapi mangles the case; construct the interface path manually. */ - data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, required ); - data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + device_path.Length = (4 + wcslen( device_instance_id ) + 1 + 38) * sizeof(WCHAR); + if (refstr) + device_path.Length += sizeof(WCHAR) + refstr->Length; + device_path.MaximumLength = device_path.Length + sizeof(WCHAR); - if (!SetupDiGetDeviceInterfaceDetailW( set, &sp_iface, data, required, NULL, NULL )) + device_path.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, device_path.MaximumLength ); + swprintf( device_path.Buffer, device_path.MaximumLength / sizeof(WCHAR), + L"\\??\\%s#{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + device_instance_id, class_guid->Data1, class_guid->Data2, class_guid->Data3, + class_guid->Data4[0], class_guid->Data4[1], class_guid->Data4[2], class_guid->Data4[3], + class_guid->Data4[4], class_guid->Data4[5], class_guid->Data4[6], class_guid->Data4[7] ); + for (p = device_path.Buffer + 4; *p; p++) { - HeapFree( GetProcessHeap(), 0, data ); - return STATUS_UNSUCCESSFUL; + if (*p == '\\') + *p = '#'; + } + if (refstr) + { + *p++ = '\\'; + wcscpy( p, refstr->Buffer ); } - data->DevicePath[1] = '?'; - TRACE("Returning path %s.\n", debugstr_w(data->DevicePath)); - RtlCreateUnicodeString( &device_path, data->DevicePath); + TRACE("Returning path %s.\n", debugstr_us(&device_path)); entry = wine_rb_get( &device_interfaces, &device_path ); if (entry) @@ -937,7 +945,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla else { iface = heap_alloc_zero( sizeof(struct device_interface) ); - RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); + RtlDuplicateUnicodeString( 1, &device_path, &iface->symbolic_link ); if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) ERR("Failed to insert interface %s into tree.\n", debugstr_us(&iface->symbolic_link)); } @@ -945,9 +953,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla iface->device = device; iface->interface_class = *class_guid; if (symbolic_link) - RtlCreateUnicodeString( symbolic_link, data->DevicePath); - - HeapFree( GetProcessHeap(), 0, data ); + RtlDuplicateUnicodeString( 1, &device_path, symbolic_link ); RtlFreeUnicodeString( &device_path ); diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 92ad69762de..77332708fd3 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -285,7 +285,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) "Got length %u.\n", device->child_symlink.Length); ok(device->child_symlink.MaximumLength == sizeof(expect_symlink), "Got maximum length %u.\n", device->child_symlink.MaximumLength); - todo_wine ok(!kmemcmp(device->child_symlink.Buffer, expect_symlink, device->child_symlink.MaximumLength), + ok(!kmemcmp(device->child_symlink.Buffer, expect_symlink, device->child_symlink.MaximumLength), "Got symlink \"%ls\".\n", device->child_symlink.Buffer); IoSetDeviceInterfaceState(&device->child_symlink, TRUE);

1 0

Zebediah Figura : ntoskrnl/tests: Expand tests for device and interface naming.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 297e4ae76b1662d22e65a373bc7de73f88db90dd URL: https://gitlab.winehq.org/wine/wine/-/commit/297e4ae76b1662d22e65a373bc7de7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 8 00:18:33 2023 -0600 ntoskrnl/tests: Expand tests for device and interface naming. --- dlls/ntoskrnl.exe/tests/driver_pnp.c | 22 +++++++++++++++++++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 22 +++++++++++++++++----- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 9a965f584cd..92ad69762de 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -34,6 +34,19 @@ #include "driver.h" #include "utils.h" +/* memcmp() isn't exported from ntoskrnl on i386 */ +static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) +{ + const unsigned char *p1, *p2; + + for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) + { + if (*p1 < *p2) return -1; + if (*p1 > *p2) return 1; + } + return 0; +} + static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; static const GUID child_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc2}}; static UNICODE_STRING control_symlink, bus_symlink; @@ -178,7 +191,7 @@ static NTSTATUS fdo_pnp(IRP *irp) static NTSTATUS query_id(struct device *device, IRP *irp, BUS_QUERY_ID_TYPE type) { - static const WCHAR device_id[] = L"wine\\test"; + static const WCHAR device_id[] = L"Wine\\Test"; WCHAR *id = NULL; irp->IoStatus.Information = 0; @@ -256,6 +269,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) case IRP_MN_START_DEVICE: { + static const WCHAR expect_symlink[] = L"\\??\\Wine#Test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"; static const LARGE_INTEGER wait_time = {.QuadPart = -500 * 10000}; POWER_STATE state = {.DeviceState = PowerDeviceD0}; NTSTATUS status; @@ -267,6 +281,12 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) status = IoRegisterDeviceInterface(device_obj, &child_class, NULL, &device->child_symlink); ok(!status, "Failed to register interface, status %#lx.\n", status); + ok(device->child_symlink.Length == sizeof(expect_symlink) - sizeof(WCHAR), + "Got length %u.\n", device->child_symlink.Length); + ok(device->child_symlink.MaximumLength == sizeof(expect_symlink), + "Got maximum length %u.\n", device->child_symlink.MaximumLength); + todo_wine ok(!kmemcmp(device->child_symlink.Buffer, expect_symlink, device->child_symlink.MaximumLength), + "Got symlink \"%ls\".\n", device->child_symlink.Buffer); IoSetDeviceInterfaceState(&device->child_symlink, TRUE); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c4521ed652a..c5362e3fb2b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1406,7 +1406,7 @@ static LRESULT WINAPI device_notify_proc(HWND window, UINT message, WPARAM wpara else if (IsEqualGUID(&iface->dbcc_classguid, &child_class)) { ++got_child_arrival; - todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\wine#test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), + todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\Wine#Test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), "got name %s\n", debugstr_a(iface->dbcc_name)); } break; @@ -1434,7 +1434,7 @@ static LRESULT WINAPI device_notify_proc(HWND window, UINT message, WPARAM wpara else if (IsEqualGUID(&iface->dbcc_classguid, &child_class)) { ++got_child_removal; - todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\wine#test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), + todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\Wine#Test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), "got name %s\n", debugstr_a(iface->dbcc_name)); } break; @@ -1506,7 +1506,7 @@ static void test_pnp_devices(void) ret = SetupDiGetDeviceInstanceIdA(set, &device, buffer, sizeof(buffer), NULL); ok(ret, "failed to get device ID, error %#lx\n", GetLastError()); - ok(!strcasecmp(buffer, "root\\winetest\\0"), "got ID %s\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "ROOT\\WINETEST\\0"), "got ID %s\n", debugstr_a(buffer)); ret = SetupDiEnumDeviceInterfaces(set, NULL, &control_class, 0, &iface); ok(ret, "failed to get interface, error %#lx\n", GetLastError()); @@ -1517,7 +1517,7 @@ static void test_pnp_devices(void) iface_detail->cbSize = sizeof(*iface_detail); ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, iface_detail, sizeof(buffer), NULL, NULL); ok(ret, "failed to get interface path, error %#lx\n", GetLastError()); - ok(!strcasecmp(iface_detail->DevicePath, "\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}"), + ok(!strcmp(iface_detail->DevicePath, "\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}"), "wrong path %s\n", debugstr_a(iface_detail->DevicePath)); SetupDiDestroyDeviceInfoList(set); @@ -1614,7 +1614,7 @@ static void test_pnp_devices(void) ret = SetupDiGetDeviceInstanceIdA(set, &device, buffer, sizeof(buffer), NULL); ok(ret, "failed to get device ID, error %#lx\n", GetLastError()); - ok(!strcasecmp(buffer, "wine\\test\\1"), "got ID %s\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "WINE\\TEST\\1"), "got ID %s\n", debugstr_a(buffer)); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CAPABILITIES, &type, (BYTE *)&dword, sizeof(dword), NULL); @@ -1680,6 +1680,18 @@ static void test_pnp_devices(void) ok(!strcmp(buffer, "\\Device\\winetest_pnp_1"), "got PDO name %s\n", debugstr_a(buffer)); } + ret = SetupDiEnumDeviceInterfaces(set, NULL, &child_class, 0, &iface); + ok(ret, "failed to get interface, error %#lx\n", GetLastError()); + ok(IsEqualGUID(&iface.InterfaceClassGuid, &child_class), + "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 = SetupDiGetDeviceInterfaceDetailA(set, &iface, iface_detail, sizeof(buffer), NULL, NULL); + ok(ret, "failed to get interface path, error %#lx\n", GetLastError()); + ok(!strcmp(iface_detail->DevicePath, "\\\\?\\wine#test#1#{deadbeef-29ef-4538-a5fd-b69573a362c2}"), + "wrong path %s\n", debugstr_a(iface_detail->DevicePath)); + SetupDiDestroyDeviceInfoList(set); RtlInitUnicodeString(&string, L"\\Device\\winetest_pnp_1");

1 0