From 1e803cb1df11a2750b2eac26df55907999ca226f Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sat, 28 Nov 2015 22:54:52 +0100 Subject: [PATCH] user32: Avoid shift overflow in nulldrv_GetKeyboardLayoutList. Signed-off-by: Gerald Pfeifer Signed-off-by: Alexandre Julliard --- dlls/user32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index dbac3efa0ec..201988c3ac9 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -216,7 +216,7 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) baselayout = GetUserDefaultLCID(); langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout)); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - baselayout |= 0xe001 << 16; /* IME */ + baselayout = MAKELONG( baselayout, 0xe001 ); /* IME */ else baselayout |= baselayout << 16; -- 2.11.4.GIT