From 45c8cf7efdf5ebd231b3c3d4fbb56e3047c5c063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 20 Aug 2025 19:24:27 +0200 Subject: [PATCH] [WIN32SS:USER] UserEnumDisplayDevices: correctly report monitor device ids desk.cpl can now open Monitor properties. --- win32ss/user/ntuser/display.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index db08739227d..54f340a8254 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -349,9 +349,12 @@ UserEnumDisplayDevices( RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), L"\\"); - /* FIXME: DevicePropertyDriverKeyName string should be appended */ - pHardwareId[0] = UNICODE_NULL; - RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId); + dwLength = wcslen(pdispdev->DeviceID) + 1; + Status = IoGetDeviceProperty(pdo, + DevicePropertyDriverKeyName, + (ARRAYSIZE(pdispdev->DeviceID) - dwLength) * sizeof(WCHAR), + pdispdev->DeviceID + dwLength - 1, + &dwLength); } TRACE("Hardware ID: %ls\n", pdispdev->DeviceID);