[WIN32K]

Change wcsncpy to safe functions (part 2/x)

svn path=/trunk/; revision=51140

diff --git a/reactos/subsystems/win32/win32k/ntuser/display.c b/reactos/subsystems/win32/win32k/ntuser/display.c
index 7e0f25c..98b93d5 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/display.c
+++ b/reactos/subsystems/win32/win32k/ntuser/display.c
@@ -309,11 +309,11 @@ UserEnumDisplayDevices(
     ZwClose(hkey);
 
     /* Copy device name, device string and StateFlags */
-    wcsncpy(pdispdev->DeviceName, pGraphicsDevice->szWinDeviceName, 32);
-    wcsncpy(pdispdev->DeviceString, pGraphicsDevice->pwszDescription, 128);
+    RtlStringCbCopyW(pdispdev->DeviceName, sizeof(pdispdev->DeviceName), pGraphicsDevice->szWinDeviceName);
+    RtlStringCbCopyW(pdispdev->DeviceString, sizeof(pdispdev->DeviceString), pGraphicsDevice->pwszDescription);
     pdispdev->StateFlags = pGraphicsDevice->StateFlags;
-
     // FIXME: fill in DEVICE ID
+    pdispdev->DeviceID[0] = UNICODE_NULL;
 
     return STATUS_SUCCESS;
 }
@@ -339,7 +339,7 @@ NtUserEnumDisplayDevices(
     if (pustrDevice && iDevNum != 0)
         return FALSE;
 
-    dispdev.cb = sizeof(DISPLAY_DEVICEW);
+    dispdev.cb = sizeof(dispdev);
 
     if (pustrDevice)
     {