BYTE -> uint8_t

25 files changed, 171 insertions, 171 deletions

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 106fb2cd66..11de4bfef8 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -141,7 +141,7 @@ static int CB_InitDefaultButtons(WPARAM, LPARAM)
 
 void CMsgDialog::BB_InitDlgButtons()
 {
-	BYTE gap = DPISCALEX_S(g_plugin.getByte("ButtonsBarGap", 1));
+	uint8_t gap = DPISCALEX_S(g_plugin.getByte("ButtonsBarGap", 1));
 
 	RECT rcSplitter;
 	GetWindowRect(GetDlgItem(m_hwnd, IDC_SPLITTERY), &rcSplitter);
@@ -203,7 +203,7 @@ BOOL CMsgDialog::BB_SetButtonsPos()
 	if (!m_hwnd || !IsWindowVisible(m_hwnd))
 		return 0;
 
-	BYTE gap = DPISCALEX_S(g_plugin.getByte("ButtonsBarGap", 1));
+	uint8_t gap = DPISCALEX_S(g_plugin.getByte("ButtonsBarGap", 1));
 	bool showToolbar = !m_pContainer->m_flags.m_bHideToolbar;
 	bool bBottomToolbar = m_pContainer->m_flags.m_bBottomToolbar;
 
diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp
index 0dd7e49d4d..d7dd0eb440 100644
--- a/plugins/TabSRMM/src/chat_log.cpp
+++ b/plugins/TabSRMM/src/chat_log.cpp
@@ -69,7 +69,7 @@ static int EventToIndex(LOGINFO *lin)
 	return 0;

 }

 

-static BYTE EventToSymbol(LOGINFO *lin)

+static uint8_t EventToSymbol(LOGINFO *lin)

 {

 	switch (lin->iType) {

 	case GC_EVENT_MESSAGE:

diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp
index 8521de32fa..7720be1954 100644
--- a/plugins/TabSRMM/src/chat_options.cpp
+++ b/plugins/TabSRMM/src/chat_options.cpp
@@ -36,11 +36,11 @@ struct FontOptionsList
 	wchar_t *szDescr;

 	COLORREF defColour;

 	wchar_t *szDefFace;

-	BYTE     defCharset, defStyle;

+	uint8_t     defCharset, defStyle;

 	char     defSize;

 	COLORREF colour;

 	wchar_t  szFace[LF_FACESIZE];

-	BYTE     charset, style;

+	uint8_t     charset, style;

 	char     size;

 };

 

@@ -560,7 +560,7 @@ public:
 

 	void OnDestroy() override

 	{

-		BYTE b = treeCheck.GetItemState(hListHeading1, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0;

+		uint8_t b = treeCheck.GetItemState(hListHeading1, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0;

 		db_set_b(0, CHAT_MODULE, "Branch1Exp", b);

 

 		b = treeCheck.GetItemState(hListHeading2, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0;

@@ -681,7 +681,7 @@ public:
 

 		iLen = SendDlgItemMessage(m_hwnd, IDC_CHAT_SPIN3, UDM_GETPOS, 0, 0);

 		if (iLen > 0)

-			db_set_b(0, CHAT_MODULE, "NicklistRowDist", (BYTE)iLen);

+			db_set_b(0, CHAT_MODULE, "NicklistRowDist", (uint8_t)iLen);

 		else

 			db_unset(0, CHAT_MODULE, "NicklistRowDist");

 

@@ -881,7 +881,7 @@ public:
 		db_set_ws(0, CHAT_MODULE, "HighlightNames", ptrW(edtNick.GetText()));

 		db_set_ws(0, CHAT_MODULE, "HighlightWords", ptrW(edtText.GetText()));

 

-		BYTE dwFlags = (chkNick.GetState() ? CMUCHighlight::MATCH_NICKNAME : 0) | (chkText.GetState() ? CMUCHighlight::MATCH_TEXT : 0);

+		uint8_t dwFlags = (chkNick.GetState() ? CMUCHighlight::MATCH_NICKNAME : 0) | (chkText.GetState() ? CMUCHighlight::MATCH_TEXT : 0);

 		if (dwFlags & CMUCHighlight::MATCH_NICKNAME)

 			dwFlags |= (::IsDlgButtonChecked(m_hwnd, IDC_HIGHLIGHTNICKUID) ? CMUCHighlight::MATCH_UIN : 0);

 

diff --git a/plugins/TabSRMM/src/contactcache.h b/plugins/TabSRMM/src/contactcache.h
index f686d6d592..0f3471e725 100644
--- a/plugins/TabSRMM/src/contactcache.h
+++ b/plugins/TabSRMM/src/contactcache.h
@@ -59,7 +59,7 @@ class CContactCache : public MZeroedObject
 	wchar_t *m_szAccount;

 	wchar_t  m_szNick[80], m_szUIN[80];

 	wchar_t *m_szStatusMsg, *m_xStatusMsg, *m_ListeningInfo;

-	BYTE     m_xStatus;

+	uint8_t     m_xStatus;

 	DWORD    m_idleTS;

 	bool     m_isMeta;

 	bool     m_isValid;

@@ -101,7 +101,7 @@ public:
 	__forceinline LPCWSTR  getStatusMsg() const { return m_szStatusMsg; }

 	__forceinline LPCWSTR  getXStatusMsg() const { return m_xStatusMsg; }

 	__forceinline LPCWSTR  getListeningInfo() const { return m_ListeningInfo; }

-	__forceinline BYTE     getXStatusId() const { return m_xStatus; }

+	__forceinline uint8_t     getXStatusId() const { return m_xStatus; }

 

 	__forceinline DWORD    getSessionStart() const { return m_stats->started; }

 	__forceinline int      getSessionMsgCount() const { return (int)m_stats->messageCount; }

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 32d3aba8da..3412bf1e33 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -247,7 +247,7 @@ void TContainerData::Configure()
 

 	if (m_flags.m_bTransparent && fTransAllowed) {

 		DWORD trans = LOWORD(m_pSettings->dwTransparency);

-		SetLayeredWindowAttributes(m_hwnd, Skin->getColorKey(), (BYTE)trans, (/* m_bSkinned ? LWA_COLORKEY : */ 0) | (m_flags.m_bTransparent ? LWA_ALPHA : 0));

+		SetLayeredWindowAttributes(m_hwnd, Skin->getColorKey(), (uint8_t)trans, (/* m_bSkinned ? LWA_COLORKEY : */ 0) | (m_flags.m_bTransparent ? LWA_ALPHA : 0));

 	}

 

 	HMENU hSysmenu = GetSystemMenu(m_hwnd, FALSE);

@@ -1806,7 +1806,7 @@ panel_found:
 			BOOL fTransAllowed = !CSkin::m_skinEnabled || IsWinVerVistaPlus();

 

 			if (pContainer->m_flags.m_bTransparent && fTransAllowed) {

-				SetLayeredWindowAttributes(hwndDlg, Skin->getColorKey(), (BYTE)HIWORD(pContainer->m_pSettings->dwTransparency), (pContainer->m_flags.m_bTransparent ? LWA_ALPHA : 0));

+				SetLayeredWindowAttributes(hwndDlg, Skin->getColorKey(), (uint8_t)HIWORD(pContainer->m_pSettings->dwTransparency), (pContainer->m_flags.m_bTransparent ? LWA_ALPHA : 0));

 			}

 		}

 		pContainer->m_hwndSaved = nullptr;

@@ -1840,7 +1840,7 @@ panel_found:
 

 			if (pContainer->m_flags.m_bTransparent && fTransAllowed) {

 				DWORD trans = LOWORD(pContainer->m_pSettings->dwTransparency);

-				SetLayeredWindowAttributes(hwndDlg, Skin->getColorKey(), (BYTE)trans, (pContainer->m_flags.m_bTransparent ? LWA_ALPHA : 0));

+				SetLayeredWindowAttributes(hwndDlg, Skin->getColorKey(), (uint8_t)trans, (pContainer->m_flags.m_bTransparent ? LWA_ALPHA : 0));

 			}

 			if (pContainer->m_flags.m_bNeedsUpdateTitle) {

 				pContainer->m_flags.m_bNeedsUpdateTitle = false;

@@ -2077,7 +2077,7 @@ panel_found:
 					if (pContainer->m_isCloned && pContainer->m_hContactFrom != 0) {

 						HWND hDlg = GetTabWindow(pContainer->m_hwndTabs, TabCtrl_GetCurSel(pContainer->m_hwndTabs));

 						SendMessage(hDlg, DM_QUERYHCONTACT, 0, (LPARAM)&hContact);

-						db_set_b(hContact, SRMSGMOD_T, "splitmax", (BYTE)((wp.showCmd == SW_SHOWMAXIMIZED) ? 1 : 0));

+						db_set_b(hContact, SRMSGMOD_T, "splitmax", (uint8_t)((wp.showCmd == SW_SHOWMAXIMIZED) ? 1 : 0));

 

 						for (int i = 0; i < TabCtrl_GetItemCount(pContainer->m_hwndTabs); i++) {

 							if (hDlg = GetTabWindow(pContainer->m_hwndTabs, i)) {

@@ -2100,7 +2100,7 @@ panel_found:
 						mir_snprintf(szCName, "%s%dheight", CONTAINER_PREFIX, pContainer->m_iContainerIndex);

 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.bottom - wp.rcNormalPosition.top);

 

-						db_set_b(0, SRMSGMOD_T, "splitmax", (BYTE)((wp.showCmd == SW_SHOWMAXIMIZED) ? 1 : 0));

+						db_set_b(0, SRMSGMOD_T, "splitmax", (uint8_t)((wp.showCmd == SW_SHOWMAXIMIZED) ? 1 : 0));

 					}

 				}

 			}

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index c69982526f..975d3fa5d4 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -88,10 +88,10 @@ int TSAPI NEN_ReadOptions(NEN_OPTIONS *options)
 	options->iDelayOthers = db_get_dw(0, MODULE, OPT_DELAY_OTHERS, DEFAULT_DELAY);

 	options->iDelayErr = db_get_dw(0, MODULE, OPT_DELAY_ERR, DEFAULT_DELAY);

 	options->iDelayDefault = (int)DBGetContactSettingRangedWord(0, "Popup", "Seconds", SETTING_LIFETIME_DEFAULT, SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);

-	options->bShowHeaders = (BYTE)db_get_b(0, MODULE, OPT_SHOW_HEADERS, FALSE);

+	options->bShowHeaders = (uint8_t)db_get_b(0, MODULE, OPT_SHOW_HEADERS, FALSE);

 	options->bNoRSS = (BOOL)db_get_b(0, MODULE, OPT_NORSS, FALSE);

-	options->iDisable = (BYTE)db_get_b(0, MODULE, OPT_DISABLE, 0);

-	options->iMUCDisable = (BYTE)db_get_b(0, MODULE, OPT_MUCDISABLE, 0);

+	options->iDisable = (uint8_t)db_get_b(0, MODULE, OPT_DISABLE, 0);

+	options->iMUCDisable = (uint8_t)db_get_b(0, MODULE, OPT_MUCDISABLE, 0);

 	options->dwStatusMask = db_get_dw(0, MODULE, "statusmask", (DWORD)-1);

 	options->bWindowCheck = (BOOL)db_get_b(0, MODULE, OPT_WINDOWCHECK, 0);

 	options->bNoRSS = (BOOL)db_get_b(0, MODULE, OPT_NORSS, 0);

@@ -106,28 +106,28 @@ int TSAPI NEN_ReadOptions(NEN_OPTIONS *options)
 

 int TSAPI NEN_WriteOptions(NEN_OPTIONS *options)

 {

-	db_set_b(0, MODULE, OPT_PREVIEW, (BYTE)options->bPreview);

-	db_set_b(0, MODULE, OPT_COLDEFAULT_MESSAGE, (BYTE)options->bDefaultColorMsg);

-	db_set_b(0, MODULE, OPT_COLDEFAULT_OTHERS, (BYTE)options->bDefaultColorOthers);

-	db_set_b(0, MODULE, OPT_COLDEFAULT_ERR, (BYTE)options->bDefaultColorErr);

+	db_set_b(0, MODULE, OPT_PREVIEW, (uint8_t)options->bPreview);

+	db_set_b(0, MODULE, OPT_COLDEFAULT_MESSAGE, (uint8_t)options->bDefaultColorMsg);

+	db_set_b(0, MODULE, OPT_COLDEFAULT_OTHERS, (uint8_t)options->bDefaultColorOthers);

+	db_set_b(0, MODULE, OPT_COLDEFAULT_ERR, (uint8_t)options->bDefaultColorErr);

 	db_set_dw(0, MODULE, OPT_COLBACK_MESSAGE, (DWORD)options->colBackMsg);

 	db_set_dw(0, MODULE, OPT_COLTEXT_MESSAGE, (DWORD)options->colTextMsg);

 	db_set_dw(0, MODULE, OPT_COLBACK_OTHERS, (DWORD)options->colBackOthers);

 	db_set_dw(0, MODULE, OPT_COLTEXT_OTHERS, (DWORD)options->colTextOthers);

 	db_set_dw(0, MODULE, OPT_COLBACK_ERR, (DWORD)options->colBackErr);

 	db_set_dw(0, MODULE, OPT_COLTEXT_ERR, (DWORD)options->colTextErr);

-	db_set_b(0, MODULE, OPT_MASKACTL, (BYTE)options->maskActL);

-	db_set_b(0, MODULE, OPT_MASKACTR, (BYTE)options->maskActR);

-	db_set_b(0, MODULE, OPT_MASKACTTE, (BYTE)options->maskActTE);

-	db_set_b(0, MODULE, OPT_MERGEPOPUP, (BYTE)options->bMergePopup);

+	db_set_b(0, MODULE, OPT_MASKACTL, (uint8_t)options->maskActL);

+	db_set_b(0, MODULE, OPT_MASKACTR, (uint8_t)options->maskActR);

+	db_set_b(0, MODULE, OPT_MASKACTTE, (uint8_t)options->maskActTE);

+	db_set_b(0, MODULE, OPT_MERGEPOPUP, (uint8_t)options->bMergePopup);

 	db_set_dw(0, MODULE, OPT_DELAY_MESSAGE, (DWORD)options->iDelayMsg);

 	db_set_dw(0, MODULE, OPT_DELAY_OTHERS, (DWORD)options->iDelayOthers);

 	db_set_dw(0, MODULE, OPT_DELAY_ERR, (DWORD)options->iDelayErr);

-	db_set_b(0, MODULE, OPT_SHOW_HEADERS, (BYTE)options->bShowHeaders);

-	db_set_b(0, MODULE, OPT_DISABLE, (BYTE)options->iDisable);

-	db_set_b(0, MODULE, OPT_MUCDISABLE, (BYTE)options->iMUCDisable);

-	db_set_b(0, MODULE, OPT_WINDOWCHECK, (BYTE)options->bWindowCheck);

-	db_set_b(0, MODULE, OPT_NORSS, (BYTE)options->bNoRSS);

+	db_set_b(0, MODULE, OPT_SHOW_HEADERS, (uint8_t)options->bShowHeaders);

+	db_set_b(0, MODULE, OPT_DISABLE, (uint8_t)options->iDisable);

+	db_set_b(0, MODULE, OPT_MUCDISABLE, (uint8_t)options->iMUCDisable);

+	db_set_b(0, MODULE, OPT_WINDOWCHECK, (uint8_t)options->bWindowCheck);

+	db_set_b(0, MODULE, OPT_NORSS, (uint8_t)options->bNoRSS);

 	db_set_dw(0, MODULE, OPT_LIMITPREVIEW, options->iLimitPreview);

 	db_set_dw(0, MODULE, OPT_REMOVEMASK, options->dwRemoveMask);

 	db_set_b(0, MODULE, "disablenonmessage", options->bDisableNonMessage);

@@ -599,7 +599,7 @@ public:
 		// scan the tree view and obtain the options...

 		TreeViewToDB(eventOptions, lvItemsNEN, nullptr, nullptr);

 

-		db_set_b(0, CHAT_MODULE, "PopupStyle", (BYTE)g_Settings.iPopupStyle);

+		db_set_b(0, CHAT_MODULE, "PopupStyle", (uint8_t)g_Settings.iPopupStyle);

 		db_set_w(0, CHAT_MODULE, "PopupTimeout", g_Settings.iPopupTimeout);

 		db_set_dw(0, CHAT_MODULE, "PopupColorBG", g_Settings.crPUBkgColour = mucBack.GetColor());

 		db_set_dw(0, CHAT_MODULE, "PopupColorText", g_Settings.crPUTextColour = mucText.GetColor());

diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h
index 2d30779208..7a2c9bde03 100644
--- a/plugins/TabSRMM/src/functions.h
+++ b/plugins/TabSRMM/src/functions.h
@@ -85,7 +85,7 @@ LRESULT CALLBACK HPPKFSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
  * skinning engine

  */

 void  TSAPI DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor2,

-	BYTE transparent, BYTE FLG_GRADIENT, BYTE FLG_CORNER, DWORD BORDERSTYLE, CImageItem *imageItem);

+	uint8_t transparent, uint8_t FLG_GRADIENT, uint8_t FLG_CORNER, DWORD BORDERSTYLE, CImageItem *imageItem);

 // the cached message log icons

 

 void  TSAPI CacheMsgLogIcons();

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 8525ef002b..26ba257f8e 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -314,7 +314,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara
 				db_set_dw(m_hContact, SRMSGMOD_T, "sendformat", iNewLocalFormat);
 
 			if (PluginConfig.m_SendFormat != iOldGlobalSendFormat)
-				db_set_b(0, SRMSGMOD_T, "sendformat", (BYTE)PluginConfig.m_SendFormat);
+				db_set_b(0, SRMSGMOD_T, "sendformat", (uint8_t)PluginConfig.m_SendFormat);
 			if (iNewLocalFormat != iLocalFormat || PluginConfig.m_SendFormat != iOldGlobalSendFormat) {
 				m_SendFormat = M.GetDword(m_hContact, "sendformat", PluginConfig.m_SendFormat);
 				if (m_SendFormat == -1)          // per contact override to disable it..
@@ -376,7 +376,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara
 				db_unset(m_hContact, SRMSGMOD_T, "no_ack");
 			break;
 		}
-		db_set_b(m_hContact, SRMSGMOD_T, "no_ack", (BYTE)(m_sendMode & SMODE_NOACK ? 1 : 0));
+		db_set_b(m_hContact, SRMSGMOD_T, "no_ack", (uint8_t)(m_sendMode & SMODE_NOACK ? 1 : 0));
 		SetWindowPos(m_message.GetHwnd(), nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE);
 		if (m_sendMode & SMODE_MULTIPLE || m_sendMode & SMODE_CONTAINER) {
 			SetWindowPos(m_message.GetHwnd(), nullptr, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_FRAMECHANGED | SWP_NOZORDER |
@@ -480,7 +480,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara
 				DM_NotifyTyping(PROTOTYPE_SELFTYPING_OFF);
 				m_nTypeMode = PROTOTYPE_SELFTYPING_OFF;
 			}
-			g_plugin.setByte(m_hContact, SRMSGSET_TYPING, (BYTE)!iCurrentTypingMode);
+			g_plugin.setByte(m_hContact, SRMSGSET_TYPING, (uint8_t)!iCurrentTypingMode);
 		}
 		break;
 
diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 6c48b3957f..9dababbc3e 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -115,7 +115,7 @@ public:
 	BOOL        bUnicodeBuild;

 	HFONT       hFontCaption;

 	DWORD       m_LangPackCP;

-	BYTE        m_SmileyButtonOverride;

+	uint8_t        m_SmileyButtonOverride;

 	HICON       m_AnimTrayIcons[4];

 	BOOL        m_visualMessageSizeIndicator;

 	BOOL        m_autoSplit;

@@ -127,7 +127,7 @@ public:
 	COLORREF    m_ipBackgroundGradientHigh;

 	COLORREF    m_tbBackgroundHigh, m_tbBackgroundLow, m_fillColor, m_cRichBorders, m_genericTxtColor;

 	HGENMENU    m_hMenuItem;

-	BYTE        m_useAeroPeek;

+	uint8_t        m_useAeroPeek;

 

 	WINDOWPLACEMENT    m_GlobalContainerWpos;

 	NONCLIENTMETRICS   m_ncm;

diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp
index bc2c0cd206..7eee42f021 100644
--- a/plugins/TabSRMM/src/infopanel.cpp
+++ b/plugins/TabSRMM/src/infopanel.cpp
@@ -74,7 +74,7 @@ void CInfoPanel::setActive(const int newActive)
 

 void CInfoPanel::loadHeight()

 {

-	BYTE bSync = M.GetByte("syncAllPanels", 0);			// sync muc <> im panels

+	uint8_t bSync = M.GetByte("syncAllPanels", 0);			// sync muc <> im panels

 

 	m_height = M.GetDword(m_dat->m_hContact, "panelheight", -1);

 

@@ -101,7 +101,7 @@ void CInfoPanel::loadHeight()
 

 void CInfoPanel::saveHeight(bool fFlush)

 {

-	BYTE bSync = M.GetByte("syncAllPanels", 0);

+	uint8_t bSync = M.GetByte("syncAllPanels", 0);

 

 	if (m_height < 110 && m_height >= MIN_PANELHEIGHT) {          // only save valid panel splitter positions

 		if (!m_fPrivateHeight) {

@@ -218,10 +218,10 @@ void CInfoPanel::showHide() const
 

 bool CInfoPanel::getVisibility()

 {

-	BYTE bDefault = (m_dat->m_pContainer->m_flags.m_bInfoPanel) ? 1 : 0;

-	BYTE bContact = M.GetByte(m_dat->m_hContact, "infopanel", 0);

+	uint8_t bDefault = (m_dat->m_pContainer->m_flags.m_bInfoPanel) ? 1 : 0;

+	uint8_t bContact = M.GetByte(m_dat->m_hContact, "infopanel", 0);

 

-	BYTE visible = (bContact == 0 ? bDefault : (bContact == (BYTE)-1 ? 0 : 1));

+	uint8_t visible = (bContact == 0 ? bDefault : (bContact == (uint8_t)-1 ? 0 : 1));

 	setActive(visible);

 	return m_active;

 }

@@ -879,7 +879,7 @@ void CInfoPanel::showTip(UINT ctrlId, const wchar_t *pwszTip)
 			m_dat->m_cache->getStatusMsg() ? m_dat->m_cache->getStatusMsg() : TranslateT("No status message"));

 

 		DBVARIANT dbv = { 0 };

-		if (BYTE xStatus = m_dat->m_cache->getXStatusId()) {

+		if (uint8_t xStatus = m_dat->m_cache->getXStatusId()) {

 			wchar_t	*tszXStatusName = nullptr;

 			if (0 == db_get_ws(m_dat->m_cache->getContact(), m_dat->m_cache->getProto(), "XStatusName", &dbv))

 				tszXStatusName = dbv.pwszVal;

@@ -1063,8 +1063,8 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L
 			::SendDlgItemMessage(hwnd, IDC_PANELVISIBILITY, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always off"));

 			::SendDlgItemMessage(hwnd, IDC_PANELVISIBILITY, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always on"));

 

-			BYTE v = M.GetByte(m_dat->m_hContact, "infopanel", 0);

-			::SendDlgItemMessage(hwnd, IDC_PANELVISIBILITY, CB_SETCURSEL, (WPARAM)(v == 0 ? 0 : (v == (BYTE)-1 ? 1 : 2)), 0);

+			uint8_t v = M.GetByte(m_dat->m_hContact, "infopanel", 0);

+			::SendDlgItemMessage(hwnd, IDC_PANELVISIBILITY, CB_SETCURSEL, (WPARAM)(v == 0 ? 0 : (v == (uint8_t)-1 ? 1 : 2)), 0);

 

 			::SendDlgItemMessage(hwnd, IDC_PANELSIZE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Use default size"));

 			::SendDlgItemMessage(hwnd, IDC_PANELSIZE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Use private size"));

@@ -1080,7 +1080,7 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L
 				::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Use global setting"));

 				::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Show always (if present)"));

 				::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Never show it at all"));

-				::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_SETCURSEL, (v == (BYTE)-1 ? 0 : (v == 1 ? 1 : 2)), 0);

+				::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_SETCURSEL, (v == (uint8_t)-1 ? 0 : (v == 1 ? 1 : 2)), 0);

 			}

 			else Utils::enableDlgControl(hwnd, IDC_PANELPICTUREVIS, false);

 		}

@@ -1141,12 +1141,12 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L
 

 			case IDC_PANELPICTUREVIS:

 				{

-					BYTE	vOld = db_get_b(m_dat->m_hContact, SRMSGMOD_T, "hideavatar", -1);

+					uint8_t	vOld = db_get_b(m_dat->m_hContact, SRMSGMOD_T, "hideavatar", -1);

 					LRESULT iResult = ::SendDlgItemMessage(hwnd, IDC_PANELPICTUREVIS, CB_GETCURSEL, 0, 0);

 

-					BYTE vNew = (iResult == 0 ? (BYTE)-1 : (iResult == 1 ? 1 : 0));

+					uint8_t vNew = (iResult == 0 ? (uint8_t)-1 : (iResult == 1 ? 1 : 0));

 					if (vNew != vOld) {

-						if (vNew == (BYTE)-1)

+						if (vNew == (uint8_t)-1)

 							db_unset(m_dat->m_hContact, SRMSGMOD_T, "hideavatar");

 						else

 							db_set_b(m_dat->m_hContact, SRMSGMOD_T, "hideavatar", vNew);

@@ -1160,10 +1160,10 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L
 

 			case IDC_PANELVISIBILITY:

 				{

-					BYTE	vOld = db_get_b(m_dat->m_hContact, SRMSGMOD_T, "infopanel", 0);

+					uint8_t	vOld = db_get_b(m_dat->m_hContact, SRMSGMOD_T, "infopanel", 0);

 					LRESULT iResult = ::SendDlgItemMessage(hwnd, IDC_PANELVISIBILITY, CB_GETCURSEL, 0, 0);

 

-					BYTE vNew = (iResult == 0 ? 0 : (iResult == 1 ? (BYTE)-1 : 1));

+					uint8_t vNew = (iResult == 0 ? 0 : (iResult == 1 ? (uint8_t)-1 : 1));

 					if (vNew != vOld) {

 						db_set_b(m_dat->m_hContact, SRMSGMOD_T, "infopanel", vNew);

 						getVisibility();

diff --git a/plugins/TabSRMM/src/mim.h b/plugins/TabSRMM/src/mim.h
index c2d85f00b4..84765e9945 100644
--- a/plugins/TabSRMM/src/mim.h
+++ b/plugins/TabSRMM/src/mim.h
@@ -54,7 +54,7 @@ typedef HANDLE(WINAPI *BBP)(HDC, RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC
 typedef HRESULT(WINAPI *EBP)(HANDLE, BOOL);

 typedef HRESULT(WINAPI *BPI)(void);

 typedef HRESULT(WINAPI *BPU)(void);

-typedef HRESULT(WINAPI *BPSA)(HANDLE, const RECT *, BYTE);

+typedef HRESULT(WINAPI *BPSA)(HANDLE, const RECT *, uint8_t);

 //kernel32

 typedef int		(WINAPI *GLIX)(LPCWSTR, LCTYPE, LPCWSTR, int);

 

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 5e73f4b7fa..cf7c408d2e 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -93,7 +93,7 @@ LRESULT CALLBACK HPPKFSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 					wParam != VK_UP    && wParam != VK_DOWN && wParam != VK_LEFT &&

 					wParam != VK_RIGHT && wParam != VK_TAB  && wParam != VK_SPACE) {

 					SetFocus(GetDlgItem(mwdat->GetHwnd(), IDC_SRMM_MESSAGE));

-					keybd_event((BYTE)wParam, (BYTE)MapVirtualKey(wParam, 0), KEYEVENTF_EXTENDEDKEY | 0, 0);

+					keybd_event((uint8_t)wParam, (uint8_t)MapVirtualKey(wParam, 0), KEYEVENTF_EXTENDEDKEY | 0, 0);

 					return 0;

 				}

 				break;

@@ -943,7 +943,7 @@ void CMsgDialog::onClick_Quote(CCtrlButton*)
 		DBEVENTINFO dbei = {};

 		dbei.cbBlob = db_event_getBlobSize(hDBEvent);

 		wchar_t *szText = (wchar_t*)mir_alloc((dbei.cbBlob + 1) * sizeof(wchar_t));   // URLs are made one char bigger for crlf

-		dbei.pBlob = (BYTE*)szText;

+		dbei.pBlob = (uint8_t*)szText;

 		db_event_get(hDBEvent, &dbei);

 		int iSize = int(mir_strlen((char*)dbei.pBlob)) + 1;

 

@@ -1964,13 +1964,13 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 

 		KbdState(isShift, isCtrl, isAlt);

 		if ((wParam >= '0' && wParam <= '9') && isAlt) {      // ALT-1 -> ALT-0 direct tab selection

-			BYTE bChar = (BYTE)wParam;

+			uint8_t bChar = (uint8_t)wParam;

 

 			int iIndex;

 			if (bChar == '0')

 				iIndex = 10;

 			else

-				iIndex = bChar - (BYTE)'0';

+				iIndex = bChar - (uint8_t)'0';

 			m_pContainer->SelectTab(DM_SELECT_BY_INDEX, iIndex);

 			return 0;

 		}

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index e1e16473fe..e23e5e8858 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -560,8 +560,8 @@ void CMsgDialog::FlashTab(bool bInvertMode)
 
 bool CMsgDialog::GetAvatarVisibility()
 {
-	BYTE bAvatarMode = m_pContainer->m_avatarMode;
-	BYTE bOwnAvatarMode = m_pContainer->m_ownAvatarMode;
+	uint8_t bAvatarMode = m_pContainer->m_avatarMode;
+	uint8_t bOwnAvatarMode = m_pContainer->m_ownAvatarMode;
 	char hideOverride = (char)M.GetByte(m_hContact, "hideavatar", -1);
 
 	// infopanel visible, consider own avatar display
@@ -722,7 +722,7 @@ void CMsgDialog::GetSendFormat()
 
 HICON CMsgDialog::GetXStatusIcon() const
 {
-	BYTE xStatus = m_cache->getXStatusId();
+	uint8_t xStatus = m_cache->getXStatusId();
 	if (xStatus == 0)
 		return nullptr;
 
@@ -1126,7 +1126,7 @@ int CMsgDialog::MsgWindowMenuHandler(int selection, int menuId)
 		case ID_VISIBILITY_HIDDENFORTHISCONTACT:
 		case ID_VISIBILITY_VISIBLEFORTHISCONTACT:
 			{
-				BYTE avOverrideMode;
+				uint8_t avOverrideMode;
 				if (selection == ID_VISIBILITY_DEFAULT)
 					avOverrideMode = -1;
 				else if (selection == ID_VISIBILITY_VISIBLEFORTHISCONTACT)
@@ -1143,7 +1143,7 @@ int CMsgDialog::MsgWindowMenuHandler(int selection, int menuId)
 
 		case ID_PICMENU_ALWAYSKEEPTHEBUTTONBARATFULLWIDTH:
 			PluginConfig.m_bAlwaysFullToolbarWidth = !PluginConfig.m_bAlwaysFullToolbarWidth;
-			db_set_b(0, SRMSGMOD_T, "alwaysfulltoolbar", (BYTE)PluginConfig.m_bAlwaysFullToolbarWidth);
+			db_set_b(0, SRMSGMOD_T, "alwaysfulltoolbar", (uint8_t)PluginConfig.m_bAlwaysFullToolbarWidth);
 			Srmm_Broadcast(DM_CONFIGURETOOLBAR, 0, 1);
 			break;
 
@@ -1713,7 +1713,7 @@ void CMsgDialog::ShowPopupMenu(const CCtrlBase &pCtrl, POINT pt)
 		break;
 	case ID_EDITOR_SHOWMESSAGELENGTHINDICATOR:
 		PluginConfig.m_visualMessageSizeIndicator = !PluginConfig.m_visualMessageSizeIndicator;
-		db_set_b(0, SRMSGMOD_T, "msgsizebar", (BYTE)PluginConfig.m_visualMessageSizeIndicator);
+		db_set_b(0, SRMSGMOD_T, "msgsizebar", (uint8_t)PluginConfig.m_visualMessageSizeIndicator);
 		Srmm_Broadcast(DM_CONFIGURETOOLBAR, 0, 0);
 		Resize();
 		if (m_pContainer->m_hwndStatus)
@@ -2358,7 +2358,7 @@ void CMsgDialog::UpdateWindowState(UINT msg)
 	if (msg == WM_ACTIVATE) {
 		if (m_pContainer->m_flags.m_bTransparent) {
 			DWORD trans = LOWORD(m_pContainer->m_pSettings->dwTransparency);
-			SetLayeredWindowAttributes(m_pContainer->m_hwnd, CSkin::m_ContainerColorKey, (BYTE)trans, (m_pContainer->m_flags.m_bTransparent ? LWA_ALPHA : 0));
+			SetLayeredWindowAttributes(m_pContainer->m_hwnd, CSkin::m_ContainerColorKey, (uint8_t)trans, (m_pContainer->m_flags.m_bTransparent ? LWA_ALPHA : 0));
 		}
 	}
 
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 90614c249f..41ad17acfc 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -732,7 +732,7 @@ public:
 		dbei.eventType = (iIndex == 7) ? EVENTTYPE_ERRMSG : dbei.eventType;

 		if (dbei.eventType == EVENTTYPE_ERRMSG)

 			dbei.szModule = (char *)L"Sample error message";

-		dbei.pBlob = (iIndex == 6) ? (BYTE *)"is now offline (was online)" : (BYTE *)"The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.";

+		dbei.pBlob = (iIndex == 6) ? (uint8_t *)"is now offline (was online)" : (uint8_t *)"The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.";

 		dbei.cbBlob = (int)mir_strlen((char *)dbei.pBlob) + 1;

 		dbei.flags = (iIndex == 1 || iIndex == 3 || iIndex == 5) ? DBEF_SENT : 0;

 		dbei.flags |= (m_bRtl ? DBEF_RTL : 0);

@@ -1017,7 +1017,7 @@ class COptTypingDlg : public CDlgBase
 

 	void RebuildList(CCtrlClc* = nullptr)

 	{

-		BYTE defType = g_plugin.getByte(SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW);

+		uint8_t defType = g_plugin.getByte(SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW);

 		if (hItemNew && defType)

 			m_clist.SetCheck(hItemNew, true);

 

@@ -1104,14 +1104,14 @@ public:
 	bool OnApply() override

 	{

 		SaveList();

-		g_plugin.setByte(SRMSGSET_SHOWTYPING, (BYTE)IsDlgButtonChecked(m_hwnd, IDC_SHOWNOTIFY));

-		g_plugin.setByte(SRMSGSET_SHOWTYPINGWINFLASH, (BYTE)IsDlgButtonChecked(m_hwnd, IDC_TYPEFLASHWIN));

-		g_plugin.setByte(SRMSGSET_SHOWTYPINGNOWINOPEN, (BYTE)IsDlgButtonChecked(m_hwnd, IDC_TYPENOWIN));

-		g_plugin.setByte(SRMSGSET_SHOWTYPINGWINOPEN, (BYTE)IsDlgButtonChecked(m_hwnd, IDC_TYPEWIN));

-		g_plugin.setByte(SRMSGSET_SHOWTYPINGCLIST, (BYTE)IsDlgButtonChecked(m_hwnd, IDC_NOTIFYTRAY));

-		g_plugin.setByte("ShowTypingBalloon", (BYTE)IsDlgButtonChecked(m_hwnd, IDC_NOTIFYBALLOON));

-		g_plugin.setByte("ShowTypingPopup", (BYTE)IsDlgButtonChecked(m_hwnd, IDC_NOTIFYPOPUP));

-		db_set_b(0, SRMSGMOD_T, "MTN_PopupMode", (BYTE)SendDlgItemMessage(m_hwnd, IDC_MTN_POPUPMODE, CB_GETCURSEL, 0, 0));

+		g_plugin.setByte(SRMSGSET_SHOWTYPING, (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_SHOWNOTIFY));

+		g_plugin.setByte(SRMSGSET_SHOWTYPINGWINFLASH, (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_TYPEFLASHWIN));

+		g_plugin.setByte(SRMSGSET_SHOWTYPINGNOWINOPEN, (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_TYPENOWIN));

+		g_plugin.setByte(SRMSGSET_SHOWTYPINGWINOPEN, (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_TYPEWIN));

+		g_plugin.setByte(SRMSGSET_SHOWTYPINGCLIST, (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_NOTIFYTRAY));

+		g_plugin.setByte("ShowTypingBalloon", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_NOTIFYBALLOON));

+		g_plugin.setByte("ShowTypingPopup", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_NOTIFYPOPUP));

+		db_set_b(0, SRMSGMOD_T, "MTN_PopupMode", (uint8_t)SendDlgItemMessage(m_hwnd, IDC_MTN_POPUPMODE, CB_GETCURSEL, 0, 0));

 		PluginConfig.reloadSettings();

 		return true;

 	}

@@ -1420,11 +1420,11 @@ public:
 

 struct

 {

-	BYTE sameAsFlags, sameAs;

+	uint8_t sameAsFlags, sameAs;

 	COLORREF colour;

 	char size;

-	BYTE style;

-	BYTE charset;

+	uint8_t style;

+	uint8_t charset;

 	char szFace[LF_FACESIZE];

 }

 static fontSettings[MSGDLGFONTCOUNT + 1];

@@ -1450,18 +1450,18 @@ struct OptCheckBox
 	DWORD defValue;		// should be full combined value for masked items!

 	DWORD dwBit;

 

-	BYTE dbType;

+	uint8_t dbType;

 	char *dbModule;

 	char *dbSetting;

 

-	BYTE valueType;

+	uint8_t valueType;

 	union

 	{

 		void *pValue;

 

 		char *charValue;

 		int *intValue;

-		BYTE *byteValue;

+		uint8_t *byteValue;

 		DWORD *dwordValue;

 		BOOL *boolValue;

 	};

@@ -1514,7 +1514,7 @@ void OptCheckBox_Save(HWND hwnd, OptCheckBox *cb)
 

 	switch (cb->dbType) {

 	case DBVT_BYTE:

-		db_set_b(0, cb->dbModule, cb->dbSetting, (BYTE)value);

+		db_set_b(0, cb->dbModule, cb->dbSetting, (uint8_t)value);

 		break;

 	case DBVT_WORD:

 		db_set_w(0, cb->dbModule, cb->dbSetting, (WORD)value);

@@ -1532,7 +1532,7 @@ void OptCheckBox_Save(HWND hwnd, OptCheckBox *cb)
 		*cb->intValue = (int)value;

 		break;

 	case CBVT_BYTE:

-		*cb->byteValue = (BYTE)value;

+		*cb->byteValue = (uint8_t)value;

 		break;

 	case CBVT_DWORD:

 		*cb->dwordValue = (DWORD)value;

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 78fb6bfda9..e1d57835c1 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -325,7 +325,7 @@ struct TContainerData : public MZeroedObject
 	SIZE	   m_szOldToolbarSize;

 	SIZE     m_oldSize, m_preSIZE;

 	WORD	   m_avatarMode, m_ownAvatarMode;

-	BYTE	   m_bTBRenderingMode;

+	uint8_t	   m_bTBRenderingMode;

 	TLogTheme m_theme;

 	CMenuBar *m_pMenuBar;

 	CSideBar *m_pSideBar;

@@ -483,7 +483,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	HICON   m_hSmileyIcon;

 	HWND    m_hwndContactPic, m_hwndPanelPic, m_hwndPanelPicParent;

 	UINT    m_bbLSideWidth, m_bbRSideWidth;

-	BYTE    kstate[256];

+	uint8_t    kstate[256];

 			  

 	RECT    m_rcNick, m_rcUIN, m_rcStatus, m_rcPic;

 	int     m_originalSplitterY;

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index ed73a491b9..a9ec1ba160 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -62,7 +62,7 @@ struct CSendLaterJob : public MZeroedObject
 	DWORD    dwFlags;

 	int      iSendCount;          // # of times we tried to send it...

 	bool     fSuccess, fFailed;

-	BYTE     bCode;               // error/progress code (for the UI)

+	uint8_t     bCode;               // error/progress code (for the UI)

 

 	// returns true if this job is persistent (saved to the database).

 	// such a job will survive a restart of Miranda

@@ -472,7 +472,7 @@ public:
 

 		LVITEM lvItem = { 0 };

 

-		BYTE bCode = '-';

+		uint8_t bCode = '-';

 		unsigned uIndex = 0;

 		for (auto &p : g_sendLaterJobList) {

 			CContactCache *c = CContactCache::getContactCache(p->hContact);

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index cb52ecc8a8..0860d7e54d 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -346,7 +346,7 @@ void SendQueue::logError(CMsgDialog *dat, int iSendJobIndex, const wchar_t *szEr
 	DBEVENTINFO	dbei = {};
 	dbei.eventType = EVENTTYPE_ERRMSG;
 	if (iSendJobIndex >= 0) {
-		dbei.pBlob = (BYTE *)m_jobs[iSendJobIndex].szSendBuffer;
+		dbei.pBlob = (uint8_t *)m_jobs[iSendJobIndex].szSendBuffer;
 		iMsgLen = mir_strlen(m_jobs[iSendJobIndex].szSendBuffer) + 1;
 	}
 	else {
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 4299063adc..a419b2f617 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -107,7 +107,7 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES
 	DWORD dwFlags;

 	RECT rcDestination;

 	RECT rcSource;

-	BYTE opacity;

+	uint8_t opacity;

 	BOOL fVisible;

 	BOOL fSourceClientAreaOnly;

 } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES;

diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp
index 5c9de4d029..bb8b9e3c2e 100644
--- a/plugins/TabSRMM/src/tabctrl.cpp
+++ b/plugins/TabSRMM/src/tabctrl.cpp
@@ -540,7 +540,7 @@ static void DrawThemesXpTabItem(HDC pDC, RECT *rcItem, UINT uiFlag, TabControlDa
 		// to "flip" the tab item.

 		BitBlt(dcMem, 0, 0, szBmp.cx, szBmp.cy, pDC, rcItem->left, rcItem->top, SRCCOPY);

 

-		BYTE *pcImg1 = (BYTE*)mir_alloc(nSzBuffPS);

+		uint8_t *pcImg1 = (uint8_t*)mir_alloc(nSzBuffPS);

 		if (pcImg1) {

 			GetDIBits(pDC, bmpMem, nStart, szBmp.cy - nLenSub, pcImg1, &biOut, DIB_RGB_COLORS);

 			bihOut->biHeight = -szBmp.cy; 				// to mirror bitmap is eough to use negative height between Get/SetDIBits

@@ -569,7 +569,7 @@ static void DrawThemesXpTabItem(HDC pDC, RECT *rcItem, UINT uiFlag, TabControlDa
 

 		CSkin::FillBack(hdcTemp, &rcTemp);

 		DrawThemesPart(tabdat, hdcTemp, 9, 0, &rcTemp);	// TABP_PANE id = 9

-		pcImg = (BYTE *)mir_alloc(nSzBuffPS);

+		pcImg = (uint8_t *)mir_alloc(nSzBuffPS);

 		if (pcImg) {									// get bits:

 			GetDIBits(hdcTemp, hbmTemp, nStart, 50 - nLenSub, pcImg, &biOut, DIB_RGB_COLORS);

 			bihOut->biHeight = -50;

@@ -599,7 +599,7 @@ static void DrawThemesXpTabItem(HDC pDC, RECT *rcItem, UINT uiFlag, TabControlDa
 	}

 

 	bihOut->biHeight = szBmp.cy;

-	pcImg = (BYTE *)mir_alloc(nSzBuffPS);

+	pcImg = (uint8_t *)mir_alloc(nSzBuffPS);

 

 	if (pcImg) {									// get bits:

 		GetDIBits(pDC, bmpMem, nStart, szBmp.cy - nLenSub, pcImg, &biOut, DIB_RGB_COLORS);

diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp
index a7437e1a62..864ce0cfed 100644
--- a/plugins/TabSRMM/src/themeio.cpp
+++ b/plugins/TabSRMM/src/themeio.cpp
@@ -130,7 +130,7 @@ static void TSAPI LoadLogfontFromINI(int i, char *szKey, LOGFONTW *lf, COLORREF
 		if (i == MSGFONTID_SYMBOLS_IN || i == MSGFONTID_SYMBOLS_OUT)

 			lf->lfCharSet = SYMBOL_CHARSET;

 		else

-			lf->lfCharSet = (BYTE)GetPrivateProfileIntA(szKey, "Set", DEFAULT_CHARSET, szIniFilename);

+			lf->lfCharSet = (uint8_t)GetPrivateProfileIntA(szKey, "Set", DEFAULT_CHARSET, szIniFilename);

 		lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

 		lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

 		lf->lfQuality = DEFAULT_QUALITY;

@@ -282,7 +282,7 @@ void TSAPI ReadThemeFromINI(const wchar_t *szIniFilenameT, TContainerData *dat,
 				db_set_dw(0, szModule, szTemp, GetPrivateProfileIntA(szAppname, "Color", GetSysColor(COLOR_WINDOWTEXT), szIniFilename));

 

 				mir_snprintf(szTemp, "Font%dSty", firstIndex + i);

-				db_set_b(0, szModule, szTemp, (BYTE)(GetPrivateProfileIntA(szAppname, "Style", 0, szIniFilename)));

+				db_set_b(0, szModule, szTemp, (uint8_t)(GetPrivateProfileIntA(szAppname, "Style", 0, szIniFilename)));

 

 				mir_snprintf(szTemp, "Font%dSize", firstIndex + i);

 				bSize = (char)GetPrivateProfileIntA(szAppname, "Size", -10, szIniFilename);

@@ -294,7 +294,7 @@ void TSAPI ReadThemeFromINI(const wchar_t *szIniFilenameT, TContainerData *dat,
 				charset = GetPrivateProfileIntA(szAppname, "Set", 0, szIniFilename);

 				if (i == MSGFONTID_SYMBOLS_IN || i == MSGFONTID_SYMBOLS_OUT)

 					charset = 0;

-				db_set_b(0, szModule, szTemp, (BYTE)charset);

+				db_set_b(0, szModule, szTemp, (uint8_t)charset);

 			}

 			n++;

 		}

@@ -311,8 +311,8 @@ void TSAPI ReadThemeFromINI(const wchar_t *szIniFilenameT, TContainerData *dat,
 				for (auto &it : _extSettings_v5)

 					db_set_dw(0, it.szDbModule, it.szDbSetting, GetPrivateProfileIntA(it.szIniSection, it.szIniName, it.dwDef, szIniFilename));

 

-			db_set_b(0, SRMSGMOD_T, "wantvgrid", (BYTE)(GetPrivateProfileIntA("Message Log", "VGrid", 0, szIniFilename)));

-			db_set_b(0, SRMSGMOD_T, "extramicrolf", (BYTE)(GetPrivateProfileIntA("Message Log", "ExtraMicroLF", 0, szIniFilename)));

+			db_set_b(0, SRMSGMOD_T, "wantvgrid", (uint8_t)(GetPrivateProfileIntA("Message Log", "VGrid", 0, szIniFilename)));

+			db_set_b(0, SRMSGMOD_T, "extramicrolf", (uint8_t)(GetPrivateProfileIntA("Message Log", "ExtraMicroLF", 0, szIniFilename)));

 

 			for (i = 0; i < CUSTOM_COLORS; i++) {

 				mir_snprintf(szTemp, "cc%d", i + 1);

@@ -353,8 +353,8 @@ void TSAPI ReadThemeFromINI(const wchar_t *szIniFilenameT, TContainerData *dat,
 		dat->m_theme.inputbg = GetPrivateProfileIntA("Message Log", "InputBG", RGB(224, 224, 224), szIniFilename);

 		dat->m_theme.hgrid = GetPrivateProfileIntA("Message Log", "HgridColor", RGB(224, 224, 224), szIniFilename);

 		dat->m_theme.dwFlags = GetPrivateProfileIntA("Message Log", "DWFlags", MWF_LOG_DEFAULT, szIniFilename);

-		db_set_b(0, SRMSGMOD_T, "wantvgrid", (BYTE)(GetPrivateProfileIntA("Message Log", "VGrid", 0, szIniFilename)));

-		db_set_b(0, SRMSGMOD_T, "extramicrolf", (BYTE)(GetPrivateProfileIntA("Message Log", "ExtraMicroLF", 0, szIniFilename)));

+		db_set_b(0, SRMSGMOD_T, "wantvgrid", (uint8_t)(GetPrivateProfileIntA("Message Log", "VGrid", 0, szIniFilename)));

+		db_set_b(0, SRMSGMOD_T, "extramicrolf", (uint8_t)(GetPrivateProfileIntA("Message Log", "ExtraMicroLF", 0, szIniFilename)));

 

 		dat->m_theme.left_indent = GetPrivateProfileIntA("Message Log", "LeftIndent", 0, szIniFilename);

 		dat->m_theme.right_indent = GetPrivateProfileIntA("Message Log", "RightIndent", 0, szIniFilename);

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index fa055305d7..b7c79b2421 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -315,9 +315,9 @@ static CSkinItem _defInfoPanel = {
 	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE, 0, nullptr

 };

 

-static BYTE __inline percent_to_byte(UINT32 percent)

+static uint8_t __inline percent_to_byte(UINT32 percent)

 {

-	return(BYTE)((FLOAT)(((FLOAT)percent) / 100) * 255);

+	return(uint8_t)((FLOAT)(((FLOAT)percent) / 100) * 255);

 }

 

 static COLORREF __inline revcolref(COLORREF colref)

@@ -327,11 +327,11 @@ static COLORREF __inline revcolref(COLORREF colref)
 

 static DWORD __inline argb_from_cola(COLORREF col, UINT32 alpha)

 {

-	return((BYTE)percent_to_byte(alpha) << 24 | col);

+	return((uint8_t)percent_to_byte(alpha) << 24 | col);

 }

 

-void TSAPI  DrawAlpha(HDC hDC, PRECT rc, DWORD clr_base, int alpha, DWORD clr_dest, BYTE clr_dest_trans, BYTE bGradient,

-	BYTE bCorner, DWORD dwRadius, CImageItem *imageItem)

+void TSAPI  DrawAlpha(HDC hDC, PRECT rc, DWORD clr_base, int alpha, DWORD clr_dest, uint8_t clr_dest_trans, uint8_t bGradient,

+	uint8_t bCorner, DWORD dwRadius, CImageItem *imageItem)

 {

 	if (rc == nullptr)

 		return;

@@ -637,7 +637,7 @@ void __inline gradientVertical(UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ub
 

 void __fastcall CImageItem::Render(const HDC hdc, const RECT *rc, bool fIgnoreGlyph) const

 {

-	BYTE l = m_bLeft, r = m_bRight, t = m_bTop, b = m_bBottom;

+	uint8_t l = m_bLeft, r = m_bRight, t = m_bTop, b = m_bBottom;

 	LONG width = rc->right - rc->left;

 	LONG height = rc->bottom - rc->top;

 	BOOL isGlyph = ((m_dwFlags & IMAGE_GLYPH) && Skin->haveGlyphItem());

@@ -838,7 +838,7 @@ wchar_t* CImageItem::Read(const wchar_t *szFilename)
 		}

 		m_alpha = GetPrivateProfileInt(m_szName, L"Alpha", 100, szFilename);

 		m_alpha = min(m_alpha, 100);

-		m_alpha = (BYTE)((FLOAT)(((FLOAT)m_alpha) / 100) * 255);

+		m_alpha = (uint8_t)((FLOAT)(((FLOAT)m_alpha) / 100) * 255);

 		m_bf.SourceConstantAlpha = m_alpha;

 		m_bLeft = GetPrivateProfileInt(m_szName, L"Left", 0, szFilename);

 		m_bRight = GetPrivateProfileInt(m_szName, L"Right", 0, szFilename);

@@ -920,7 +920,7 @@ void CImageItem::Free()
 // @param bAlpha	new alpha value (0 -> fully transparent, 255 -> opaque)

 // 					default value is 255

 

-void CImageItem::SetBitmap32Alpha(HBITMAP hBitmap, BYTE bAlpha)

+void CImageItem::SetBitmap32Alpha(HBITMAP hBitmap, uint8_t bAlpha)

 {

 	BITMAP bmp;

 	GetObject(hBitmap, sizeof(bmp), &bmp);

@@ -928,7 +928,7 @@ void CImageItem::SetBitmap32Alpha(HBITMAP hBitmap, BYTE bAlpha)
 		return;

 

 	DWORD dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8);

-	BYTE *p = (BYTE *)mir_alloc(dwLen);

+	uint8_t *p = (uint8_t *)mir_alloc(dwLen);

 	if (p == nullptr)

 		return;

 	memset(p, 0, dwLen);

@@ -936,7 +936,7 @@ void CImageItem::SetBitmap32Alpha(HBITMAP hBitmap, BYTE bAlpha)
 	GetBitmapBits(hBitmap, dwLen, p);

 

 	for (int y = 0; y < bmp.bmHeight; ++y) {

-		BYTE *px = p + bmp.bmWidth * 4 * y;

+		uint8_t *px = p + bmp.bmWidth * 4 * y;

 

 		for (int x = 0; x < bmp.bmWidth; ++x) {

 			px[3] = bAlpha;

@@ -955,15 +955,15 @@ void CImageItem::PreMultiply(HBITMAP hBitmap, int mode)
 	int width = bmp.bmWidth;

 	int height = bmp.bmHeight;

 	DWORD dwLen = width * height * 4;

-	BYTE *p = (BYTE *)mir_alloc(dwLen);

+	uint8_t *p = (uint8_t *)mir_alloc(dwLen);

 	if (p) {

 		::GetBitmapBits(hBitmap, dwLen, p);

 		for (int y = 0; y < height; ++y) {

-			BYTE *px = p + width * 4 * y;

+			uint8_t *px = p + width * 4 * y;

 

 			for (int x = 0; x < width; ++x) {

 				if (mode) {

-					BYTE alpha = px[3];

+					uint8_t alpha = px[3];

 					px[0] = px[0] * alpha / 255;

 					px[1] = px[1] * alpha / 255;

 					px[2] = px[2] * alpha / 255;

@@ -978,7 +978,7 @@ void CImageItem::PreMultiply(HBITMAP hBitmap, int mode)
 	}

 }

 

-void CImageItem::Colorize(HBITMAP hBitmap, BYTE dr, BYTE dg, BYTE db, BYTE alpha)

+void CImageItem::Colorize(HBITMAP hBitmap, uint8_t dr, uint8_t dg, uint8_t db, uint8_t alpha)

 {

 	float r = (float)dr / 2.55;

 	float g = (float)dg / 2.55;

@@ -990,11 +990,11 @@ void CImageItem::Colorize(HBITMAP hBitmap, BYTE dr, BYTE dg, BYTE db, BYTE alpha
 	int width = bmp.bmWidth;

 	int height = bmp.bmHeight;

 	int dwLen = width * height * 4;

-	BYTE *p = (BYTE *)mir_alloc(dwLen);

+	uint8_t *p = (uint8_t *)mir_alloc(dwLen);

 	if (p) {

 		::GetBitmapBits(hBitmap, dwLen, p);

 		for (int y = 0; y < height; ++y) {

-			BYTE *px = p + width * 4 * y;

+			uint8_t *px = p + width * 4 * y;

 

 			for (int x = 0; x < width; ++x) {

 				px[0] = (int)(px[0] + b) > 255 ? 255 : px[0] + b;

@@ -1249,7 +1249,7 @@ void CSkin::ReadItem(const int id, const wchar_t *szItem)
 	GetPrivateProfileString(szItem, L"Color2", def_color, buffer, 400, m_tszFileName);

 	this_item->COLOR2 = HexStringToLong(buffer);

 

-	this_item->COLOR2_TRANSPARENT = (BYTE)GetPrivateProfileInt(szItem, L"COLOR2_TRANSPARENT", defaults->COLOR2_TRANSPARENT, m_tszFileName);

+	this_item->COLOR2_TRANSPARENT = (uint8_t)GetPrivateProfileInt(szItem, L"COLOR2_TRANSPARENT", defaults->COLOR2_TRANSPARENT, m_tszFileName);

 

 	this_item->CORNER = defaults->CORNER & CORNER_ACTIVE ? defaults->CORNER : 0;

 	GetPrivateProfileString(szItem, L"Corner", L"None", buffer, 400, m_tszFileName);

@@ -1384,7 +1384,7 @@ void CSkin::Load(void)
 			_tagSettings[i].defaultval, m_tszFileName);

 		switch (_tagSettings[i].size) {

 		case 1:

-			db_set_b(0, SRMSGMOD_T, _tagSettings[i].szSetting, (BYTE)data);

+			db_set_b(0, SRMSGMOD_T, _tagSettings[i].szSetting, (uint8_t)data);

 			break;

 		case 4:

 			db_set_dw(0, SRMSGMOD_T, _tagSettings[i].szSetting, data);

@@ -1465,7 +1465,7 @@ void CSkin::Load(void)
 

 	m_bClipBorder = GetPrivateProfileInt(L"WindowFrame", L"ClipFrame", 0, m_tszFileName) ? true : false;

 

-	BYTE radius_tl, radius_tr, radius_bl, radius_br;

+	uint8_t radius_tl, radius_tr, radius_bl, radius_br;

 	wchar_t 	szFinalName[MAX_PATH];

 	wchar_t 	szDrive[MAX_PATH], szPath[MAX_PATH];

 

@@ -1701,7 +1701,7 @@ void CSkin::setupAeroSkins()
 	float fr = (float)((m_dwmColor & 0x00ff0000) >> 16);

 	float fg = (float)((m_dwmColor & 0x0000ff00) >> 8);

 	float fb = (float)((m_dwmColor & 0x000000ff));

-	BYTE alphafactor = 255 - ((m_dwmColor & 0xff000000) >> 24);

+	uint8_t alphafactor = 255 - ((m_dwmColor & 0xff000000) >> 24);

 

 	/*

 	 * a bit tricky, because for low alpha settings (high DWM transparency), the dwm

@@ -1735,7 +1735,7 @@ void CSkin::setupAeroSkins()
 		}

 	}

 

-	m_dwmColorRGB = RGB((BYTE)fr, (BYTE)fg, (BYTE)fb);

+	m_dwmColorRGB = RGB((uint8_t)fr, (uint8_t)fg, (uint8_t)fb);

 

 	FIBITMAP *fib = (FIBITMAP *)Image_Load(tszFilename, IMGL_RETURNDIB);

 

@@ -1906,7 +1906,7 @@ void CSkin::SkinDrawBGFromDC(HWND hwndClient, HWND hwnd, RECT *rcClient, HDC hdc
 /////////////////////////////////////////////////////////////////////////////////////////

 // draw an icon "Dimmed" (small amount of transparency applied)

 

-void CSkin::DrawDimmedIcon(HDC hdc, LONG left, LONG top, LONG dx, LONG dy, HICON hIcon, BYTE alpha)

+void CSkin::DrawDimmedIcon(HDC hdc, LONG left, LONG top, LONG dx, LONG dy, HICON hIcon, uint8_t alpha)

 {

 	HDC dcMem = ::CreateCompatibleDC(hdc);

 	HBITMAP hbm = ::CreateCompatibleBitmap(hdc, dx, dy), hbmOld = nullptr;

@@ -2162,7 +2162,7 @@ void CMsgDialog::RenderToolbarBG(HDC hdc, const RECT &rcWindow) const
 

 	bool	 bAero = M.isAero();

 	bool	 fTbColorsValid = PluginConfig.m_tbBackgroundHigh && PluginConfig.m_tbBackgroundLow;

-	BYTE	 bAlphaOffset = 0;

+	uint8_t	 bAlphaOffset = 0;

 	BOOL 	fMustDrawNonThemed = ((bAero || fTbColorsValid) && !db_get_b(0, SRMSGMOD_T, "forceThemedToolbar", 0));

 	RECT 	rc, rcToolbar;

 	POINT	pt;

@@ -2298,7 +2298,7 @@ void CSkin::AeroEffectCallback_Milk(const HDC hdc, const RECT *rc, int iEffectAr
 		int 	alpha = (iEffectArea == AERO_EFFECT_AREA_INFOPANEL) ? m_pCurrentAeroEffect->m_baseAlpha : 40;

 		if (iEffectArea == AERO_EFFECT_AREA_MENUBAR)

 			alpha = 90;

-		BYTE 	color2_trans = (iEffectArea == AERO_EFFECT_AREA_MENUBAR) ? 0 : 1;

+		uint8_t 	color2_trans = (iEffectArea == AERO_EFFECT_AREA_MENUBAR) ? 0 : 1;

 		DWORD   corner = (iEffectArea == AERO_EFFECT_AREA_INFOPANEL) ? m_pCurrentAeroEffect->m_cornerRadius : 6;

 

 		DrawAlpha(hdc, const_cast<RECT *>(rc), m_pCurrentAeroEffect->m_baseColor, alpha, m_pCurrentAeroEffect->m_gradientColor,

@@ -2327,7 +2327,7 @@ void CSkin::AeroEffectCallback_Solid(const HDC hdc, const RECT *rc, int iEffectA
 			m_pCurrentAeroEffect->m_cornerType, m_pCurrentAeroEffect->m_cornerRadius, nullptr);

 	}

 	else {

-		BYTE	bGradient = (iEffectArea & AERO_EFFECT_AREA_TAB_BOTTOM ? GRADIENT_BT : GRADIENT_TB) + 1;

+		uint8_t	bGradient = (iEffectArea & AERO_EFFECT_AREA_TAB_BOTTOM ? GRADIENT_BT : GRADIENT_TB) + 1;

 		::DrawAlpha(hdc, const_cast<RECT *>(rc), m_pCurrentAeroEffect->m_baseColor, 70,

 			m_pCurrentAeroEffect->m_gradientColor, 1, bGradient,

 			m_pCurrentAeroEffect->m_cornerType, m_pCurrentAeroEffect->m_cornerRadius, nullptr);

diff --git a/plugins/TabSRMM/src/themes.h b/plugins/TabSRMM/src/themes.h
index 5a99146da6..67a187567e 100644
--- a/plugins/TabSRMM/src/themes.h
+++ b/plugins/TabSRMM/src/themes.h
@@ -121,10 +121,10 @@ struct AeroEffect
 	wchar_t    tszName[40];

 	DWORD    m_baseColor;

 	DWORD    m_gradientColor;

-	BYTE     m_baseAlpha;

-	BYTE     m_finalAlpha;

-	BYTE     m_cornerType;

-	BYTE     m_gradientType;

+	uint8_t     m_baseAlpha;

+	uint8_t     m_finalAlpha;

+	uint8_t     m_cornerType;

+	uint8_t     m_gradientType;

 	DWORD    m_cornerRadius;

 	DWORD    m_glowSize;

 	COLORREF m_clrBack, m_clrToolbar, m_clrToolbar2;

@@ -155,8 +155,8 @@ public:
 		m_szName[39] = 0;

 	}

 

-	CImageItem(BYTE bottom, BYTE left, BYTE top, BYTE right, HDC hdc, HBITMAP hbm, DWORD dwFlags,

-		HBRUSH brush, BYTE alpha, LONG inner_height, LONG inner_width, LONG height, LONG width)

+	CImageItem(uint8_t bottom, uint8_t left, uint8_t top, uint8_t right, HDC hdc, HBITMAP hbm, DWORD dwFlags,

+		HBRUSH brush, uint8_t alpha, LONG inner_height, LONG inner_width, LONG height, LONG width)

 	{

 		m_bBottom = bottom;

 		m_bLeft = left;

@@ -192,7 +192,7 @@ public:
 		m_hbm = hbm;

 	}

 

-	void			setAlphaFormat(const BYTE bFormat, const BYTE bConstantAlpha)

+	void			setAlphaFormat(const uint8_t bFormat, const uint8_t bConstantAlpha)

 	{

 		m_bf.AlphaFormat = bFormat;

 		m_bf.SourceConstantAlpha = bConstantAlpha;

@@ -225,23 +225,23 @@ public:
 	void              Create(const wchar_t *szImageFile);

 	void __fastcall   Render(const HDC hdc, const RECT *rc, bool fIgnoreGlyph) const;

 	static void TSAPI	PreMultiply(HBITMAP hBitmap, int mode);

-	static void TSAPI	SetBitmap32Alpha(HBITMAP hBitmap, BYTE bAlpha = 255);

-	static void TSAPI	Colorize(HBITMAP hBitmap, BYTE dr, BYTE dg, BYTE db, BYTE alpha = 0);

+	static void TSAPI	SetBitmap32Alpha(HBITMAP hBitmap, uint8_t bAlpha = 255);

+	static void TSAPI	Colorize(HBITMAP hBitmap, uint8_t dr, uint8_t dg, uint8_t db, uint8_t alpha = 0);

 

 public:

 	bool			m_fValid;									// verified item, indicates that all parameters are valid

 private:

 	wchar_t 		 	m_szName[40];								// everything wants a name, an image item doesn't need one though

 	HBITMAP 		m_hbm;										// the bitmap handle

-	BYTE    		m_bLeft, m_bRight, m_bTop, m_bBottom;      	// sizing margins for the outer 8 image parts

-	BYTE    		m_alpha;									// constant alpha for the entire image, applied via m_bf. sums with perpixel alpha

+	uint8_t    		m_bLeft, m_bRight, m_bTop, m_bBottom;      	// sizing margins for the outer 8 image parts

+	uint8_t    		m_alpha;									// constant alpha for the entire image, applied via m_bf. sums with perpixel alpha

 	DWORD   		m_dwFlags;									// flags

 	HDC     		m_hdc;										// *can* hold a pre-created hdc to speed up rendering

 	HBITMAP 		m_hbmOld;									// old bitmap, needs to be selected into m_hdc before destroying it

 	LONG    		m_inner_height, m_inner_width;				// dimensions of the inner image part

 	LONG    		m_width, m_height;							// width and height of the image, in pixels

 	BLENDFUNCTION 	m_bf;										// for AlphaBlend()

-	BYTE    		m_bStretch;									// stretch mode (unused in tabSRMM

+	uint8_t    		m_bStretch;									// stretch mode (unused in tabSRMM

 	HBRUSH  		m_fillBrush;								// brush to fill the inner part (faster) dwFlags & IMAGE_FILLSOLID must be set

 	LONG    		m_glyphMetrics[4];							// these coordinates point into the glyph image (if IMAGE_GLYPH is set)

 	CImageItem*		m_nextItem;									// next item in a set of image items (usually the skin set)

@@ -253,13 +253,13 @@ struct CSkinItem {
 	char szDBname[40];

 	int statusID;

 

-	BYTE GRADIENT;

-	BYTE CORNER;

+	uint8_t GRADIENT;

+	uint8_t CORNER;

 

 	DWORD COLOR;

 	DWORD COLOR2;

 

-	BYTE COLOR2_TRANSPARENT;

+	uint8_t COLOR2_TRANSPARENT;

 

 	DWORD TEXTCOLOR;

 

@@ -269,7 +269,7 @@ struct CSkinItem {
 	int MARGIN_TOP;

 	int MARGIN_RIGHT;

 	int MARGIN_BOTTOM;

-	BYTE IGNORED;

+	uint8_t IGNORED;

 	DWORD BORDERSTYLE;

 	CImageItem *imageItem;

 };

@@ -369,7 +369,7 @@ public:
 	 */

 	static void    TSAPI	SkinDrawBGFromDC(HWND hwndClient, HWND hwnd, RECT *rcClient, HDC hdcTarget);

 	static void    TSAPI	SkinDrawBG(HWND hwndClient, HWND hwnd, TContainerData *pContainer, RECT *rcClient, HDC hdcTarget);

-	static void    TSAPI	DrawDimmedIcon(HDC hdc, LONG left, LONG top, LONG dx, LONG dy, HICON hIcon, BYTE alpha);

+	static void    TSAPI	DrawDimmedIcon(HDC hdc, LONG left, LONG top, LONG dx, LONG dy, HICON hIcon, uint8_t alpha);

 	static DWORD   TSAPI HexStringToLong(const wchar_t *szSource);

 	static UINT    TSAPI	DrawRichEditFrame(HWND hwnd, const CMsgDialog *mwdat, UINT skinID, UINT msg, WPARAM wParam, LPARAM lParam, WNDPROC OldWndProc);

 	static UINT    TSAPI	NcCalcRichEditFrame(HWND hwnd, const CMsgDialog *mwdat, UINT skinID, UINT msg, WPARAM wParam, LPARAM lParam, WNDPROC OldWndProc);

@@ -465,7 +465,7 @@ struct ButtonItem {
 	wchar_t szTip[256];

 	char    szService[256];

 	char    szModule[256], szSetting[256];

-	BYTE    bValuePush[256], bValueRelease[256];

+	uint8_t    bValuePush[256], bValueRelease[256];

 	DWORD   type;

 	void(*pfnAction)(ButtonItem *item, HWND hwndDlg, CMsgDialog *dat, HWND hwndItem);

 	void(*pfnCallback)(ButtonItem *item, HWND hwndDlg, CMsgDialog *dat, HWND hwndItem);

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 5314e2d912..82338386cc 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -4,21 +4,21 @@ static HGENMENU hDisableMenu = nullptr;
 

 static MWindowList hPopupsList = nullptr;

 

-static BYTE   OnePopup;

-static BYTE   ShowMenu;

-static BYTE   StartDisabled;

-static BYTE   StopDisabled;

-static BYTE   Disabled;

-static BYTE   ColorMode;

-static BYTE   TimeoutMode;

-static BYTE   TimeoutMode2;

+static uint8_t   OnePopup;

+static uint8_t   ShowMenu;

+static uint8_t   StartDisabled;

+static uint8_t   StopDisabled;

+static uint8_t   Disabled;

+static uint8_t   ColorMode;

+static uint8_t   TimeoutMode;

+static uint8_t   TimeoutMode2;

 static int    Timeout;

 static int    Timeout2;

 static int    newTimeout;

 static int    newTimeout2;

-static BYTE   newTimeoutMode;

-static BYTE   newTimeoutMode2;

-static BYTE   newColorMode;

+static uint8_t   newTimeoutMode;

+static uint8_t   newTimeoutMode2;

+static uint8_t   newColorMode;

 

 static HANDLE hntfStarted = nullptr;

 static HANDLE hntfStopped = nullptr;

@@ -465,12 +465,12 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				db_set_b(0, TypigModule, SET_ONEPOPUP, OnePopup);

 				db_set_b(0, TypigModule, SET_SHOWDISABLEMENU, ShowMenu);

-				db_set_b(0, TypigModule, SET_DISABLED, (BYTE)(StartDisabled | StopDisabled));

+				db_set_b(0, TypigModule, SET_DISABLED, (uint8_t)(StartDisabled | StopDisabled));

 				db_set_b(0, TypigModule, SET_COLOR_MODE, ColorMode);

 				db_set_b(0, TypigModule, SET_TIMEOUT_MODE, TimeoutMode);

-				db_set_b(0, TypigModule, SET_TIMEOUT, (BYTE)Timeout);

+				db_set_b(0, TypigModule, SET_TIMEOUT, (uint8_t)Timeout);

 				db_set_b(0, TypigModule, SET_TIMEOUT_MODE2, TimeoutMode2);

-				db_set_b(0, TypigModule, SET_TIMEOUT2, (BYTE)Timeout2);

+				db_set_b(0, TypigModule, SET_TIMEOUT2, (uint8_t)Timeout2);

 				return TRUE;

 			}

 		}

@@ -532,6 +532,6 @@ int TN_ModuleInit()
 int TN_ModuleDeInit()

 {

 	WindowList_Destroy(hPopupsList);

-	db_set_b(0, TypigModule, SET_DISABLED, (BYTE)(Disabled | StartDisabled | StopDisabled));

+	db_set_b(0, TypigModule, SET_DISABLED, (uint8_t)(Disabled | StartDisabled | StopDisabled));

 	return 0;

 }

diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index 56cc73e770..3a8660e028 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -60,9 +60,9 @@ public:
 	{

 		DWORD maxhist = M.GetDword(m_hContact, "maxhist", 0);

 		int iLocalFormat = M.GetDword(m_hContact, "sendformat", 0);

-		BYTE bSplit = M.GetByte(m_hContact, "splitoverride", 0);

-		BYTE bInfoPanel = M.GetByte(m_hContact, "infopanel", 0);

-		BYTE bAvatarVisible = M.GetByte(m_hContact, "hideavatar", -1);

+		uint8_t bSplit = M.GetByte(m_hContact, "splitoverride", 0);

+		uint8_t bInfoPanel = M.GetByte(m_hContact, "infopanel", 0);

+		uint8_t bAvatarVisible = M.GetByte(m_hContact, "hideavatar", -1);

 

 		cmbPanel.AddString(TranslateT("Use global setting"));

 		cmbPanel.AddString(TranslateT("Always on"));

@@ -99,7 +99,7 @@ public:
 	bool OnApply() override

 	{

 		CMsgDialog *dat = Srmm_FindDialog(m_hContact);

-		BYTE bOldInfoPanel = M.GetByte(m_hContact, "infopanel", 0);

+		uint8_t bOldInfoPanel = M.GetByte(m_hContact, "infopanel", 0);

 

 		int iIndex = SendDlgItemMessage(m_hwnd, IDC_TEXTFORMATTING, CB_GETCURSEL, 0, 0);

 		if (iIndex != CB_ERR) {

@@ -109,20 +109,20 @@ public:
 				db_set_dw(m_hContact, SRMSGMOD_T, "sendformat", iIndex == 2 ? -1 : 1);

 		}

 

-		db_set_b(m_hContact, SRMSGMOD_T, "splitoverride", (BYTE)(IsDlgButtonChecked(m_hwnd, IDC_PRIVATESPLITTER) ? 1 : 0));

+		db_set_b(m_hContact, SRMSGMOD_T, "splitoverride", (uint8_t)(IsDlgButtonChecked(m_hwnd, IDC_PRIVATESPLITTER) ? 1 : 0));

 

-		db_set_b(m_hContact, TEMPLATES_MODULE, "enabled", (BYTE)(IsDlgButtonChecked(m_hwnd, IDC_TEMPLOVERRIDE)));

-		db_set_b(m_hContact, RTLTEMPLATES_MODULE, "enabled", (BYTE)(IsDlgButtonChecked(m_hwnd, IDC_RTLTEMPLOVERRIDE)));

+		db_set_b(m_hContact, TEMPLATES_MODULE, "enabled", (uint8_t)(IsDlgButtonChecked(m_hwnd, IDC_TEMPLOVERRIDE)));

+		db_set_b(m_hContact, RTLTEMPLATES_MODULE, "enabled", (uint8_t)(IsDlgButtonChecked(m_hwnd, IDC_RTLTEMPLOVERRIDE)));

 

-		BYTE bAvatarVisible = (BYTE)SendDlgItemMessage(m_hwnd, IDC_SHOWAVATAR, CB_GETCURSEL, 0, 0);

+		uint8_t bAvatarVisible = (uint8_t)SendDlgItemMessage(m_hwnd, IDC_SHOWAVATAR, CB_GETCURSEL, 0, 0);

 		if (bAvatarVisible == 0)

 			db_unset(m_hContact, SRMSGMOD_T, "hideavatar");

 		else

-			db_set_b(m_hContact, SRMSGMOD_T, "hideavatar", (BYTE)(bAvatarVisible == 1 ? 1 : 0));

+			db_set_b(m_hContact, SRMSGMOD_T, "hideavatar", (uint8_t)(bAvatarVisible == 1 ? 1 : 0));

 

-		BYTE bInfoPanel = (BYTE)SendDlgItemMessage(m_hwnd, IDC_INFOPANEL, CB_GETCURSEL, 0, 0);

+		uint8_t bInfoPanel = (uint8_t)SendDlgItemMessage(m_hwnd, IDC_INFOPANEL, CB_GETCURSEL, 0, 0);

 		if (bInfoPanel != bOldInfoPanel) {

-			db_set_b(m_hContact, SRMSGMOD_T, "infopanel", (BYTE)(bInfoPanel == 0 ? 0 : (bInfoPanel == 1 ? 1 : -1)));

+			db_set_b(m_hContact, SRMSGMOD_T, "infopanel", (uint8_t)(bInfoPanel == 0 ? 0 : (bInfoPanel == 1 ? 1 : -1)));

 			if (dat)

 				SendMessage(dat->GetHwnd(), DM_SETINFOPANEL, 0, 0);

 		}

@@ -284,7 +284,7 @@ public:
 		

 		int state = IsDlgButtonChecked(m_hwnd, IDC_UPREFS_LOGSTATUS);

 		if (state != BST_INDETERMINATE)

-			db_set_b(m_hContact, SRMSGMOD_T, "logstatuschanges", (BYTE)state);

+			db_set_b(m_hContact, SRMSGMOD_T, "logstatuschanges", (uint8_t)state);

 

 		if (dwMask) {

 			db_set_dw(m_hContact, SRMSGMOD_T, "mwmask", dwMask);

diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index ee26508526..f9ccd23e20 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -261,7 +261,7 @@ bool CMsgDialog::FormatTitleBar(const wchar_t *szFormat, CMStringW &dest)
 

 		case 'x':

 			{

-				BYTE xStatus = m_cache->getXStatusId();

+				uint8_t xStatus = m_cache->getXStatusId();

 				if (m_wStatus != ID_STATUS_OFFLINE && xStatus > 0 && xStatus <= 31) {

 					ptrW szXStatus(db_get_wsa(m_hContact, m_szProto, "XStatusName"));

 					dest.Append((szXStatus != nullptr) ? Trunc500(szXStatus) : xStatusDescr[xStatus - 1]);

@@ -271,7 +271,7 @@ bool CMsgDialog::FormatTitleBar(const wchar_t *szFormat, CMStringW &dest)
 

 		case 'm':

 			{

-				BYTE xStatus = m_cache->getXStatusId();

+				uint8_t xStatus = m_cache->getXStatusId();

 				if (m_wStatus != ID_STATUS_OFFLINE && xStatus > 0 && xStatus <= 31) {

 					ptrW szXStatus(db_get_wsa(m_hContact, m_szProto, "XStatusName"));

 					dest.Append((szXStatus != nullptr) ? Trunc500(szXStatus) : xStatusDescr[xStatus - 1]);

@@ -477,7 +477,7 @@ struct TOldContainerSettings
 	WORD    avatarMode;

 	WORD    ownAvatarMode;

 	WORD    autoCloseSeconds;

-	BYTE    reserved[10];

+	uint8_t    reserved[10];

 };

 

 int Utils::ReadContainerSettingsFromDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey)