Gerald Pfeifer : user32: Avoid shift overflow in nulldrv_GetKeyboardLayoutList.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1e803cb1df11a2750b2eac26df55907999ca226f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1e803cb1df11a2750b2eac26df55907999ca226f

Author: Gerald Pfeifer <gerald at pfeifer.com>
Date:   Sat Nov 28 22:54:52 2015 +0100

user32: Avoid shift overflow in nulldrv_GetKeyboardLayoutList.

Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 dbac3ef..201988c 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;