Paul Gofman : win32u: Return edidManufactureId and edidProductCodeId from NtUserDisplayConfigGetDeviceInfo().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f00dcb4bd54ea0d39956692d34b67d7a35eee2bd
URL:    https://gitlab.winehq.org/wine/wine/-/commit/f00dcb4bd54ea0d39956692d34b67d7...

Author: Paul Gofman 
Date:   Mon Feb 13 14:56:10 2023 -0600

win32u: Return edidManufactureId and edidProductCodeId from NtUserDisplayConfigGetDeviceInfo().

---

dlls/win32u/sysparams.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 1ee2ad9b740..db875e57201 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -224,6 +224,7 @@ struct edid_monitor_info
 {
     unsigned int flags;
     /* MONITOR_INFO_HAS_MONITOR_ID */
+    unsigned short manufacturer, product_code;
     char monitor_id_string[8];
 };

@@ -467,6 +468,8 @@ static void get_monitor_info_from_edid( struct edid_monitor_info *info, const un
     }
     if (w) return;
     w = edid[10] | (edid[11] << 8); /* Product code, little endian. */
+    info->manufacturer = *(unsigned short *)(edid + 8);
+    info->product_code = w;
     sprintf( info->monitor_id_string + 3, "%04X", w );
     info->flags = MONITOR_INFO_HAS_MONITOR_ID;
     TRACE( "Monitor id %s.\n", info->monitor_id_string );
@@ -5732,6 +5735,12 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD
             snprintf( buffer, ARRAY_SIZE(buffer), "Display%u", monitor->output_id + 1 );
             asciiz_to_unicode( target_name->monitorFriendlyDeviceName, buffer );
             lstrcpyW( target_name->monitorDevicePath, monitor->dev.interface_name );
+            if (monitor->edid_info.flags & MONITOR_INFO_HAS_MONITOR_ID)
+            {
+                target_name->edidManufactureId = monitor->edid_info.manufacturer;
+                target_name->edidProductCodeId = monitor->edid_info.product_code;
+                target_name->flags.edidIdsValid = 1;
+            }
             ret = STATUS_SUCCESS;
             break;
         }