Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K:NTUSER] Fix parameter check in NtUserGetAsyncKeyState. CORE-18124

Browse source
This commit is contained in:
Thomas Faber 2022-04-10 18:29:10 -04:00
parent 9c21d0c124
commit 885459d8b4
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
4 changed files with 84 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/rostests/apitests/win32nt/CMakeLists.txt
View file

@ -52,6 +52,7 @@ list(APPEND SOURCE
# ntuser/NtUserEnumDisplayMonitors.c
ntuser/NtUserEnumDisplaySettings.c
ntuser/NtUserFindExistingCursorIcon.c
ntuser/NtUserGetAsyncKeyState.c
ntuser/NtUserGetClassInfo.c
# ntuser/NtUserGetIconInfo.c
ntuser/NtUserGetKeyboardLayoutName.c

80
modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c Normal file
View file

@ -0,0 +1,80 @@
/*
* PROJECT: ReactOS Win32k tests
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
* PURPOSE: Test for NtUserGetAsyncKeyState
* COPYRIGHT: Copyright 2022 Thomas Faber (thomas.faber@reactos.org)
*/
#include <win32nt.h>
START_TEST(NtUserGetAsyncKeyState)
{
SHORT Ret;
DWORD Error;
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == 0xdeadbeef, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(1); // VK_LBUTTON
Error = GetLastError();
ok(Ret == 0 || Ret == 1, "Ret = %d\n", Ret);
ok(Error == 0xdeadbeef, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0xfe);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == 0xdeadbeef, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0xff);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == 0xdeadbeef, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0x100);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0x101);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0x10000000);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0x7fffffff);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(0x80000000);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(-2);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error);
SetLastError(0xdeadbeef);
Ret = NtUserGetAsyncKeyState(-1);
Error = GetLastError();
ok(Ret == 0, "Ret = %d\n", Ret);
ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error);
}

2
modules/rostests/apitests/win32nt/testlist.c
View file

@ -52,6 +52,7 @@ extern void func_NtUserCreateWindowEx(void);
//extern void func_NtUserEnumDisplayMonitors(void);
extern void func_NtUserEnumDisplaySettings(void);
extern void func_NtUserFindExistingCursorIcon(void);
extern void func_NtUserGetAsyncKeyState(void);
extern void func_NtUserGetClassInfo(void);
//extern void func_NtUserGetIconInfo(void);
extern void func_NtUserGetKeyboardLayoutName(void);
@ -120,6 +121,7 @@ const struct test winetest_testlist[] =
//{ "NtUserEnumDisplayMonitors", func_NtUserEnumDisplayMonitors },
{ "NtUserEnumDisplaySettings", func_NtUserEnumDisplaySettings },
{ "NtUserFindExistingCursorIcon", func_NtUserFindExistingCursorIcon },
{ "NtUserGetAsyncKeyState", func_NtUserGetAsyncKeyState },
{ "NtUserGetClassInfo", func_NtUserGetClassInfo },
//{ "NtUserGetIconInfo", func_NtUserGetIconInfo },
{ "NtUserGetKeyboardLayoutName", func_NtUserGetKeyboardLayoutName },

2
win32ss/user/ntuser/keyboard.c
View file

@ -635,7 +635,7 @@ NtUserGetAsyncKeyState(INT Key)
TRACE("Enter NtUserGetAsyncKeyState\n");
if (Key >= 0x100)
if (Key >= 0x100 || Key < 0)
{
EngSetLastError(ERROR_INVALID_PARAMETER);
ERR("Invalid parameter Key\n");