[PATCH 0/1] MR8111: win32u: Implement NtGdiDdDDIOpenAdapterFromDeviceName().

[Paul Gofman (＠gofman)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8111

[PATCH 1/1] win32u: Implement NtGdiDdDDIOpenAdapterFromDeviceName().

[Paul Gofman]

From: Paul Gofman <pgofman(a)codeweavers.com>

---
 dlls/gdi32/tests/driver.c |  4 +--
 dlls/win32u/d3dkmt.c      | 20 ---------------
 dlls/win32u/sysparams.c   | 51 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c
index ca67b40d860..d5380962129 100644
--- a/dlls/gdi32/tests/driver.c
+++ b/dlls/gdi32/tests/driver.c
@@ -907,7 +907,7 @@ static void test_D3DKMTOpenAdapterFromDeviceName_deviface(const GUID *devinterfa
         ok(ret, "Got unexpected ret %d, GetLastError() %lu.\n", ret, GetLastError());
 
         status = pD3DKMTOpenAdapterFromDeviceName(&device_name);
-        todo_wine_if(todo) ok(status == expected_status, "Got status %#lx, expected %#lx.\n", status, expected_status);
+        ok(status == expected_status, "Got status %#lx, expected %#lx.\n", status, expected_status);
 
         if (!status)
         {
@@ -919,7 +919,7 @@ static void test_D3DKMTOpenAdapterFromDeviceName_deviface(const GUID *devinterfa
             if (ret)
             {
                 ret = RtlEqualLuid( &luid, &device_name.AdapterLuid);
-                todo_wine ok(ret, "Luid does not match.\n");
+                ok(ret, "Luid does not match.\n");
             }
             else
             {
diff --git a/dlls/win32u/d3dkmt.c b/dlls/win32u/d3dkmt.c
index 49fb5e60c52..7fd4a4950da 100644
--- a/dlls/win32u/d3dkmt.c
+++ b/dlls/win32u/d3dkmt.c
@@ -168,26 +168,6 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc )
     return status;
 }
 
-/******************************************************************************
- *           NtGdiDdDDIOpenAdapterFromDeviceName    (win32u.@)
- */
-NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc )
-{
-    D3DKMT_OPENADAPTERFROMLUID desc_luid;
-    NTSTATUS status;
-
-    FIXME( "desc %p stub.\n", desc );
-
-    if (!desc || !desc->pDeviceName) return STATUS_INVALID_PARAMETER;
-
-    memset( &desc_luid, 0, sizeof(desc_luid) );
-    if ((status = NtGdiDdDDIOpenAdapterFromLuid( &desc_luid ))) return status;
-
-    desc->AdapterLuid = desc_luid.AdapterLuid;
-    desc->hAdapter = desc_luid.hAdapter;
-    return STATUS_SUCCESS;
-}
-
 static UINT get_vulkan_physical_devices( VkPhysicalDevice **devices )
 {
     UINT device_count;
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 7c5fbf66486..187bec9a6a8 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -7519,6 +7519,57 @@ NTSTATUS WINAPI NtGdiDdDDIEnumAdapters( D3DKMT_ENUMADAPTERS *desc )
     return status;
 }
 
+/******************************************************************************
+ *           NtGdiDdDDIOpenAdapterFromDeviceName    (win32u.@)
+ */
+NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc )
+{
+    D3DKMT_OPENADAPTERFROMLUID desc_luid;
+    unsigned int len, name_len = 0;
+    char name[MAX_PATH];
+    BOOL found = FALSE;
+    struct gpu *gpu;
+    NTSTATUS status;
+
+    TRACE( "desc %p.\n", desc );
+
+    if (!desc || !desc->pDeviceName) return STATUS_INVALID_PARAMETER;
+
+    for (len = 0; len < ARRAY_SIZE(name) && desc->pDeviceName[len]; ++len)
+    {
+        if ((name[len] = toupper( desc->pDeviceName[len] )) == '#')
+        {
+            name[len] = '\\';
+            name_len = len;
+        }
+    }
+    if (len == ARRAY_SIZE(name)) return STATUS_INVALID_PARAMETER;
+    name[len] = 0;
+    if (!name_len || strncmp( name, "\\\\?\\", 4 )) return STATUS_INVALID_PARAMETER;
+    if (strcmp( name + name_len + 1, guid_display_device_arrivalA )) return STATUS_INVALID_PARAMETER;
+
+    name_len -= 4;
+    if (!lock_display_devices( FALSE )) return STATUS_UNSUCCESSFUL;
+    LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry )
+    {
+        len = strlen( gpu->path );
+        if ((found = (len == name_len && !strncmp( name + 4, gpu->path, len ))))
+        {
+            desc_luid.AdapterLuid = gpu->luid;
+            break;
+        }
+    }
+    unlock_display_devices();
+
+    if (!found) return STATUS_INVALID_PARAMETER;
+    if ((status = NtGdiDdDDIOpenAdapterFromLuid( &desc_luid ))) return status;
+
+    desc->AdapterLuid = desc_luid.AdapterLuid;
+    desc->hAdapter = desc_luid.hAdapter;
+    TRACE( "%s -> %#x.\n", debugstr_w(desc->pDeviceName), desc_luid.hAdapter );
+    return STATUS_SUCCESS;
+}
+
 /* Find the Vulkan device UUID corresponding to a LUID */
 BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid )
 {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8111

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/win32u/sysparams.c:
> +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc )
> +{
> +    D3DKMT_OPENADAPTERFROMLUID desc_luid;
> +    unsigned int len, name_len = 0;
> +    char name[MAX_PATH];
> +    BOOL found = FALSE;
> +    struct gpu *gpu;
> +    NTSTATUS status;
> +
> +    TRACE( "desc %p.\n", desc );
> +
> +    if (!desc || !desc->pDeviceName) return STATUS_INVALID_PARAMETER;
> +
> +    for (len = 0; len < ARRAY_SIZE(name) && desc->pDeviceName[len]; ++len)
> +    {
> +        if ((name[len] = toupper( desc->pDeviceName[len] )) == '#')
> pDeviceName is a Unicode string. But then I guess we can assume it only contains ASCII characters.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8111#note_104169

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/win32u/sysparams.c:
> +        {
> +            name[len] = '\\';
> +            name_len = len;
> +        }
> +    }
> +    if (len == ARRAY_SIZE(name)) return STATUS_INVALID_PARAMETER;
> +    name[len] = 0;
> +    if (!name_len || strncmp( name, "\\\\?\\", 4 )) return STATUS_INVALID_PARAMETER;
> +    if (strcmp( name + name_len + 1, guid_display_device_arrivalA )) return STATUS_INVALID_PARAMETER;
> +
> +    name_len -= 4;
> +    if (!lock_display_devices( FALSE )) return STATUS_UNSUCCESSFUL;
> +    LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry )
> +    {
> +        len = strlen( gpu->path );
> +        if ((found = (len == name_len && !strncmp( name + 4, gpu->path, len ))))
> You can use `!strncmp( name + 4, gpu->path, name_len )` and avoid the `strlen(gpu->path)` call.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8111#note_104171

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/win32u/sysparams.c:
> return status;
>  }
>
> +/******************************************************************************
> + *           NtGdiDdDDIOpenAdapterFromDeviceName    (win32u.@)
> + */
> +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc )
> +{
> +    D3DKMT_OPENADAPTERFROMLUID desc_luid;
> +    unsigned int len, name_len = 0;
> +    char name[MAX_PATH];

Let's dynamically allocate `name`.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8111#note_104170