From fb4a6e38c7c6e3db13fb07222d813ca979d17b18 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 2 Jan 2019 20:53:42 +0100 Subject: [PATCH 1/1] [WIN32SS:NTUSER] Remove some hardcoded buffer sizes + number of chars vs. bytes mixup. --- win32ss/user/ntuser/display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index e5116001491..8ef37c9c4b9 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -169,7 +169,7 @@ InitVideo(VOID) Status = RegOpenKey(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control", &hkey); if (NT_SUCCESS(Status)) { - cbValue = 256; + cbValue = sizeof(awcBuffer); Status = RegQueryValue(hkey, L"SystemStartOptions", REG_SZ, awcBuffer, &cbValue); if (NT_SUCCESS(Status)) { @@ -193,11 +193,11 @@ InitVideo(VOID) } /* Read the name of the VGA adapter */ - cbValue = 20; + cbValue = sizeof(awcDeviceName); Status = RegQueryValue(hkey, L"VgaCompatible", REG_SZ, awcDeviceName, &cbValue); if (NT_SUCCESS(Status)) { - iVGACompatible = _wtoi(&awcDeviceName[13]); + iVGACompatible = _wtoi(&awcDeviceName[sizeof("\\Device\\Video")-1]); ERR("VGA adapter = %lu\n", iVGACompatible); } -- 2.17.1