diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index b3615e8..9c131e4 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -284,12 +284,20 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD
 BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice,
                                  DWORD dwFlags )
 {
+  if (!lpDisplayDevice) {
+    return FALSE;
+  }
+  
+  if (i) {
     FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags);
-
-    if (i)
         return FALSE;
+  }
 
+  if (lpDevice) {
+    strcpyW(lpDisplayDevice->DeviceName, lpDevice);
+  } else {
     memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name));
+  }
     memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string));
   
     lpDisplayDevice->StateFlags =