Justin Chevrier : user32: EnumDisplayDevicesW, populate DeviceID member.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 64f2c03457bade771664293285840d57a5466bfc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=64f2c03457bade771664293285...

Author: Justin Chevrier 
Date:   Sun Jan 24 02:07:09 2010 -0500

user32: EnumDisplayDevicesW, populate DeviceID member.

---

dlls/user32/misc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index ca807f0..d5a23d1 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -277,6 +277,8 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd)
 static const WCHAR primary_device_name[] = {'\','\','.','\','D','I','S','P','L','A','Y','1',0};
 static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ',
                                               'S','y','s','t','e','m',0};
+static const WCHAR primary_device_deviceid[] = {'P','C','I','\','V','E','N','_','0','0','0','0','&',
+                                                'D','E','V','_','0','0','0','0',0};

/***********************************************************************
  *		EnumDisplayDevicesA (USER32.@)
@@ -331,7 +333,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lp
         DISPLAY_DEVICE_VGA_COMPATIBLE;

if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID))
-        lpDisplayDevice->DeviceID[0] = 0;
+        memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid));
     if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey))
         lpDisplayDevice->DeviceKey[0] = 0;