From 6642dbc470721468d44acdf27211ea53c35f9e3b Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Wed, 31 Jul 2019 22:24:01 +0900 Subject: [PATCH] [WIN32SS][NTGDI][NTUSER] Make gusLanguageID USHORT (#1776) Every language ID is an unsigned integer. - Make gusLanguageID unsigned. - Make the return value type of UserGetLanguageID unsigned. --- win32ss/gdi/ntgdi/misc.h | 4 ++-- win32ss/user/ntuser/main.c | 2 +- win32ss/user/ntuser/misc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index 12c7a73351d..eb25a53467e 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -21,9 +21,9 @@ extern BOOL APIENTRY IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave); extern HGDIOBJ StockObjects[]; -extern SHORT gusLanguageID; +extern USHORT gusLanguageID; -SHORT FASTCALL UserGetLanguageID(VOID); +USHORT FASTCALL UserGetLanguageID(VOID); PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID); diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 9e63ce8f22e..27964ba20fb 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -26,7 +26,7 @@ NTSTATUS GdiThreadDestroy(PETHREAD Thread); PSERVERINFO gpsi = NULL; // Global User Server Information. -SHORT gusLanguageID; +USHORT gusLanguageID; PPROCESSINFO ppiScrnSaver; PPROCESSINFO gppiList = NULL; diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 78408cac7a7..03707cd8829 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -91,7 +91,7 @@ UserGetLanguageToggle(VOID) return dwValue; } -SHORT +USHORT FASTCALL UserGetLanguageID(VOID) { @@ -137,7 +137,7 @@ UserGetLanguageID(VOID) ZwClose(KeyHandle); } TRACE("Language ID = %x\n",Ret); - return (SHORT) Ret; + return (USHORT) Ret; } HBRUSH -- 2.17.1