From 1039b2829a264280493ba0fa979214fe024dc70c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 17:06:04 +0300 Subject: WORD -> uint16_t --- plugins/MirLua/Modules/WinAPI/src/winapi.cpp | 4 ++-- plugins/MirLua/src/Modules/m_database.cpp | 2 +- plugins/MirLua/src/Modules/m_hotkeys.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/MirLua') diff --git a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp index 9078149efe..cd7a031286 100755 --- a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp +++ b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp @@ -15,7 +15,7 @@ static HWND luaM_checkhwnd(lua_State *L, int idx) /***********************************************/ -EXTERN_C WINUSERAPI int WINAPI MessageBoxTimeoutA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, WORD wLanguageId, DWORD dwMilliseconds); +EXTERN_C WINUSERAPI int WINAPI MessageBoxTimeoutA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, uint16_t wLanguageId, DWORD dwMilliseconds); #define MB_TIMEDOUT 32000 @@ -815,7 +815,7 @@ static int global_CreateProcess(lua_State *L) si.dwFlags = (DWORD)luaL_checknumber(L, -1); } else if (!mir_strcmp(key, "wShowWindow")) { - si.wShowWindow = (WORD)luaL_checknumber(L, -1); + si.wShowWindow = (uint16_t)luaL_checknumber(L, -1); } else if (!mir_strcmp(key, "hStdInput")) { long h = (long)luaL_checknumber(L, -1); diff --git a/plugins/MirLua/src/Modules/m_database.cpp b/plugins/MirLua/src/Modules/m_database.cpp index 9708a3caea..d758475f86 100644 --- a/plugins/MirLua/src/Modules/m_database.cpp +++ b/plugins/MirLua/src/Modules/m_database.cpp @@ -538,7 +538,7 @@ static int db_WriteSetting(lua_State *L) break; case DBVT_BLOB: { - dbv.cpbVal = (WORD)lua_rawlen(L, 4); + dbv.cpbVal = (uint16_t)lua_rawlen(L, 4); dbv.pbVal = (uint8_t*)mir_calloc(dbv.cpbVal); for (int i = 0; i < dbv.cpbVal; i++) { lua_geti(L, 4, i + 1); diff --git a/plugins/MirLua/src/Modules/m_hotkeys.cpp b/plugins/MirLua/src/Modules/m_hotkeys.cpp index a6c35fdefb..0de4ffd94a 100644 --- a/plugins/MirLua/src/Modules/m_hotkeys.cpp +++ b/plugins/MirLua/src/Modules/m_hotkeys.cpp @@ -78,7 +78,7 @@ static int hotkeys_MakeHotkey(lua_State *L) } int vk = luaL_checknumber(L, 2); - WORD res = HOTKEYCODE(mod, vk); + uint16_t res = HOTKEYCODE(mod, vk); lua_pushinteger(L, res); return 1; -- cgit v1.2.3