From acf689a97365ae9cebdd653f3edcfab4a13f8d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 24 Nov 2019 21:51:22 +0100 Subject: [PATCH] [WIN32K] Use RtlString* routines. --- win32ss/gdi/eng/device.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index e5f30aa0bba..7691aad92f5 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -83,8 +83,7 @@ EngpPopulateDeviceModeList( /* Some drivers like the VBox driver don't fill the dmDeviceName with the name of the display driver. So fix that here. */ - wcsncpy(pdm->dmDeviceName, pwsz, CCHDEVICENAME); - pdm->dmDeviceName[CCHDEVICENAME - 1] = 0; + RtlStringCbCopyW(pdm->dmDeviceName, sizeof(pdm->dmDeviceName), pwsz); } // FIXME: release the driver again until it's used? @@ -205,14 +204,17 @@ EngpRegisterGraphicsDevice( pGraphicsDevice->DeviceObject = pDeviceObject; pGraphicsDevice->FileObject = pFileObject; - /* Copy device name */ + /* Copy the device name */ RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, - sizeof(pGraphicsDevice->szNtDeviceName), - pustrDeviceName->Buffer, - pustrDeviceName->Length); + sizeof(pGraphicsDevice->szNtDeviceName), + pustrDeviceName->Buffer, + pustrDeviceName->Length); - /* Create a win device name (FIXME: virtual devices!) */ - swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); + /* Create a Win32 device name (FIXME: virtual devices!) */ + RtlStringCbPrintfW(pGraphicsDevice->szWinDeviceName, + sizeof(pGraphicsDevice->szWinDeviceName), + L"\\\\.\\DISPLAY%d", + (int)giDevNum); /* Allocate a buffer for the strings */ cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR);