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/BossKeyPlus/src/BossKey.cpp | 6 +++--- plugins/BossKeyPlus/src/Options.cpp | 6 +++--- plugins/BossKeyPlus/src/stdafx.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/BossKeyPlus/src') diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 869eef985e..45bb89b1ff 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -25,7 +25,7 @@ HWND g_hListenWindow, g_hDlgPass, hOldForegroundWindow; HWND_ITEM *g_pMirWnds; // a pretty simple linked list HMODULE hDwmApi; DWORD g_dwMirandaPID; -WORD g_wMask, g_wMaskAdv; +uint16_t g_wMask, g_wMaskAdv; bool g_bWindowHidden, g_fPassRequested, g_TrayIcon; char g_password[MAXPASSLEN + 1]; HKL oldLangID, oldLayout; @@ -436,7 +436,7 @@ INT_PTR BossKeyHideMiranda(WPARAM, LPARAM) // for service :) return 0; } -static wchar_t* HotkeyVkToName(WORD vkKey) +static wchar_t* HotkeyVkToName(uint16_t vkKey) { static wchar_t buf[32] = { 0 }; DWORD code = MapVirtualKey(vkKey, 0) << 16; @@ -474,7 +474,7 @@ static wchar_t* HotkeyVkToName(WORD vkKey) static wchar_t* GetBossKeyText(void) { - WORD wHotKey = db_get_w(0, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12)); + uint16_t wHotKey = db_get_w(0, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12)); uint8_t key = LOBYTE(wHotKey); uint8_t shift = HIBYTE(wHotKey); diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index 7d05135e10..ed3fe62384 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -33,7 +33,7 @@ class COptMainDlg : public CDlgBase void ComboboxSelState() { uint8_t bSelection = (uint8_t)m_cbStatusList.GetCurSel(); - WORD wMode = STATUS_ARR_TO_ID[bSelection]; + uint16_t wMode = STATUS_ARR_TO_ID[bSelection]; if (m_chkUsrDefMsg.GetState()) { wchar_t *ptszDefMsg = GetDefStatusMsg(wMode, nullptr); m_edtStatMsg.SetText(ptszDefMsg); @@ -128,7 +128,7 @@ public: bool OnApply() override { - WORD wMask = 0; + uint16_t wMask = 0; // we apply changes here // this plugin ain't that big, no need for a seperate routine @@ -244,7 +244,7 @@ public: bool OnApply() override { - WORD wMaskAdv = 0; + uint16_t wMaskAdv = 0; if (m_chkHideIfLock.GetState()) wMaskAdv |= OPT_HIDEIFLOCK; if (m_chkHideIfWinIdle.GetState()) diff --git a/plugins/BossKeyPlus/src/stdafx.h b/plugins/BossKeyPlus/src/stdafx.h index 2e8cd39402..0538d3cdb5 100644 --- a/plugins/BossKeyPlus/src/stdafx.h +++ b/plugins/BossKeyPlus/src/stdafx.h @@ -98,7 +98,7 @@ struct CMPlugin : public PLUGIN const unsigned STATUS_ARR_TO_ID[] = { ID_STATUS_OFFLINE, ID_STATUS_ONLINE, ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND, ID_STATUS_FREECHAT, ID_STATUS_INVISIBLE }; extern bool g_fOptionsOpen; // options dialog is open. be sure not to hide anything while we're there. -extern WORD g_wMask, g_wMaskAdv; +extern uint16_t g_wMask, g_wMaskAdv; extern bool g_bWindowHidden; int OptsDlgInit(WPARAM wParam, LPARAM lParam); -- cgit v1.2.3