- Wine-Commits - list.winehq.org

Piotr Caban : wininet: Fix buffer size calculation in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION).
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 7dcdfd7bf23bfa6d1aa6b50bbb4bffe024fac98f URL: https://gitlab.winehq.org/wine/wine/-/commit/7dcdfd7bf23bfa6d1aa6b50bbb4bff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 13:49:41 2024 +0100 wininet: Fix buffer size calculation in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION). --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b74015146ea..fe11cb6f501 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2620,7 +2620,7 @@ static char *copy_optionA(WCHAR *value) if (!value) return NULL; - len = wcslen(value) * 3 + 1; + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) return NULL;

1 0

Piotr Caban : wininet: Use GlobalAlloc in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION).
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 9ea0a1072dd28cb8f06577384f82991acf7dc690 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ea0a1072dd28cb8f06577384f8299… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 13:55:28 2024 +0100 wininet: Use GlobalAlloc in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION). So the allocator matches with documentation. --- dlls/wininet/internet.c | 4 ++-- dlls/wininet/tests/internet.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fe11cb6f501..22f0023bba2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2606,7 +2606,7 @@ static WCHAR *copy_optionW(WCHAR *value) return NULL; len = (wcslen(value) + 1) * sizeof(WCHAR); - if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(tmp = GlobalAlloc(0, len))) return NULL; return memcpy(tmp, value, len); @@ -2621,7 +2621,7 @@ static char *copy_optionA(WCHAR *value) return NULL; len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(tmp = GlobalAlloc(0, len))) return NULL; WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 715b03f95fb..32504382477 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1317,7 +1317,7 @@ static void test_Option_PerConnectionOption(void) ret = HeapValidate(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); ok(ret, "HeapValidate failed, last error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* disable the proxy server */ @@ -1381,6 +1381,7 @@ static void test_Option_PerConnectionOption(void) ret = InternetSetOptionW(ses, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size); ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); InternetCloseHandle(ses); @@ -1443,7 +1444,7 @@ static void test_Option_PerConnectionOptionA(void) "Retrieved flags should've been PROXY_TYPE_PROXY, was: %ld\n", list.pOptions[1].Value.dwValue); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* test with NULL as proxy server */ @@ -1469,7 +1470,7 @@ static void test_Option_PerConnectionOptionA(void) "Retrieved proxy server should've been NULL, was: \"%s\"\n", list.pOptions[0].Value.pszValue); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* restore original settings */ @@ -1480,6 +1481,7 @@ static void test_Option_PerConnectionOptionA(void) &list, size); ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); InternetCloseHandle(ses);

1 0

Conor McCarthy : vkd3d: Implement ID3D12Resource2.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: vkd3d Branch: master Commit: 6d4782ed7f7e06cff31313c3170ea5e6bc281254 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6d4782ed7f7e06cff31313c3170ea… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 14:57:35 2024 +1000 vkd3d: Implement ID3D12Resource2. --- include/vkd3d.h | 2 +- libs/vkd3d/command.c | 14 ++--- libs/vkd3d/device.c | 107 +++++++++++++++++++++++++++++--------- libs/vkd3d/resource.c | 125 +++++++++++++++++++++++++-------------------- libs/vkd3d/vkd3d_private.h | 34 ++++++------ 5 files changed, 179 insertions(+), 103 deletions(-)

1 0

Conor McCarthy : tests/d3d12: Add a test for zero description count in test_resource_allocation_info().
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: vkd3d Branch: master Commit: 99947deeb7a93dfa5aa45e6de3a5fa8923f5667b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99947deeb7a93dfa5aa45e6de3a5f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 6 10:39:22 2024 +1000 tests/d3d12: Add a test for zero description count in test_resource_allocation_info(). --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac40c641..d7933ed6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32214,6 +32214,10 @@ static void test_resource_allocation_info(void) return; } + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 0, &desc); + ok(info.SizeInBytes == 0, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + /* Alignment on AMD Windows is 1, but this doesn't seem important to check. */ + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; desc.Alignment = 0; desc.Width = 32;

1 0

Conor McCarthy : tests/d3d12: Add tests for GetProtectedResourceSession().
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: vkd3d Branch: master Commit: e38f3995fdea7e1b0f20a6a715f6d4fe11163b68 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e38f3995fdea7e1b0f20a6a715f6d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:53:49 2024 +1000 tests/d3d12: Add tests for GetProtectedResourceSession(). --- tests/d3d12.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 51ee7877..33efa0f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1545,12 +1545,14 @@ static void test_create_command_signature(void) static void test_create_committed_resource(void) { + ID3D12ProtectedResourceSession *protected_session; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; + ID3D12Resource1 *resource1; ID3D12Resource *resource; ID3D12Device4 *device4; unsigned int i; @@ -1884,10 +1886,17 @@ static void test_create_committed_resource(void) hr = ID3D12Device4_CreateCommittedResource1(device4, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, NULL, - &IID_ID3D12Resource, (void **)&resource); + &IID_ID3D12Resource1, (void **)&resource1); ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); - ID3D12Resource_Release(resource); + check_interface(resource1, &IID_ID3D12Resource1, true); + + hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, + (void **)&protected_session); + todo + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + + ID3D12Resource1_Release(resource1); ID3D12Device4_Release(device4); } @@ -2140,12 +2149,14 @@ done: static void test_create_placed_resource(void) { + ID3D12ProtectedResourceSession *protected_session; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; ID3D12Resource *resource, *resource2; D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; + ID3D12Resource1 *resource1; D3D12_HEAP_DESC heap_desc; ID3D12Heap *heap; unsigned int i; @@ -2226,6 +2237,15 @@ static void test_create_placed_resource(void) gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + if (SUCCEEDED(ID3D12Resource_QueryInterface(resource, &IID_ID3D12Resource1, (void **)&resource1))) + { + hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, + (void **)&protected_session); + todo + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ID3D12Resource1_Release(resource1); + } + refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);

1 0

Conor McCarthy : vkd3d: Return DXGI_ERROR_NOT_FOUND from GetProtectedResourceSession().
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: vkd3d Branch: master Commit: 46682718721d815bb3d699c049007429bb422f2e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46682718721d815bb3d699c049007… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:55:07 2024 +1000 vkd3d: Return DXGI_ERROR_NOT_FOUND from GetProtectedResourceSession(). --- libs/vkd3d/resource.c | 2 +- tests/d3d12.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 8f4d1835..c37ab5f4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1725,7 +1725,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetProtectedResourceSession(ID3D { FIXME("iface %p, iid %s, session %p stub!\n", iface, debugstr_guid(iid), session); - return E_NOTIMPL; + return DXGI_ERROR_NOT_FOUND; } static const struct ID3D12Resource1Vtbl d3d12_resource_vtbl = diff --git a/tests/d3d12.c b/tests/d3d12.c index 33efa0f2..ac40c641 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1893,7 +1893,6 @@ static void test_create_committed_resource(void) hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, (void **)&protected_session); - todo ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); ID3D12Resource1_Release(resource1); @@ -2241,7 +2240,6 @@ static void test_create_placed_resource(void) { hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, (void **)&protected_session); - todo ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); ID3D12Resource1_Release(resource1); }

1 0

Eric Pouech : winedump: Don't crash on non-effective runtime function entries.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 9119e3102b2477a93ab97ec900ec35495b5c9a7a URL: https://gitlab.winehq.org/wine/wine/-/commit/9119e3102b2477a93ab97ec900ec35… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Feb 13 08:58:37 2024 +0100 winedump: Don't crash on non-effective runtime function entries. MSVC generates zeroed out entries when EditAndContinue (aka HotPatch) is enabled. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pe.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1879dd0ce2a..1104072a2c2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -863,6 +863,11 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct } info = RVA( function->UnwindData, sizeof(*info) ); + if (!info) + { + printf( " no unwind info (%x)\n", function->UnwindData ); + return; + } printf( " unwind info at %08x\n", function->UnwindData ); if (info->version > 2) {

1 0

Gabriel Ivăncescu : explorer: Set layered style on systray icons before calling into the driver.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 8a71a4a30495635bdc905af41869d8ed9e43009f URL: https://gitlab.winehq.org/wine/wine/-/commit/8a71a4a30495635bdc905af41869d8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 15 17:41:43 2024 +0200 explorer: Set layered style on systray icons before calling into the driver. Fixes a regression introduced by b5c57b9a62c396068d18237bd6e82b37c169fdc5, which broke the systray integration outside of virtual desktops on some DEs like XFCE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/explorer/systray.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index c76ebdd0c92..275c683e3ff 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -619,13 +619,23 @@ static BOOL show_icon(struct icon *icon) if (icon->display != ICON_DISPLAY_HIDDEN) return TRUE; /* already displayed */ - if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_INSERT, icon_cx, icon_cy, - icon, NtUserSystemTrayCall, FALSE )) + if (!enable_taskbar) { - icon->display = ICON_DISPLAY_DOCKED; - icon->layered = TRUE; - SetWindowLongW( icon->window, GWL_EXSTYLE, GetWindowLongW( icon->window, GWL_EXSTYLE ) | WS_EX_LAYERED ); - SendMessageW( icon->window, WM_SIZE, SIZE_RESTORED, MAKELONG( icon_cx, icon_cy ) ); + DWORD old_exstyle = GetWindowLongW( icon->window, GWL_EXSTYLE ); + + /* make sure it is layered before calling into the driver */ + SetWindowLongW( icon->window, GWL_EXSTYLE, old_exstyle | WS_EX_LAYERED ); + paint_layered_icon( icon ); + + if (!NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_INSERT, icon_cx, icon_cy, + icon, NtUserSystemTrayCall, FALSE )) + SetWindowLongW( icon->window, GWL_EXSTYLE, old_exstyle ); + else + { + icon->display = ICON_DISPLAY_DOCKED; + icon->layered = TRUE; + SendMessageW( icon->window, WM_SIZE, SIZE_RESTORED, MAKELONG( icon_cx, icon_cy ) ); + } } systray_add_icon( icon );

1 0

Krzysztof Bogacki : win32u: Maintain a list of GPUs in cache.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 800b5e44fc3106930b424ffa852699e499da1993 URL: https://gitlab.winehq.org/wine/wine/-/commit/800b5e44fc3106930b424ffa852699… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Sat Jan 27 16:27:27 2024 +0100 win32u: Maintain a list of GPUs in cache. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 710dc6f18c3..bb31ddc23b5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -233,6 +233,13 @@ struct display_device WCHAR device_key[128]; /* DeviceKey in DISPLAY_DEVICEW */ }; +struct gpu +{ + struct list entry; + LUID luid; + unsigned int adapter_count; +}; + struct adapter { LONG refcount; @@ -275,6 +282,7 @@ struct monitor struct edid_monitor_info edid_info; }; +static struct list gpus = LIST_INIT(gpus); static struct list adapters = LIST_INIT(adapters); static struct list monitors = LIST_INIT(monitors); static INT64 last_query_display_time; @@ -1672,6 +1680,7 @@ static void clear_display_devices(void) { struct adapter *adapter; struct monitor *monitor; + struct gpu *gpu; if (list_head( &monitors ) == &virtual_monitor.entry) { @@ -1693,19 +1702,32 @@ static void clear_display_devices(void) list_remove( &adapter->entry ); adapter_release( adapter ); } + + while (!list_empty( &gpus )) + { + gpu = LIST_ENTRY( list_head( &gpus ), struct gpu, entry ); + list_remove( &gpu->entry ); + free( gpu ); + } } static BOOL update_display_cache_from_registry(void) { + char buffer[1024]; DWORD adapter_id, monitor_id, monitor_count = 0, size; - KEY_BASIC_INFORMATION key; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + KEY_BASIC_INFORMATION key, *key2 = (void *)buffer; + HKEY pci_key, device_key, gpu_key, prop_key; struct adapter *adapter; struct monitor *monitor, *monitor2; HANDLE mutex = NULL; NTSTATUS status; + struct gpu *gpu; BOOL ret; /* If user driver did initialize the registry, then exit */ + if (!enum_key && !(enum_key = reg_open_key( NULL, enum_keyW, sizeof(enum_keyW) ))) + return FALSE; if (!video_key && !(video_key = reg_open_key( NULL, devicemap_video_keyW, sizeof(devicemap_video_keyW) ))) return FALSE; @@ -1761,6 +1783,60 @@ static BOOL update_display_cache_from_registry(void) } } + if ((pci_key = reg_open_key( enum_key, pciW, sizeof(pciW) ))) + { + unsigned int i = 0; + + while (!NtEnumerateKey( pci_key, i++, KeyBasicInformation, key2, sizeof(buffer), &size )) + { + unsigned int j = 0; + + if (!(device_key = reg_open_key( pci_key, key2->Name, key2->NameLength ))) + continue; + + while (!NtEnumerateKey( device_key, j++, KeyBasicInformation, key2, sizeof(buffer), &size )) + { + if (!(gpu_key = reg_open_key( device_key, key2->Name, key2->NameLength ))) + continue; + + size = query_reg_value( gpu_key, class_guidW, value, sizeof(buffer) ); + if (size != sizeof(guid_devclass_displayW) + || wcscmp( (WCHAR *)value->Data, guid_devclass_displayW )) + { + NtClose( gpu_key ); + continue; + } + + if (!(gpu = calloc( 1, sizeof(*gpu) ))) + { + NtClose( gpu_key ); + continue; + } + + if ((prop_key = reg_open_key( gpu_key, devpropkey_gpu_luidW, + sizeof(devpropkey_gpu_luidW) ))) + { + if (query_reg_value( prop_key, NULL, value, sizeof(buffer) ) == sizeof(LUID)) + gpu->luid = *(const LUID *)value->Data; + NtClose( prop_key ); + } + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + { + if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) )) + gpu->adapter_count++; + } + + list_add_tail( &gpus, &gpu->entry ); + NtClose( gpu_key ); + } + + NtClose( device_key ); + } + + NtClose( pci_key ); + } + if ((ret = !list_empty( &adapters ) && !list_empty( &monitors ))) last_query_display_time = key.LastWriteTime.QuadPart; pthread_mutex_unlock( &display_lock );

1 0

Krzysztof Bogacki : win32u: Implement NtGdiDdDDIEnumAdapters2.
by Alexandre Julliard Feb. 15, 2024

Feb. 15, 2024

Module: wine Branch: master Commit: 223292da029ed1a807a00a46c5fc4cc1e7c2cc72 URL: https://gitlab.winehq.org/wine/wine/-/commit/223292da029ed1a807a00a46c5fc4c… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon Jan 15 19:16:23 2024 +0100 win32u: Implement NtGdiDdDDIEnumAdapters2. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/gdi32/tests/driver.c | 2 +- dlls/win32u/sysparams.c | 78 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f42595126c2..3a7944e9c02 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -199,7 +199,7 @@ static void test_D3DKMTEnumAdapters2(void) if (!pD3DKMTEnumAdapters2 || pD3DKMTEnumAdapters2(&enum_adapters_2_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTEnumAdapters2() is unavailable.\n"); + win_skip("D3DKMTEnumAdapters2() is unavailable.\n"); return; } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bb31ddc23b5..1573edf069f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6656,6 +6656,80 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD */ NTSTATUS WINAPI NtGdiDdDDIEnumAdapters2( D3DKMT_ENUMADAPTERS2 *desc ) { - FIXME(" (%p): stub\n", desc ); - return STATUS_PROCEDURE_NOT_FOUND; + D3DKMT_OPENADAPTERFROMLUID open_adapter_from_luid; + static const ULONG max_adapters = 34; + D3DKMT_CLOSEADAPTER close_adapter; + NTSTATUS status = STATUS_SUCCESS; + ULONG idx = 0, count; + struct gpu *gpu; + + TRACE( "(%p)\n", desc ); + + if (!desc) return STATUS_INVALID_PARAMETER; + + if (!desc->pAdapters) + { + desc->NumAdapters = max_adapters; + return STATUS_SUCCESS; + } + + if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; + + if ((count = list_count( &gpus )) > max_adapters) + { + WARN( "Too many adapters (%u), only up to %u can be enumerated.\n", + (unsigned int)count, (unsigned int)max_adapters ); + count = max_adapters; + } + + if (count > desc->NumAdapters) + { + status = STATUS_BUFFER_TOO_SMALL; + goto done; + } + + LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) + { + if (gpu->luid.LowPart || gpu->luid.HighPart) + { + open_adapter_from_luid.AdapterLuid = gpu->luid; + + /* give the GDI driver a chance to be notified about new adapter handle */ + if (NT_SUCCESS( NtGdiDdDDIOpenAdapterFromLuid( &open_adapter_from_luid ) )) + { + desc->pAdapters[idx].hAdapter = open_adapter_from_luid.hAdapter; + desc->pAdapters[idx].AdapterLuid = gpu->luid; + desc->pAdapters[idx].NumOfSources = gpu->adapter_count; + desc->pAdapters[idx].bPrecisePresentRegionsPreferred = FALSE; + idx += 1; + continue; + } + else + { + ERR( "Failed to open adapter %u from LUID.\n", (unsigned int)idx ); + } + } + else + { + ERR( "Adapter %u does not have a LUID.\n", (unsigned int)idx ); + } + + while (idx--) + { + close_adapter.hAdapter = desc->pAdapters[idx].hAdapter; + NtGdiDdDDICloseAdapter( &close_adapter ); + } + + memset( desc->pAdapters, 0, desc->NumAdapters * sizeof(D3DKMT_ADAPTERINFO) ); + status = STATUS_UNSUCCESSFUL; + break; + } + +done: + if (status == STATUS_SUCCESS) + desc->NumAdapters = idx; + + unlock_display_devices(); + + return status; }

1 0