diff options
Diffstat (limited to 'src')
75 files changed, 257 insertions, 257 deletions
diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h index 841c4d50b9..1e820ab127 100644 --- a/src/core/stdautoaway/src/stdafx.h +++ b/src/core/stdautoaway/src/stdafx.h @@ -76,9 +76,9 @@ struct CMPlugin : public PLUGIN<CMPlugin> int Load() override;
int Unload() override;
- CMOption<BYTE> bIdleCheck, bIdleMethod, bIdleOnSaver, bIdleOnFullScr, bIdleOnLock;
- CMOption<BYTE> bIdlePrivate, bIdleSoundsOff, bIdleOnTerminal, bIdleStatusLock;
- CMOption<BYTE> bAAEnable;
+ CMOption<uint8_t> bIdleCheck, bIdleMethod, bIdleOnSaver, bIdleOnFullScr, bIdleOnLock;
+ CMOption<uint8_t> bIdlePrivate, bIdleSoundsOff, bIdleOnTerminal, bIdleStatusLock;
+ CMOption<uint8_t> bAAEnable;
CMOption<WORD> bAAStatus;
CMOption<DWORD> iIdleTime1st;
};
diff --git a/src/core/stdaway/src/options.cpp b/src/core/stdaway/src/options.cpp index 900e10cdc7..74cfac21ce 100644 --- a/src/core/stdaway/src/options.cpp +++ b/src/core/stdaway/src/options.cpp @@ -91,9 +91,9 @@ public: for (int i = cmbStatus.GetCount() - 1; i >= 0; i--) { int status = cmbStatus.GetItemData(i); - g_plugin.SetStatusModeByte(status, "Ignore", (BYTE)m_info[i].ignore); - g_plugin.SetStatusModeByte(status, "NoDlg", (BYTE)m_info[i].noDialog); - g_plugin.SetStatusModeByte(status, "UsePrev", (BYTE)m_info[i].usePrevious); + g_plugin.SetStatusModeByte(status, "Ignore", (uint8_t)m_info[i].ignore); + g_plugin.SetStatusModeByte(status, "NoDlg", (uint8_t)m_info[i].noDialog); + g_plugin.SetStatusModeByte(status, "UsePrev", (uint8_t)m_info[i].usePrevious); g_plugin.setWString(StatusModeToDbSetting(status, "Default"), m_info[i].msg); } return true; diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h index f7863b348b..1e9dc9a08f 100644 --- a/src/core/stdaway/src/stdafx.h +++ b/src/core/stdaway/src/stdafx.h @@ -86,7 +86,7 @@ struct CMPlugin : public PLUGIN<CMPlugin> return getByte(StatusModeToDbSetting(status, suffix), bDefault) != 0;
}
- void SetStatusModeByte(int status, const char *suffix, BYTE value)
+ void SetStatusModeByte(int status, const char *suffix, uint8_t value)
{
setByte(StatusModeToDbSetting(status, suffix), value);
}
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 860c8bc0e6..49c9d76abd 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -231,13 +231,13 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam else
db_set_dw(0, "CLC", "GreyoutFlags", 0);
}
- db_set_b(0, "CLC", "ShowIdle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0));
- db_set_b(0, "CLC", "LeftMargin", (BYTE)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0));
+ db_set_b(0, "CLC", "ShowIdle", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0));
+ db_set_b(0, "CLC", "LeftMargin", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0));
db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
- db_set_b(0, "CLC", "GroupIndent", (BYTE)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0));
- db_set_b(0, "CLC", "NoVScrollBar", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0));
- db_set_b(0, "CLC", "RowHeight", (BYTE)SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0));
- db_set_b(0, "CLC", "GammaCorrect", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_GAMMACORRECT));
+ db_set_b(0, "CLC", "GroupIndent", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0));
+ db_set_b(0, "CLC", "NoVScrollBar", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0));
+ db_set_b(0, "CLC", "RowHeight", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0));
+ db_set_b(0, "CLC", "GammaCorrect", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_GAMMACORRECT));
Clist_ClcOptionsChanged();
return TRUE;
}
@@ -347,7 +347,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, case 0:
switch (((LPNMHDR)lParam)->code) {
case PSN_APPLY:
- db_set_b(0, "CLC", "UseBitmap", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BITMAP));
+ db_set_b(0, "CLC", "UseBitmap", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_BITMAP));
{
COLORREF col;
col = SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_GETCOLOUR, 0, 0);
@@ -360,7 +360,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, db_unset(0, "CLC", "SelBkColour");
else
db_set_dw(0, "CLC", "SelBkColour", col);
- db_set_b(0, "CLC", "UseWinColours", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_WINCOLOUR)));
+ db_set_b(0, "CLC", "UseWinColours", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_WINCOLOUR)));
}
{
char str[MAX_PATH], strrel[MAX_PATH];
diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index 8a493e0649..f967443e37 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
extern HIMAGELIST himlCListClc;
-static BYTE divide3[765] = { 255 };
+static uint8_t divide3[765] = { 255 };
static void ChangeToFont(HDC hdc, struct ClcData *dat, int id, int *fontHeight)
{
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index 47a925c238..536fa29a97 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -145,25 +145,25 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break;
case WM_NOTIFY:
if (((LPNMHDR)lParam)->code == PSN_APPLY) {
- g_plugin.setByte("OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP));
- g_plugin.setByte("ToolWindow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TOOLWND));
- g_plugin.setByte("BringToFront", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT));
- db_set_b(0, "CLUI", "FadeInOut", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT));
- db_set_b(0, "CLUI", "AutoSize", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));
- db_set_b(0, "CLUI", "MaxSizeHeight", (BYTE)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE));
- db_set_b(0, "CLUI", "AutoSizeUpward", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD));
- g_plugin.setByte("AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));
+ g_plugin.setByte("OnTop", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_ONTOP));
+ g_plugin.setByte("ToolWindow", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_TOOLWND));
+ g_plugin.setByte("BringToFront", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT));
+ db_set_b(0, "CLUI", "FadeInOut", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT));
+ db_set_b(0, "CLUI", "AutoSize", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));
+ db_set_b(0, "CLUI", "MaxSizeHeight", (uint8_t)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE));
+ db_set_b(0, "CLUI", "AutoSizeUpward", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD));
+ g_plugin.setByte("AutoHide", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));
g_plugin.setWord("HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
- g_plugin.setByte("Transparent", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));
- g_plugin.setByte("Alpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));
- g_plugin.setByte("AutoAlpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0));
- g_plugin.setByte("WindowShadow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW));
- g_plugin.setByte("OnDesktop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP));
- db_set_b(0, "CLUI", "DockToSides", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEDOCKING));
- db_set_b(0, "CLUI", "ShowCaption", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION));
- db_set_b(0, "CLUI", "ShowMainMenu", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU));
- db_set_b(0, "CLUI", "ClientAreaDrag", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG));
- g_plugin.setByte("Min2Tray", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY));
+ g_plugin.setByte("Transparent", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));
+ g_plugin.setByte("Alpha", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));
+ g_plugin.setByte("AutoAlpha", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0));
+ g_plugin.setByte("WindowShadow", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW));
+ g_plugin.setByte("OnDesktop", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP));
+ db_set_b(0, "CLUI", "DockToSides", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_DISABLEDOCKING));
+ db_set_b(0, "CLUI", "ShowCaption", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION));
+ db_set_b(0, "CLUI", "ShowMainMenu", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU));
+ db_set_b(0, "CLUI", "ClientAreaDrag", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG));
+ g_plugin.setByte("Min2Tray", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY));
{
wchar_t title[256];
GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, _countof(title));
@@ -218,7 +218,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L ShowWindow(g_clistApi.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY) ? SW_HIDE : SW_SHOW);
if (IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) {
SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED);
- SetLayeredWindowAttributes(g_clistApi.hwndContactList, RGB(0, 0, 0), (BYTE)g_plugin.getByte("AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);
+ SetLayeredWindowAttributes(g_clistApi.hwndContactList, RGB(0, 0, 0), (uint8_t)g_plugin.getByte("AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);
}
else
SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED);
@@ -239,7 +239,7 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L TranslateDialogDefault(hwndDlg);
CheckDlgButton(hwndDlg, IDC_SHOWSBAR, db_get_b(0, "CLUI", "ShowSBar", 1) ? BST_CHECKED : BST_UNCHECKED);
{
- BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1);
+ uint8_t showOpts = db_get_b(0, "CLUI", "SBarShow", 1);
CheckDlgButton(hwndDlg, IDC_SHOWICON, showOpts & 1 ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_SHOWPROTO, showOpts & 2 ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_SHOWSTATUS, showOpts & 4 ? BST_CHECKED : BST_UNCHECKED);
@@ -275,19 +275,19 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break;
case WM_NOTIFY:
if (((LPNMHDR)lParam)->code == PSN_APPLY) {
- db_set_b(0, "CLUI", "ShowSBar", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR));
+ db_set_b(0, "CLUI", "ShowSBar", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR));
db_set_b(0, "CLUI", "SBarShow",
- (BYTE)((IsDlgButtonChecked(hwndDlg, IDC_SHOWICON) ? 1 : 0) |
+ (uint8_t)((IsDlgButtonChecked(hwndDlg, IDC_SHOWICON) ? 1 : 0) |
(IsDlgButtonChecked(hwndDlg, IDC_SHOWPROTO) ? 2 : 0) |
(IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS) ? 4 : 0)));
- db_set_b(0, "CLUI", "SBarRightClk", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA));
- db_set_b(0, "CLUI", "EqualSections", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS));
- db_set_b(0, "CLUI", "SBarBevel", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL));
+ db_set_b(0, "CLUI", "SBarRightClk", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA));
+ db_set_b(0, "CLUI", "EqualSections", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS));
+ db_set_b(0, "CLUI", "SBarBevel", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL));
g_clistApi.pfnLoadCluiGlobalOpts();
- if (db_get_b(0, "CLUI", "ShowGrip", 1) != (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) {
+ if (db_get_b(0, "CLUI", "ShowGrip", 1) != (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) {
HWND parent = GetParent(g_clistApi.hwndStatus);
int flags = WS_CHILD | CCS_BOTTOM;
- db_set_b(0, "CLUI", "ShowGrip", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP));
+ db_set_b(0, "CLUI", "ShowGrip", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP));
ShowWindow(g_clistApi.hwndStatus, SW_HIDE);
DestroyWindow(g_clistApi.hwndStatus);
flags |= db_get_b(0, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0;
diff --git a/src/core/stdcrypt/src/Rijndael.cpp b/src/core/stdcrypt/src/Rijndael.cpp index 510af48871..a97b9c1d1c 100644 --- a/src/core/stdcrypt/src/Rijndael.cpp +++ b/src/core/stdcrypt/src/Rijndael.cpp @@ -931,7 +931,7 @@ CRijndael::~CRijndael() // chain - initial chain block
// keylength - 16, 24 or 32 bytes
// blockSize - The block size in bytes of this Rijndael (16, 24 or 32 bytes).
-int CRijndael::MakeKey(BYTE const* key, char const* chain, int keylength, int blockSize)
+int CRijndael::MakeKey(uint8_t const* key, char const* chain, int keylength, int blockSize)
{
if (nullptr == key)
return 1;
@@ -978,7 +978,7 @@ int CRijndael::MakeKey(BYTE const* key, char const* chain, int keylength, int bl int KC = m_keylength / 4;
//Copy user material bytes into temporary ints
int* pi = tk;
- BYTE const* pc = key;
+ uint8_t const* pc = key;
for (i = 0; i < KC; i++) {
*pi = *(pc++) << 24;
*pi |= *(pc++) << 16;
diff --git a/src/core/stdcrypt/src/Rijndael.h b/src/core/stdcrypt/src/Rijndael.h index a69409b929..f1fc02905f 100644 --- a/src/core/stdcrypt/src/Rijndael.h +++ b/src/core/stdcrypt/src/Rijndael.h @@ -33,7 +33,7 @@ public: // chain - initial chain block
// keylength - 16, 24 or 32 bytes
// blockSize - The block size in bytes of this Rijndael (16, 24 or 32 bytes).
- int MakeKey(BYTE const* key, char const* chain, int keylength, int blockSize);
+ int MakeKey(uint8_t const* key, char const* chain, int keylength, int blockSize);
private:
//Auxiliary Function
diff --git a/src/core/stdcrypt/src/encrypt.cpp b/src/core/stdcrypt/src/encrypt.cpp index 27a6500f5e..3b8d173229 100644 --- a/src/core/stdcrypt/src/encrypt.cpp +++ b/src/core/stdcrypt/src/encrypt.cpp @@ -49,7 +49,7 @@ void CStdCrypt::key2ext(const char *pszPassword, ExternalKey &key) tmp.m_crc32 = crc32(0xAbbaDead, (LPCBYTE)pszPassword, (int)strlen(pszPassword));
getRandomBytes(tmp.slack, sizeof(tmp.slack));
- BYTE tmpHash[32];
+ uint8_t tmpHash[32];
slow_hash(pszPassword, strlen(pszPassword), tmpHash);
CRijndael tmpAes;
@@ -57,7 +57,7 @@ void CStdCrypt::key2ext(const char *pszPassword, ExternalKey &key) tmpAes.Encrypt(&tmp, &key, sizeof(ExternalKey));
}
-bool CStdCrypt::getKey(BYTE *pKey, size_t cbKeyLen)
+bool CStdCrypt::getKey(uint8_t *pKey, size_t cbKeyLen)
{
if (!m_valid || cbKeyLen < sizeof(m_extKey))
return false;
@@ -71,7 +71,7 @@ bool CStdCrypt::checkKey(const char *pszPassword, const ExternalKey *pPublic, Ex if (mir_strlen(pszPassword) == 0)
pszPassword = "Miranda";
- BYTE tmpHash[32];
+ uint8_t tmpHash[32];
slow_hash(pszPassword, strlen(pszPassword), tmpHash);
CRijndael tmpAes;
@@ -81,7 +81,7 @@ bool CStdCrypt::checkKey(const char *pszPassword, const ExternalKey *pPublic, Ex return (tmp.m_crc32 == crc32(0xAbbaDead, (LPCBYTE)pszPassword, (int)strlen(pszPassword)));
}
-bool CStdCrypt::setKey(const char *pszPassword, const BYTE *pPublic, size_t cbKeyLen)
+bool CStdCrypt::setKey(const char *pszPassword, const uint8_t *pPublic, size_t cbKeyLen)
{
// full external key. decode & check password
if (cbKeyLen != sizeof(m_extKey))
@@ -99,7 +99,7 @@ bool CStdCrypt::setKey(const char *pszPassword, const BYTE *pPublic, size_t cbKe bool CStdCrypt::generateKey(void)
{
- BYTE tmp[KEY_LENGTH];
+ uint8_t tmp[KEY_LENGTH];
if (!getRandomBytes(tmp, sizeof(tmp)))
return false;
@@ -127,8 +127,8 @@ void CStdCrypt::setPassword(const char *pszPassword) key2ext(pszPassword, m_extKey);
}
-// result must be freed using mir_free or assigned to mir_ptr<BYTE>
-BYTE* CStdCrypt::encodeString(const char *src, size_t *cbResultLen)
+// result must be freed using mir_free or assigned to mir_ptr<uint8_t>
+uint8_t* CStdCrypt::encodeString(const char *src, size_t *cbResultLen)
{
if (!m_valid || src == nullptr) {
if (cbResultLen)
@@ -139,7 +139,7 @@ BYTE* CStdCrypt::encodeString(const char *src, size_t *cbResultLen) return encodeBuffer(src, mir_strlen(src)+1, cbResultLen);
}
-BYTE* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen)
+uint8_t* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen)
{
if (cbResultLen)
*cbResultLen = 0;
@@ -147,7 +147,7 @@ BYTE* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen if (!m_valid || src == nullptr || cbLen >= 0xFFFE)
return nullptr;
- BYTE *tmpBuf = (BYTE*)_alloca(cbLen + 2);
+ uint8_t *tmpBuf = (uint8_t*)_alloca(cbLen + 2);
*(PWORD)tmpBuf = (WORD)cbLen;
memcpy(tmpBuf + 2, src, cbLen);
cbLen += 2;
@@ -155,7 +155,7 @@ BYTE* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen if (rest)
cbLen += BLOCK_SIZE - rest;
- BYTE *result = (BYTE*)mir_alloc(cbLen);
+ uint8_t *result = (uint8_t*)mir_alloc(cbLen);
m_aes.ResetChain();
if (m_aes.Encrypt(tmpBuf, LPSTR(result), cbLen)) {
mir_free(result);
@@ -167,7 +167,7 @@ BYTE* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen return result;
}
-char* CStdCrypt::decodeString(const BYTE *pBuf, size_t bufLen, size_t *cbResultLen)
+char* CStdCrypt::decodeString(const uint8_t *pBuf, size_t bufLen, size_t *cbResultLen)
{
size_t resLen;
char *result = (char*)decodeBuffer(pBuf, bufLen, &resLen);
@@ -183,7 +183,7 @@ char* CStdCrypt::decodeString(const BYTE *pBuf, size_t bufLen, size_t *cbResultL return result;
}
-void* CStdCrypt::decodeBuffer(const BYTE *pBuf, size_t bufLen, size_t *cbResultLen)
+void* CStdCrypt::decodeBuffer(const uint8_t *pBuf, size_t bufLen, size_t *cbResultLen)
{
if (cbResultLen)
*cbResultLen = 0;
diff --git a/src/core/stdcrypt/src/stdafx.h b/src/core/stdcrypt/src/stdafx.h index e97567258a..3064acc296 100644 --- a/src/core/stdcrypt/src/stdafx.h +++ b/src/core/stdcrypt/src/stdafx.h @@ -72,5 +72,5 @@ struct CMPlugin : public PLUGIN<CMPlugin> int Load() override;
};
-bool getRandomBytes(BYTE *buf, size_t bufLen);
-void slow_hash(const void *buf, size_t bufLen, BYTE *tmpHash);
+bool getRandomBytes(uint8_t *buf, size_t bufLen);
+void slow_hash(const void *buf, size_t bufLen, uint8_t *tmpHash);
diff --git a/src/core/stdcrypt/src/stdcrypt.h b/src/core/stdcrypt/src/stdcrypt.h index ce003bd27b..03a10bcd83 100644 --- a/src/core/stdcrypt/src/stdcrypt.h +++ b/src/core/stdcrypt/src/stdcrypt.h @@ -28,9 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc., struct ExternalKey
{
- BYTE m_key[KEY_LENGTH];
+ uint8_t m_key[KEY_LENGTH];
DWORD m_crc32;
- BYTE slack[BLOCK_SIZE - sizeof(DWORD)];
+ uint8_t slack[BLOCK_SIZE - sizeof(DWORD)];
};
struct CStdCrypt : public MICryptoEngine, public MZeroedObject
@@ -49,8 +49,8 @@ struct CStdCrypt : public MICryptoEngine, public MZeroedObject // get/set the instance key
STDMETHODIMP_(size_t) getKeyLength(void) override;
- STDMETHODIMP_(bool) getKey(BYTE *pKey, size_t cbKeyLen) override;
- STDMETHODIMP_(bool) setKey(const char *pszPassword, const BYTE *pKey, size_t cbKeyLen) override;
+ STDMETHODIMP_(bool) getKey(uint8_t *pKey, size_t cbKeyLen) override;
+ STDMETHODIMP_(bool) setKey(const char *pszPassword, const uint8_t *pKey, size_t cbKeyLen) override;
STDMETHODIMP_(bool) generateKey(void) override; // creates a new key inside
STDMETHODIMP_(void) purgeKey(void) override; // purges a key from memory
@@ -59,11 +59,11 @@ struct CStdCrypt : public MICryptoEngine, public MZeroedObject STDMETHODIMP_(void) setPassword(const char *pszPassword);
STDMETHODIMP_(bool) checkPassword(const char *pszPassword) override;
- // result must be freed using mir_free or assigned to mir_ptr<BYTE>
- STDMETHODIMP_(BYTE*) encodeString(const char *src, size_t *cbResultLen) override;
- STDMETHODIMP_(BYTE*) encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen) override;
+ // result must be freed using mir_free or assigned to mir_ptr<uint8_t>
+ STDMETHODIMP_(uint8_t*) encodeString(const char *src, size_t *cbResultLen) override;
+ STDMETHODIMP_(uint8_t*) encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen) override;
// result must be freed using mir_free or assigned to ptrA/ptrW
- STDMETHODIMP_(char*) decodeString(const BYTE *pBuf, size_t bufLen, size_t *cbResultLen) override;
- STDMETHODIMP_(void*) decodeBuffer(const BYTE *pBuf, size_t bufLen, size_t *cbResultLen) override;
+ STDMETHODIMP_(char*) decodeString(const uint8_t *pBuf, size_t bufLen, size_t *cbResultLen) override;
+ STDMETHODIMP_(void*) decodeBuffer(const uint8_t *pBuf, size_t bufLen, size_t *cbResultLen) override;
};
diff --git a/src/core/stdcrypt/src/utils.cpp b/src/core/stdcrypt/src/utils.cpp index d799f0bb0e..bb334edbdb 100644 --- a/src/core/stdcrypt/src/utils.cpp +++ b/src/core/stdcrypt/src/utils.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-bool getRandomBytes(BYTE *buf, size_t bufLen)
+bool getRandomBytes(uint8_t *buf, size_t bufLen)
{
// try to use Intel hardware randomizer first
HCRYPTPROV hProvider = NULL;
@@ -46,7 +46,7 @@ bool getRandomBytes(BYTE *buf, size_t bufLen) return true;
}
-void slow_hash(const void *buf, size_t bufLen, BYTE* tmpHash)
+void slow_hash(const void *buf, size_t bufLen, uint8_t* tmpHash)
{
mir_sha256_hash(buf, bufLen, tmpHash);
diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp index f83af57ab7..2a57485eb0 100644 --- a/src/core/stdfile/src/file.cpp +++ b/src/core/stdfile/src/file.cpp @@ -388,11 +388,11 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam) dbei.cbBlob += (int)mir_strlen(szDescr) + 1;
- if ((dbei.pBlob = (BYTE*)mir_alloc(dbei.cbBlob)) == nullptr)
+ if ((dbei.pBlob = (uint8_t*)mir_alloc(dbei.cbBlob)) == nullptr)
return 0;
*(DWORD*)dbei.pBlob = 0;
- BYTE* p = dbei.pBlob + sizeof(DWORD);
+ uint8_t* p = dbei.pBlob + sizeof(DWORD);
for (int i = 0; i < pre->fileCount; i++) {
mir_strcpy((char*)p, pszFiles[i]);
p += mir_strlen(pszFiles[i]) + 1;
diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp index 006273dfd1..279db00135 100644 --- a/src/core/stdfile/src/fileopts.cpp +++ b/src/core/stdfile/src/fileopts.cpp @@ -146,8 +146,8 @@ public: g_plugin.setWString("ScanCmdLine", str);
g_plugin.setByte("UseScanner", chkScanAfterDl.GetState() ? VIRUSSCAN_AFTERDL : (chkScanDuringDl.GetState() ? VIRUSSCAN_DURINGDL : VIRUSSCAN_DISABLE));
- g_plugin.setByte("WarnBeforeOpening", (BYTE)IsDlgButtonChecked(m_hwnd, IDC_WARNBEFOREOPENING));
- g_plugin.setByte("IfExists", (BYTE)(IsDlgButtonChecked(m_hwnd, IDC_ASK) ? FILERESUME_ASK :
+ g_plugin.setByte("WarnBeforeOpening", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_WARNBEFOREOPENING));
+ g_plugin.setByte("IfExists", (uint8_t)(IsDlgButtonChecked(m_hwnd, IDC_ASK) ? FILERESUME_ASK :
(IsDlgButtonChecked(m_hwnd, IDC_RESUME) ? FILERESUME_RESUMEALL :
(IsDlgButtonChecked(m_hwnd, IDC_OVERWRITE) ? FILERESUME_OVERWRITEALL : FILERESUME_RENAMEALL))));
return TRUE;
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index 17f73d4a7a..d94f9133fc 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -229,7 +229,7 @@ class COptMainDlg : public CDlgBase for (int i = 0; i < nValues; i++, branch++) { tvi.hItem = branch->hItem; checkBoxes.GetItem(&tvi); - BYTE bChecked = (((tvi.state & TVIS_STATEIMAGEMASK) >> 12) == 1) ? 0 : 1; + uint8_t bChecked = (((tvi.state & TVIS_STATEIMAGEMASK) >> 12) == 1) ? 0 : 1; if (branch->iMode) { if (bChecked) iState |= branch->iMode; @@ -285,7 +285,7 @@ public: void OnDestroy() override { - BYTE b = checkBoxes.GetItemState(hListHeading1, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0; + uint8_t b = checkBoxes.GetItemState(hListHeading1, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0; db_set_b(0, CHAT_MODULE, "Branch1Exp", b); b = checkBoxes.GetItemState(hListHeading2, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0; db_set_b(0, CHAT_MODULE, "Branch2Exp", b); @@ -432,7 +432,7 @@ public: int iLen = spin4.GetPosition(); 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"); @@ -525,7 +525,7 @@ public: else iLen = 1; g_Settings.iPopupStyle = iLen; - db_set_b(0, CHAT_MODULE, "PopupStyle", (BYTE)iLen); + db_set_b(0, CHAT_MODULE, "PopupStyle", (uint8_t)iLen); iLen = SendDlgItemMessage(m_hwnd, IDC_SPIN1, UDM_GETPOS, 0, 0); g_Settings.iPopupTimeout = iLen; diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h index e156b001bc..7207ccb9c3 100644 --- a/src/core/stdmsg/src/globals.h +++ b/src/core/stdmsg/src/globals.h @@ -60,9 +60,9 @@ struct GlobalMessageData CMOption<DWORD> popupFlags;
CMOption<DWORD> msgTimeout;
CMOption<DWORD> nFlashMax;
- CMOption<BYTE> iGap;
+ CMOption<uint8_t> iGap;
- CMOption<BYTE> iLoadHistory;
+ CMOption<uint8_t> iLoadHistory;
CMOption<WORD> nLoadCount, nLoadTime;
bool bSmileyInstalled = false;
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 49aeb6873b..6bf23d43fa 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -30,7 +30,7 @@ struct FontOptionsList const wchar_t* szDescr;
COLORREF defColour;
const wchar_t* szDefFace;
- BYTE defStyle;
+ uint8_t defStyle;
char defSize;
}
static const fontOptionsList[] =
@@ -437,7 +437,7 @@ public: void RebuildList(CCtrlClc::TEventInfo* = nullptr)
{
- BYTE defType = g_dat.bTypingNew;
+ uint8_t defType = g_dat.bTypingNew;
if (hItemNew && defType)
clist.SetCheck(hItemNew, 1);
@@ -541,7 +541,7 @@ public: bool OnApply() override
{
- BYTE bOldValue = db_get_b(0, CHAT_MODULE, "Tabs", 1);
+ uint8_t bOldValue = db_get_b(0, CHAT_MODULE, "Tabs", 1);
db_set_b(0, CHAT_MODULE, "Tabs", m_chkTabs.GetState());
db_set_b(0, CHAT_MODULE, "TabBottom", m_chkTabsBottom.GetState());
diff --git a/src/core/stdpopup/src/options.cpp b/src/core/stdpopup/src/options.cpp index 103d6c9711..adc8283b4e 100644 --- a/src/core/stdpopup/src/options.cpp +++ b/src/core/stdpopup/src/options.cpp @@ -21,7 +21,7 @@ void LoadOptions() options.default_timeout = g_plugin.getDword("DefaultTimeout", 7); options.win_width = g_plugin.getDword("WinWidth", 220); options.win_max_height = g_plugin.getDword("WinMaxHeight", 400); - options.location = (PopupLocation)g_plugin.getByte("Location", (BYTE)PL_BOTTOMRIGHT); + options.location = (PopupLocation)g_plugin.getByte("Location", (uint8_t)PL_BOTTOMRIGHT); options.opacity = g_plugin.getByte("Opacity", 75); options.border = g_plugin.getByte("Border", 1) == 1; options.round = g_plugin.getByte("RoundCorners", 1) == 1; @@ -54,8 +54,8 @@ void SaveOptions() g_plugin.setDword("DefaultTimeout", options.default_timeout); g_plugin.setDword("WinWidth", options.win_width); g_plugin.setDword("WinMaxHeight", options.win_max_height); - g_plugin.setByte("Location", (BYTE)options.location); - g_plugin.setByte("Opacity", (BYTE)options.opacity); + g_plugin.setByte("Location", (uint8_t)options.location); + g_plugin.setByte("Opacity", (uint8_t)options.opacity); g_plugin.setByte("Border", (options.border ? 1 : 0)); g_plugin.setByte("RoundCorners", (options.round ? 1 : 0)); g_plugin.setByte("AvatarRoundCorners", (options.av_round ? 1 : 0)); @@ -64,11 +64,11 @@ void SaveOptions() g_plugin.setByte("UseMimMonitor", (options.use_mim_monitor ? 1 : 0)); g_plugin.setByte("RightIcon", (options.right_icon ? 1 : 0)); if (ServiceExists(MS_AV_DRAWAVATAR)) - g_plugin.setByte("AVLayout", (BYTE)options.av_layout); + g_plugin.setByte("AVLayout", (uint8_t)options.av_layout); g_plugin.setDword("AVSize", options.av_size); g_plugin.setDword("TextIndent", options.text_indent); g_plugin.setByte("GlobalHover", (options.global_hover ? 1 : 0)); - g_plugin.setByte("TimeLayout", (BYTE)options.time_layout); + g_plugin.setByte("TimeLayout", (uint8_t)options.time_layout); char buff[128]; for (int i = 0; i < _countof(options.disable_status); i++) { diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp index 771f51d049..52bdcd5dbc 100644 --- a/src/core/stdpopup/src/services.cpp +++ b/src/core/stdpopup/src/services.cpp @@ -204,7 +204,7 @@ void UpdateMenu() static INT_PTR TogglePopups(WPARAM, LPARAM) { - BYTE val = Popup_Enabled(); + uint8_t val = Popup_Enabled(); Popup_Enable(!val); UpdateMenu(); return 0; diff --git a/src/mir_app/src/Docking.cpp b/src/mir_app/src/Docking.cpp index 5336da0e0f..7fb467ac51 100644 --- a/src/mir_app/src/Docking.cpp +++ b/src/mir_app/src/Docking.cpp @@ -139,7 +139,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if (msg->message == WM_DESTROY) {
if (docked) {
- db_set_b(0, "CList", "Docked", (BYTE)docked);
+ db_set_b(0, "CList", "Docked", (uint8_t)docked);
db_set_dw(0, "CList", "DockX", (DWORD)dockPos.x);
db_set_dw(0, "CList", "DockY", (DWORD)dockPos.y);
}
diff --git a/src/mir_app/src/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp index f7aa329692..e3bf4f335a 100644 --- a/src/mir_app/src/FontOptions.cpp +++ b/src/mir_app/src/FontOptions.cpp @@ -206,7 +206,7 @@ static BOOL ExportSettings(HWND hwndDlg, const wchar_t *filename, OBJLIST<FontIn }
else if (F->flags & FIDF_SAVEPOINTSIZE) {
HDC hdc = GetDC(hwndDlg);
- iFontSize = (BYTE)-MulDiv(F->value.size, 72, GetDeviceCaps(hdc, LOGPIXELSY));
+ iFontSize = (uint8_t)-MulDiv(F->value.size, 72, GetDeviceCaps(hdc, LOGPIXELSY));
ReleaseDC(hwndDlg, hdc);
}
else iFontSize = F->value.size;
@@ -487,8 +487,8 @@ static INT_PTR CALLBACK ChooseEffectDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wPar SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN1, UDM_SETRANGE, 0, MAKELONG(255, 0));
SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN2, UDM_SETRANGE, 0, MAKELONG(255, 0));
- SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN1, UDM_SETPOS, 0, MAKELONG((BYTE)~((BYTE)((pEffect->baseColour & 0xFF000000) >> 24)), 0));
- SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN2, UDM_SETPOS, 0, MAKELONG((BYTE)~((BYTE)((pEffect->secondaryColour & 0xFF000000) >> 24)), 0));
+ SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN1, UDM_SETPOS, 0, MAKELONG((uint8_t)~((uint8_t)((pEffect->baseColour & 0xFF000000) >> 24)), 0));
+ SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN2, UDM_SETPOS, 0, MAKELONG((uint8_t)~((uint8_t)((pEffect->secondaryColour & 0xFF000000) >> 24)), 0));
return TRUE;
case WM_COMMAND:
@@ -496,9 +496,9 @@ static INT_PTR CALLBACK ChooseEffectDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wPar case IDOK:
{
int i = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COMBO, CB_GETCURSEL, 0, 0);
- pEffect->effectIndex = (BYTE)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COMBO, CB_GETITEMDATA, i, 0);
- pEffect->baseColour = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR1, CPM_GETCOLOUR, 0, 0) | ((~(BYTE)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN1, UDM_GETPOS, 0, 0)) << 24);
- pEffect->secondaryColour = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR2, CPM_GETCOLOUR, 0, 0) | ((~(BYTE)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN2, UDM_GETPOS, 0, 0)) << 24);
+ pEffect->effectIndex = (uint8_t)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COMBO, CB_GETITEMDATA, i, 0);
+ pEffect->baseColour = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR1, CPM_GETCOLOUR, 0, 0) | ((~(uint8_t)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN1, UDM_GETPOS, 0, 0)) << 24);
+ pEffect->secondaryColour = SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR2, CPM_GETCOLOUR, 0, 0) | ((~(uint8_t)SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR_SPIN2, UDM_GETPOS, 0, 0)) << 24);
}
EndDialog(hwndDlg, IDOK);
return TRUE;
@@ -547,7 +547,7 @@ static void sttSaveFontData(HWND hwndDlg, FontInternal &F) }
else if (F.flags & FIDF_SAVEPOINTSIZE) {
HDC hdc = GetDC(hwndDlg);
- db_set_b(0, F.dbSettingsGroup, str, (BYTE)-MulDiv(F.value.size, 72, GetDeviceCaps(hdc, LOGPIXELSY)));
+ db_set_b(0, F.dbSettingsGroup, str, (uint8_t)-MulDiv(F.value.size, 72, GetDeviceCaps(hdc, LOGPIXELSY)));
ReleaseDC(hwndDlg, hdc);
}
else db_set_b(0, F.dbSettingsGroup, str, F.value.size);
diff --git a/src/mir_app/src/FontService.cpp b/src/mir_app/src/FontService.cpp index 8c0343713f..534ac261a5 100644 --- a/src/mir_app/src/FontService.cpp +++ b/src/mir_app/src/FontService.cpp @@ -143,7 +143,7 @@ int GetFontSettingFromDB(char *settings_group, char *prefix, LOGFONT *lf, COLORR lf->lfHeight = (char)db_get_b(0, settings_group, idstr, lf->lfHeight);
mir_snprintf(idstr, "%sSty", prefix);
- BYTE style = (BYTE)db_get_b(0, settings_group, idstr,
+ uint8_t style = (uint8_t)db_get_b(0, settings_group, idstr,
(lf->lfWeight == FW_NORMAL ? 0 : DBFONTF_BOLD) | (lf->lfItalic ? DBFONTF_ITALIC : 0) | (lf->lfUnderline ? DBFONTF_UNDERLINE : 0) | lf->lfStrikeOut ? DBFONTF_STRIKEOUT : 0);
lf->lfWidth = lf->lfEscapement = lf->lfOrientation = 0;
diff --git a/src/mir_app/src/IcoLib.h b/src/mir_app/src/IcoLib.h index efec47bc05..4d33977422 100644 --- a/src/mir_app/src/IcoLib.h +++ b/src/mir_app/src/IcoLib.h @@ -56,7 +56,7 @@ class IconSourceItem : public MZeroedObject IconSourceItemKey key;
int ref_count;
- BYTE* icon_data;
+ uint8_t* icon_data;
int icon_size;
public:
diff --git a/src/mir_app/src/MDatabaseCommon.cpp b/src/mir_app/src/MDatabaseCommon.cpp index 5133a55b91..698f264065 100644 --- a/src/mir_app/src/MDatabaseCommon.cpp +++ b/src/mir_app/src/MDatabaseCommon.cpp @@ -389,7 +389,7 @@ LBL_Seek: memcpy(dbv->pbVal, pCachedValue->pbVal, dbv->cpbVal); } else { - dbv->pbVal = (BYTE *)mir_alloc(pCachedValue->cpbVal); + dbv->pbVal = (uint8_t *)mir_alloc(pCachedValue->cpbVal); memcpy(dbv->pbVal, pCachedValue->pbVal, pCachedValue->cpbVal); } dbv->cpbVal = pCachedValue->cpbVal; @@ -479,7 +479,7 @@ STDMETHODIMP_(BOOL) MDatabaseCommon::WriteContactSetting(MCONTACT contactID, DBC DBCONTACTWRITESETTING dbcwWork = dbcwNotif; - mir_ptr<BYTE> pEncoded(nullptr); + mir_ptr<uint8_t> pEncoded(nullptr); bool bIsEncrypted = false; switch (dbcwWork.value.type) { case DBVT_BYTE: case DBVT_WORD: case DBVT_DWORD: @@ -494,7 +494,7 @@ STDMETHODIMP_(BOOL) MDatabaseCommon::WriteContactSetting(MCONTACT contactID, DBC dbcwWork.value.cchVal = (WORD)strlen(dbcwWork.value.pszVal); if (bIsEncrypted && m_crypto) { size_t len; - BYTE *pResult = m_crypto->encodeString(dbcwWork.value.pszVal, &len); + uint8_t *pResult = m_crypto->encodeString(dbcwWork.value.pszVal, &len); if (pResult != nullptr) { pEncoded = dbcwWork.value.pbVal = pResult; dbcwWork.value.cpbVal = (WORD)len; diff --git a/src/mir_app/src/MDatabaseCommonCrypt.cpp b/src/mir_app/src/MDatabaseCommonCrypt.cpp index baa0ade9f5..4b5d9007c2 100644 --- a/src/mir_app/src/MDatabaseCommonCrypt.cpp +++ b/src/mir_app/src/MDatabaseCommonCrypt.cpp @@ -423,14 +423,14 @@ int MDatabaseCommon::InitCrypt() BOOL bSuccess = ReadCryptoKey(key); if (bSuccess && (key.length() == m_crypto->getKeyLength())) { // first try to set a key without password - if (!m_crypto->setKey(nullptr, (const BYTE*)key.data(), key.length())) { + if (!m_crypto->setKey(nullptr, (const uint8_t*)key.data(), key.length())) { CEnterPasswordDialog dlg(this); while (true) { if (!dlg.DoModal()) return 4; pass_ptrA szPassword(mir_utf8encodeW(dlg.m_newPass)); - if (m_crypto->setKey(szPassword, (const BYTE*)key.data(), key.length())) { + if (m_crypto->setKey(szPassword, (const uint8_t*)key.data(), key.length())) { m_bUsesPassword = true; break; } diff --git a/src/mir_app/src/addcontact.cpp b/src/mir_app/src/addcontact.cpp index a749fae087..83f2d9f77d 100644 --- a/src/mir_app/src/addcontact.cpp +++ b/src/mir_app/src/addcontact.cpp @@ -193,7 +193,7 @@ MIR_APP_DLL(void) Contact_AddByEvent(MEVENT hEvent, HWND hwndParent) DWORD dwData[2];
DBEVENTINFO dbei = {};
dbei.cbBlob = sizeof(dwData);
- dbei.pBlob = (BYTE*)&dwData;
+ dbei.pBlob = (uint8_t*)&dwData;
db_event_get(hEvent, &dbei);
if (dwData[0] != 0)
m_szName.Format(L"%d", dwData[0]);
diff --git a/src/mir_app/src/chat_clist.cpp b/src/mir_app/src/chat_clist.cpp index 63bef304be..76fc40e721 100644 --- a/src/mir_app/src/chat_clist.cpp +++ b/src/mir_app/src/chat_clist.cpp @@ -56,7 +56,7 @@ MCONTACT AddRoom(const char *pszModule, const wchar_t *pszRoom, const wchar_t *p db_set_ws(hContact, pszModule, "Nick", pszDisplayName);
db_set_ws(hContact, pszModule, "ChatRoomID", pszRoom);
- db_set_b(hContact, pszModule, "ChatRoom", (BYTE)iType);
+ db_set_b(hContact, pszModule, "ChatRoom", (uint8_t)iType);
db_set_w(hContact, pszModule, "Status", ID_STATUS_OFFLINE);
return hContact;
}
diff --git a/src/mir_app/src/chat_opts.cpp b/src/mir_app/src/chat_opts.cpp index 530b82878f..450d383e53 100644 --- a/src/mir_app/src/chat_opts.cpp +++ b/src/mir_app/src/chat_opts.cpp @@ -41,7 +41,7 @@ struct FontOptionsList LPCTSTR szDescr;
COLORREF defColour;
LPCTSTR szDefFace;
- BYTE defCharset, defStyle;
+ uint8_t defCharset, defStyle;
char defSize;
};
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 9358aa5247..709f983806 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -435,7 +435,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam case INTM_GROUPCHANGED:
{
WORD iExtraImage[EXTRA_ICON_COUNT];
- BYTE flags = 0;
+ uint8_t flags = 0;
if (!Clist_FindItem(hwnd, dat, wParam, &contact))
memset(iExtraImage, 0xFF, sizeof(iExtraImage));
else {
diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp index ea38ff04b6..b22ab4c6e5 100644 --- a/src/mir_app/src/clcitems.cpp +++ b/src/mir_app/src/clcitems.cpp @@ -161,7 +161,7 @@ ClcContact* fnAddInfoItemToGroup(ClcGroup *group, int flags, const wchar_t *pszT if (iInfoItemUniqueHandle == 0) ++iInfoItemUniqueHandle; cc->type = CLCIT_INFO; - cc->flags = (BYTE)flags; + cc->flags = (uint8_t)flags; cc->hContact = (MCONTACT)++iInfoItemUniqueHandle; mir_wstrncpy(cc->szText, pszText, _countof(cc->szText)); return cc; diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp index 2c75d2e81e..c3b54278d2 100644 --- a/src/mir_app/src/clcmsgs.cpp +++ b/src/mir_app/src/clcmsgs.cpp @@ -375,7 +375,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar break;
case CLM_SETHIDEOFFLINEROOT:
- db_set_b(0, "CLC", "HideOfflineRoot", (BYTE)wParam);
+ db_set_b(0, "CLC", "HideOfflineRoot", (uint8_t)wParam);
Clist_InitAutoRebuild(hwnd);
break;
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 9147c6e75a..f27670675d 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -698,7 +698,7 @@ MIR_APP_DLL(void) Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour) lf->lfHeight = (char)db_get_b(0, "CLC", idstr, lf->lfHeight);
mir_snprintf(idstr, "Font%dSty", i);
- BYTE style = (BYTE)db_get_b(0, "CLC", idstr, (lf->lfWeight == FW_NORMAL ? 0 : DBFONTF_BOLD) | (lf->lfItalic ? DBFONTF_ITALIC : 0) | (lf->lfUnderline ? DBFONTF_UNDERLINE : 0));
+ uint8_t style = (uint8_t)db_get_b(0, "CLC", idstr, (lf->lfWeight == FW_NORMAL ? 0 : DBFONTF_BOLD) | (lf->lfItalic ? DBFONTF_ITALIC : 0) | (lf->lfUnderline ? DBFONTF_UNDERLINE : 0));
lf->lfWidth = lf->lfEscapement = lf->lfOrientation = 0;
lf->lfWeight = style & DBFONTF_BOLD ? FW_BOLD : FW_NORMAL;
lf->lfItalic = (style & DBFONTF_ITALIC) != 0;
diff --git a/src/mir_app/src/clisttray.cpp b/src/mir_app/src/clisttray.cpp index 05af7a3e07..c1a54ced25 100644 --- a/src/mir_app/src/clisttray.cpp +++ b/src/mir_app/src/clisttray.cpp @@ -594,7 +594,7 @@ int fnTrayIconPauseAutoHide(WPARAM, LPARAM) /////////////////////////////////////////////////////////////////////////////////////////
// processes tray icon's messages
-static BYTE s_LastHoverIconID = 0;
+static uint8_t s_LastHoverIconID = 0;
static bool g_trayTooltipActive = false;
static POINT tray_hover_pos = { 0 };
diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index a5e081b0d2..cbfdb00278 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -452,7 +452,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (cluiopt.transparent) {
SetWindowLongPtr(hwnd, GWL_EXSTYLE, GetWindowLongPtr(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)cluiopt.alpha, LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)cluiopt.alpha, LWA_ALPHA);
}
transparentFocus = 1;
return FALSE;
@@ -552,7 +552,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM else {
if (cluiopt.transparent) {
KillTimer(hwnd, TM_AUTOALPHA);
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)cluiopt.alpha, LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)cluiopt.alpha, LWA_ALPHA);
transparentFocus = 1;
}
}
@@ -561,7 +561,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_SETCURSOR:
if (cluiopt.transparent) {
if (!transparentFocus && GetForegroundWindow() != hwnd) {
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)cluiopt.alpha, LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)cluiopt.alpha, LWA_ALPHA);
transparentFocus = 1;
SetTimer(hwnd, TM_AUTOALPHA, 250, nullptr);
}
@@ -598,9 +598,9 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (inwnd != transparentFocus) { //change
transparentFocus = inwnd;
if (transparentFocus)
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)cluiopt.alpha, LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)cluiopt.alpha, LWA_ALPHA);
else
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)db_get_b(0, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)db_get_b(0, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);
}
if (!transparentFocus)
KillTimer(hwnd, TM_AUTOALPHA);
@@ -619,14 +619,14 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int sourceAlpha, destAlpha;
if (wParam) {
sourceAlpha = 0;
- destAlpha = (BYTE)cluiopt.alpha;
+ destAlpha = (uint8_t)cluiopt.alpha;
SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), 0, LWA_ALPHA);
noRecurse = 1;
ShowWindow(hwnd, SW_SHOW);
noRecurse = 0;
}
else {
- sourceAlpha = (BYTE)cluiopt.alpha;
+ sourceAlpha = (uint8_t)cluiopt.alpha;
destAlpha = 0;
}
for (startTick = GetTickCount();;) {
@@ -634,9 +634,9 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (thisTick >= startTick + 200)
break;
SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0),
- (BYTE)(sourceAlpha + (destAlpha - sourceAlpha) * (int)(thisTick - startTick) / 200), LWA_ALPHA);
+ (uint8_t)(sourceAlpha + (destAlpha - sourceAlpha) * (int)(thisTick - startTick) / 200), LWA_ALPHA);
}
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)destAlpha, LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)destAlpha, LWA_ALPHA);
}
else {
if (wParam)
@@ -954,7 +954,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (szProto == nullptr) return 0;
int status, x;
SIZE textSize;
- BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1);
+ uint8_t showOpts = db_get_b(0, "CLUI", "SBarShow", 1);
status = Proto_GetStatus(szProto);
SetBkMode(dis->hDC, TRANSPARENT);
x = dis->rcItem.left;
diff --git a/src/mir_app/src/cluiservices.cpp b/src/mir_app/src/cluiservices.cpp index 5b4747792b..0a074d3070 100644 --- a/src/mir_app/src/cluiservices.cpp +++ b/src/mir_app/src/cluiservices.cpp @@ -102,7 +102,7 @@ void fnCluiProtocolStatusChanged(int, const char*) }
else {
SIZE textSize;
- BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1);
+ uint8_t showOpts = db_get_b(0, "CLUI", "SBarShow", 1);
HDC hdc = GetDC(nullptr);
HFONT hFont = (HFONT)SelectObject(hdc, (HFONT)SendMessage(g_clistApi.hwndStatus, WM_GETFONT, 0, 0));
diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index 0bf652d1aa..84390333d4 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -38,7 +38,7 @@ static wchar_t* nameOrderDescr[ NAMEORDERCOUNT ] = LPGENW("'(Unknown contact)' (not movable)")
};
-BYTE nameOrder[NAMEORDERCOUNT];
+uint8_t nameOrder[NAMEORDERCOUNT];
static wchar_t* ProcessDatabaseValueDefault(MCONTACT hContact, const char *szProto, const char *szSetting)
{
@@ -349,7 +349,7 @@ public: while (tvi.hItem != nullptr) {
tvi.mask = TVIF_PARAM | TVIF_HANDLE;
m_nameOrder.GetItem(&tvi);
- nameOrder[i++] = (BYTE)tvi.lParam;
+ nameOrder[i++] = (uint8_t)tvi.lParam;
tvi.hItem = m_nameOrder.GetNextSibling(tvi.hItem);
}
db_set_blob(0, "Contact", "NameOrder", nameOrder, _countof(nameOrderDescr));
@@ -379,7 +379,7 @@ static int ContactOptInit(WPARAM wParam, LPARAM) int LoadContactsModule(void)
{
- for (BYTE i = 0; i < NAMEORDERCOUNT; i++)
+ for (uint8_t i = 0; i < NAMEORDERCOUNT; i++)
nameOrder[i] = i;
DBVARIANT dbv;
diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp index 91e94fd865..c6d7c4828d 100644 --- a/src/mir_app/src/db_ini.cpp +++ b/src/mir_app/src/db_ini.cpp @@ -308,7 +308,7 @@ static void ProcessIniFile(wchar_t* szIniPath, char *szSafeSections, char *szUns break;
LBL_NewLine:
size_t lineLength = mir_strlen(szLine);
- while (lineLength && (BYTE)(szLine[lineLength - 1]) <= ' ')
+ while (lineLength && (uint8_t)(szLine[lineLength - 1]) <= ' ')
szLine[--lineLength] = '\0';
if (szLine[0] == ';' || szLine[0] <= ' ')
@@ -390,7 +390,7 @@ LBL_NewLine: switch (szValue[0]) {
case 'b':
case 'B':
- db_set_b(0, szSection, szName, (BYTE)strtol(szValue + 1, nullptr, 0));
+ db_set_b(0, szSection, szName, (uint8_t)strtol(szValue + 1, nullptr, 0));
break;
case 'w':
case 'W':
@@ -469,7 +469,7 @@ LBL_NewLine: uint8_t *buf = (uint8_t*)mir_alloc(mir_strlen(szValue + 1));
for (len = 0, pszValue = szValue + 1;; len++) {
- buf[len] = (BYTE)strtol(pszValue, &pszEnd, 0x10);
+ buf[len] = (uint8_t)strtol(pszValue, &pszEnd, 0x10);
if (pszValue == pszEnd)
break;
pszValue = pszEnd;
diff --git a/src/mir_app/src/dll_sniffer.cpp b/src/mir_app/src/dll_sniffer.cpp index 2a3ecc0418..a1bf510baa 100644 --- a/src/mir_app/src/dll_sniffer.cpp +++ b/src/mir_app/src/dll_sniffer.cpp @@ -66,7 +66,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin) return nullptr;
MUUID *pResult = nullptr;
- BYTE *ptr = nullptr;
+ uint8_t *ptr = nullptr;
HANDLE hMap = CreateFileMapping(hFile, nullptr, PAGE_READONLY, 0, 0, nullptr);
__try {
@@ -81,7 +81,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin) if (filesize < sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS))
__leave;
- ptr = (BYTE*)MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0);
+ ptr = (uint8_t*)MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0);
if (ptr == nullptr)
__leave;
@@ -131,7 +131,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin) else if (expSize < sizeof(IMAGE_EXPORT_DIRECTORY))
__leave;
- BYTE* pImage = ptr + pIDH->e_lfanew + pINTH->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_NT_HEADERS) - sizeof(IMAGE_OPTIONAL_HEADER);
+ uint8_t* pImage = ptr + pIDH->e_lfanew + pINTH->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_NT_HEADERS) - sizeof(IMAGE_OPTIONAL_HEADER);
for (DWORD idx = 0; idx < nSections; idx++) {
PIMAGE_SECTION_HEADER pISH = (PIMAGE_SECTION_HEADER)(pImage + idx * sizeof(IMAGE_SECTION_HEADER));
@@ -140,7 +140,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin) // process export table
if (expSize >= sizeof(IMAGE_EXPORT_DIRECTORY) && Contains(pISH, expAddr, expSize)) {
- BYTE *pSecStart = ptr + pISH->PointerToRawData - pISH->VirtualAddress;
+ uint8_t *pSecStart = ptr + pISH->PointerToRawData - pISH->VirtualAddress;
IMAGE_EXPORT_DIRECTORY *pED = (PIMAGE_EXPORT_DIRECTORY)&pSecStart[expAddr];
DWORD *ptrRVA = (DWORD*)&pSecStart[pED->AddressOfNames];
WORD *ptrOrdRVA = (WORD*)&pSecStart[pED->AddressOfNameOrdinals];
@@ -174,15 +174,15 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin) if (resSize > 0 && Contains(pISH, resAddr, resSize)) {
dwVersion = 0;
- BYTE *pSecStart = ptr + pISH->PointerToRawData - pISH->VirtualAddress;
+ uint8_t *pSecStart = ptr + pISH->PointerToRawData - pISH->VirtualAddress;
IMAGE_RESOURCE_DIRECTORY *pIRD = (IMAGE_RESOURCE_DIRECTORY*)&pSecStart[resAddr];
ProcessResourcesDirectory(pIRD, &pSecStart[resAddr], 0);
// patch version
if (dwVersion) {
- BYTE *pVersionRes = &pSecStart[dwVersion];
+ uint8_t *pVersionRes = &pSecStart[dwVersion];
size_t cbLen = *(WORD*)pVersionRes;
- mir_ptr<BYTE> pData((BYTE*)mir_alloc(cbLen));
+ mir_ptr<uint8_t> pData((uint8_t*)mir_alloc(cbLen));
memcpy(pData, pVersionRes, cbLen);
UINT blockSize;
diff --git a/src/mir_app/src/ei_options.cpp b/src/mir_app/src/ei_options.cpp index f9c1f13b6e..c055785739 100644 --- a/src/mir_app/src/ei_options.cpp +++ b/src/mir_app/src/ei_options.cpp @@ -286,7 +286,7 @@ public: // Get user data and create new groups LIST<ExtraIconGroup> groups(1); - BYTE pos = 0; + uint8_t pos = 0; int firstEmptySlot = 0; HTREEITEM ht = m_tree.GetRoot(); TVITEMEX tvi; diff --git a/src/mir_app/src/extracticon.cpp b/src/mir_app/src/extracticon.cpp index 4bf8f954b8..3a563ac7c8 100644 --- a/src/mir_app/src/extracticon.cpp +++ b/src/mir_app/src/extracticon.cpp @@ -51,7 +51,7 @@ typedef struct void* _RelativeVirtualAddresstoPtr(IMAGE_DOS_HEADER *pDosHeader, DWORD rva)
{
- IMAGE_NT_HEADERS *pPE = (IMAGE_NT_HEADERS*)((BYTE*)pDosHeader + pDosHeader->e_lfanew);
+ IMAGE_NT_HEADERS *pPE = (IMAGE_NT_HEADERS*)((uint8_t*)pDosHeader + pDosHeader->e_lfanew);
IMAGE_SECTION_HEADER *pSection = IMAGE_FIRST_SECTION(pPE);
for (int i = 0; i < pPE->FileHeader.NumberOfSections; i++) {
@@ -67,7 +67,7 @@ void* _RelativeVirtualAddresstoPtr(IMAGE_DOS_HEADER *pDosHeader, DWORD rva) void* _GetResourceTable(IMAGE_DOS_HEADER* pDosHeader)
{
- IMAGE_NT_HEADERS *pPE = (IMAGE_NT_HEADERS*)((BYTE*)pDosHeader + pDosHeader->e_lfanew);
+ IMAGE_NT_HEADERS *pPE = (IMAGE_NT_HEADERS*)((uint8_t*)pDosHeader + pDosHeader->e_lfanew);
if (pPE->Signature != IMAGE_NT_SIGNATURE || pPE->FileHeader.SizeOfOptionalHeader < 2)
return nullptr;
diff --git a/src/mir_app/src/hotkey_opts.cpp b/src/mir_app/src/hotkey_opts.cpp index b3c7845b63..4ccea79193 100644 --- a/src/mir_app/src/hotkey_opts.cpp +++ b/src/mir_app/src/hotkey_opts.cpp @@ -99,7 +99,7 @@ static wchar_t* sttHokeyVkToName(WORD vkKey) return buf; } -void HotkeyToName(wchar_t *buf, int size, BYTE shift, BYTE key) +void HotkeyToName(wchar_t *buf, int size, uint8_t shift, uint8_t key) { mir_snwprintf(buf, size, L"%s%s%s%s%s", (shift & HOTKEYF_CONTROL) ? TranslateT("Ctrl + ") : L"", @@ -125,8 +125,8 @@ static LRESULT CALLBACK sttHotkeyEditProc(HWND hwnd, UINT msg, WPARAM wParam, LP case HKM_SETHOTKEY: { wchar_t buf[256] = { 0 }; - data->key = (BYTE)LOWORD(wParam); - data->shift = (BYTE)HIWORD(wParam); + data->key = (uint8_t)LOWORD(wParam); + data->shift = (uint8_t)HIWORD(wParam); HotkeyToName(buf, _countof(buf), data->shift, data->key); SetWindowText(hwnd, buf); } @@ -153,8 +153,8 @@ static LRESULT CALLBACK sttHotkeyEditProc(HWND hwnd, UINT msg, WPARAM wParam, LP { wchar_t buf[256] = { 0 }; - BYTE shift = 0; - BYTE key = wParam; + uint8_t shift = 0; + uint8_t key = wParam; wchar_t *name = sttHokeyVkToName(key); if (!*name || !bKeyDown) key = 0; @@ -356,9 +356,9 @@ static void sttOptionsSaveItem(THotkeyItem *item) item->Enabled = item->OptEnabled; db_set_w(0, DBMODULENAME, item->pszName, item->Hotkey); - db_set_b(0, DBMODULENAME "Off", item->pszName, (BYTE)!item->Enabled); + db_set_b(0, DBMODULENAME "Off", item->pszName, (uint8_t)!item->Enabled); if (item->type != HKT_MANUAL) - db_set_b(0, DBMODULENAME "Types", item->pszName, (BYTE)item->type); + db_set_b(0, DBMODULENAME "Types", item->pszName, (uint8_t)item->type); item->nSubHotkeys = 0; for (auto &it : hotkeys) { @@ -369,7 +369,7 @@ static void sttOptionsSaveItem(THotkeyItem *item) mir_snprintf(buf, "%s$%d", item->pszName, item->nSubHotkeys); db_set_w(0, DBMODULENAME, buf, it->Hotkey); if (it->type != HKT_MANUAL) - db_set_b(0, DBMODULENAME "Types", buf, (BYTE)it->type); + db_set_b(0, DBMODULENAME "Types", buf, (uint8_t)it->type); ++item->nSubHotkeys; } diff --git a/src/mir_app/src/hotkeys.cpp b/src/mir_app/src/hotkeys.cpp index ce70c5d008..3b4501bb5b 100644 --- a/src/mir_app/src/hotkeys.cpp +++ b/src/mir_app/src/hotkeys.cpp @@ -57,7 +57,7 @@ WORD GetHotkeyValue(INT_PTR idHotkey) return 0;
}
-static void sttWordToModAndVk(WORD w, BYTE *mod, BYTE *vk)
+static void sttWordToModAndVk(WORD w, uint8_t *mod, uint8_t *vk)
{
*mod = 0;
if (HIBYTE(w) & HOTKEYF_CONTROL) *mod |= MOD_CONTROL;
@@ -89,7 +89,7 @@ static LRESULT CALLBACK sttHotkeyHostWndProc(HWND hwnd, UINT msg, WPARAM wParam, static LRESULT CALLBACK sttKeyboardProc(int code, WPARAM wParam, LPARAM lParam)
{
if (code == HC_ACTION && !(HIWORD(lParam) & KF_UP)) {
- BYTE mod = 0, vk = wParam;
+ uint8_t mod = 0, vk = wParam;
if (vk) {
if (GetAsyncKeyState(VK_CONTROL)) mod |= MOD_CONTROL;
@@ -101,7 +101,7 @@ static LRESULT CALLBACK sttKeyboardProc(int code, WPARAM wParam, LPARAM lParam) if (p->type != HKT_LOCAL || !p->Enabled)
continue;
- BYTE hkMod, hkVk;
+ uint8_t hkMod, hkVk;
sttWordToModAndVk(p->Hotkey, &hkMod, &hkVk);
if (!hkVk) continue;
if (p->pszService && vk == hkVk && mod == hkMod) {
@@ -168,7 +168,7 @@ MIR_APP_DLL(int) Hotkey_Register(const HOTKEYDESC *desc, HPLUGIN pPlugin) p->idHotkey = GlobalAddAtomA(buf);
if (p->type == HKT_GLOBAL) {
if (p->Enabled) {
- BYTE mod, vk;
+ uint8_t mod, vk;
sttWordToModAndVk(p->Hotkey, &mod, &vk);
if (vk)
RegisterHotKey(g_hwndHotkeyHost, p->idHotkey, mod, vk);
@@ -232,7 +232,7 @@ MIR_APP_DLL(int) Hotkey_Unregister(const char *pszName) MIR_APP_DLL(int) Hotkey_Check(MSG *msg, const char *szSection)
{
if (msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN) {
- BYTE mod = 0, vk = msg->wParam;
+ uint8_t mod = 0, vk = msg->wParam;
if (vk) {
if (GetAsyncKeyState(VK_CONTROL)) mod |= MOD_CONTROL;
if (GetAsyncKeyState(VK_MENU)) mod |= MOD_ALT;
@@ -244,7 +244,7 @@ MIR_APP_DLL(int) Hotkey_Check(MSG *msg, const char *szSection) if ((p->type != HKT_MANUAL) || mir_wstrcmp(pszSection, p->pwszSection))
continue;
- BYTE hkMod, hkVk;
+ uint8_t hkMod, hkVk;
sttWordToModAndVk(p->Hotkey, &hkMod, &hkVk);
if (!hkVk) continue;
if (!p->Enabled) continue;
@@ -275,7 +275,7 @@ void RegisterHotkeys() UnregisterHotKey(g_hwndHotkeyHost, p->idHotkey);
if (p->type != HKT_GLOBAL) continue;
if (p->Enabled) {
- BYTE mod, vk;
+ uint8_t mod, vk;
sttWordToModAndVk(p->Hotkey, &mod, &vk);
if (vk)
RegisterHotKey(g_hwndHotkeyHost, p->idHotkey, mod, vk);
@@ -346,7 +346,7 @@ int LoadSkinHotkeys(void) mir_snprintf(szSetting, "HKEn%s", oldSettings[i]);
if ((key = db_get_b(0, "Clist", szSetting, 0))) {
db_unset(0, "Clist", szSetting);
- db_set_b(0, DBMODULENAME "Off", newSettings[i], (BYTE)(key == 0));
+ db_set_b(0, DBMODULENAME "Off", newSettings[i], (uint8_t)(key == 0));
}
}
diff --git a/src/mir_app/src/icolib.cpp b/src/mir_app/src/icolib.cpp index 136a629689..3030dd6d1b 100644 --- a/src/mir_app/src/icolib.cpp +++ b/src/mir_app/src/icolib.cpp @@ -254,11 +254,11 @@ int IconSourceItem::getIconData(HICON hIcon) return 1; // Failure
}
- mir_ptr<BYTE>
- MonoInfo((BYTE*)mir_calloc(MonoInfoSize)),
- MonoBits((BYTE*)mir_calloc(MonoBitsSize)),
- ColorInfo((BYTE*)mir_calloc(ColorInfoSize)),
- ColorBits((BYTE*)mir_calloc(ColorBitsSize));
+ mir_ptr<uint8_t>
+ MonoInfo((uint8_t*)mir_calloc(MonoInfoSize)),
+ MonoBits((uint8_t*)mir_calloc(MonoBitsSize)),
+ ColorInfo((uint8_t*)mir_calloc(ColorInfoSize)),
+ ColorBits((uint8_t*)mir_calloc(ColorBitsSize));
if (InternalGetDIB(iconInfo.hbmMask, nullptr, MonoInfo, MonoBits)
|| InternalGetDIB(iconInfo.hbmColor, nullptr, ColorInfo, ColorBits)) {
@@ -268,10 +268,10 @@ int IconSourceItem::getIconData(HICON hIcon) }
icon_size = ColorInfoSize + ColorBitsSize + MonoBitsSize;
- icon_data = (BYTE*)mir_alloc(icon_size);
+ icon_data = (uint8_t*)mir_alloc(icon_size);
- BYTE *buf = icon_data;
- ((BITMAPINFOHEADER*)(BYTE*)ColorInfo)->biHeight *= 2; // color height includes mono bits
+ uint8_t *buf = icon_data;
+ ((BITMAPINFOHEADER*)(uint8_t*)ColorInfo)->biHeight *= 2; // color height includes mono bits
memcpy(buf, ColorInfo, ColorInfoSize);
buf += ColorInfoSize;
memcpy(buf, ColorBits, ColorBitsSize);
diff --git a/src/mir_app/src/image_utils.cpp b/src/mir_app/src/image_utils.cpp index 313fb2bada..6a892f90bd 100644 --- a/src/mir_app/src/image_utils.cpp +++ b/src/mir_app/src/image_utils.cpp @@ -166,7 +166,7 @@ MIR_APP_DLL(HBITMAP) Image_LoadFromMem(const void *pBuf, size_t cbLen, FREE_IMAG if (cbLen == 0 || pBuf == nullptr) return 0; - FIMEMORY *hmem = FreeImage_OpenMemory((BYTE *)pBuf, (DWORD)cbLen); + FIMEMORY *hmem = FreeImage_OpenMemory((uint8_t *)pBuf, (DWORD)cbLen); if (fif == FIF_UNKNOWN) fif = FreeImage_GetFileTypeFromMemory(hmem, 0); diff --git a/src/mir_app/src/langpack.h b/src/mir_app/src/langpack.h index fd980d46ab..0ab5d403bb 100644 --- a/src/mir_app/src/langpack.h +++ b/src/mir_app/src/langpack.h @@ -46,7 +46,7 @@ struct LANGPACK_INFO FILETIME ftFileDate;
wchar_t tszFileName[MAX_PATH]; /* just the file name itself */
wchar_t tszFullPath[MAX_PATH]; /* full path to the langpack */
- BYTE flags; /* see LPIF_* flags */
+ uint8_t flags; /* see LPIF_* flags */
};
int LangpackOptionsInit(WPARAM wParam, LPARAM);
diff --git a/src/mir_app/src/mdatabasecache.cpp b/src/mir_app/src/mdatabasecache.cpp index 5fffa1d553..ddd8db2c82 100644 --- a/src/mir_app/src/mdatabasecache.cpp +++ b/src/mir_app/src/mdatabasecache.cpp @@ -183,9 +183,9 @@ void MDatabaseCache::SetCachedVariant(DBVARIANT* s /* new */, DBVARIANT* d /* ca }
if (szSave != nullptr)
- d->pbVal = (BYTE*)mir_realloc(szSave, s->cpbVal);
+ d->pbVal = (uint8_t*)mir_realloc(szSave, s->cpbVal);
else
- d->pbVal = (BYTE*)mir_alloc(s->cpbVal);
+ d->pbVal = (uint8_t*)mir_alloc(s->cpbVal);
memcpy(d->pbVal, s->pbVal, s->cpbVal);
}
}
diff --git a/src/mir_app/src/menu_groups.cpp b/src/mir_app/src/menu_groups.cpp index 3125f027ce..781e24d3da 100644 --- a/src/mir_app/src/menu_groups.cpp +++ b/src/mir_app/src/menu_groups.cpp @@ -106,7 +106,7 @@ INT_PTR FreeOwnerDataGroupMenu(WPARAM, LPARAM lParam) static INT_PTR HideGroupsHelper(WPARAM, LPARAM)
{
int newVal = !(GetWindowLongPtr(g_clistApi.hwndContactTree, GWL_STYLE) & CLS_HIDEEMPTYGROUPS);
- db_set_b(0, "CList", "HideEmptyGroups", (BYTE)newVal);
+ db_set_b(0, "CList", "HideEmptyGroups", (uint8_t)newVal);
SendMessage(g_clistApi.hwndContactTree, CLM_SETHIDEEMPTYGROUPS, newVal, 0);
return newVal;
}
diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp index 6d8c142330..53b9c3e56e 100644 --- a/src/mir_app/src/menu_utils.cpp +++ b/src/mir_app/src/menu_utils.cpp @@ -947,7 +947,7 @@ static void CALLBACK sttUpdateMenuService() mi.flags = CMIF_CUSTOM;
mi.name.a = LPGEN("New submenu");
mi.position = 500050000;
- BYTE *p = (BYTE*)&mi.uid;
+ uint8_t *p = (uint8_t*)&mi.uid;
for (int k = 0; k < sizeof(MUUID); k++) {
int tmp;
sscanf(&szCustomMenu[k*2], "%02x", &tmp);
diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index 940751218c..320456e9cf 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -180,7 +180,7 @@ bool ProcessFileDrop(HDROP hDrop, MCONTACT hContact); void RegisterModule(CMPluginBase*);
-void HotkeyToName(wchar_t *buf, int size, BYTE shift, BYTE key);
+void HotkeyToName(wchar_t *buf, int size, uint8_t shift, uint8_t key);
WORD GetHotkeyValue(INT_PTR idHotkey);
HBITMAP ConvertIconToBitmap(HIMAGELIST hIml, int iconId);
diff --git a/src/mir_app/src/netlib.cpp b/src/mir_app/src/netlib.cpp index eefbfd6641..c94e6744d3 100644 --- a/src/mir_app/src/netlib.cpp +++ b/src/mir_app/src/netlib.cpp @@ -494,7 +494,7 @@ int LoadNetlibModule(void) if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyn, 0, KEY_QUERY_VALUE, &hSettings) == ERROR_SUCCESS) {
DWORD tValueLen, enabled;
tValueLen = sizeof(enabled);
- if (RegQueryValueExA(hSettings, valn, nullptr, nullptr, (BYTE*)&enabled, &tValueLen) == ERROR_SUCCESS && enabled)
+ if (RegQueryValueExA(hSettings, valn, nullptr, nullptr, (uint8_t*)&enabled, &tValueLen) == ERROR_SUCCESS && enabled)
connectionTimeout = 150; // if enabled limit is set to 10 / sec
RegCloseKey(hSettings);
}
diff --git a/src/mir_app/src/netlib_autoproxy.cpp b/src/mir_app/src/netlib_autoproxy.cpp index a7ee6e1260..f16396569f 100644 --- a/src/mir_app/src/netlib_autoproxy.cpp +++ b/src/mir_app/src/netlib_autoproxy.cpp @@ -278,18 +278,18 @@ void NetlibLoadIeProxy(void) char szHostStr[256] = "", szProxyBypassStr[4096] = ""; tValueLen = sizeof(enabled); - int tResult = RegQueryValueExA(hSettings, "ProxyEnable", nullptr, nullptr, (BYTE*)&enabled, &tValueLen); + int tResult = RegQueryValueExA(hSettings, "ProxyEnable", nullptr, nullptr, (uint8_t*)&enabled, &tValueLen); bEnabled = enabled && tResult == ERROR_SUCCESS; tValueLen = _countof(szHostStr); - tResult = RegQueryValueExA(hSettings, "ProxyServer", nullptr, nullptr, (BYTE*)szHostStr, &tValueLen); + tResult = RegQueryValueExA(hSettings, "ProxyServer", nullptr, nullptr, (uint8_t*)szHostStr, &tValueLen); bEnabled = bEnabled && tResult == ERROR_SUCCESS; tValueLen = _countof(szAutoUrlStr); - RegQueryValueExA(hSettings, "AutoConfigUrl", nullptr, nullptr, (BYTE*)szAutoUrlStr, &tValueLen); + RegQueryValueExA(hSettings, "AutoConfigUrl", nullptr, nullptr, (uint8_t*)szAutoUrlStr, &tValueLen); tValueLen = _countof(szProxyBypassStr); - RegQueryValueExA(hSettings, "ProxyOverride", nullptr, nullptr, (BYTE*)szProxyBypassStr, &tValueLen); + RegQueryValueExA(hSettings, "ProxyOverride", nullptr, nullptr, (uint8_t*)szProxyBypassStr, &tValueLen); RegCloseKey(hSettings); diff --git a/src/mir_app/src/netlib_openconn.cpp b/src/mir_app/src/netlib_openconn.cpp index 6ebd099d6c..9eb61a582b 100644 --- a/src/mir_app/src/netlib_openconn.cpp +++ b/src/mir_app/src/netlib_openconn.cpp @@ -145,21 +145,21 @@ static int NetlibInitSocks4Connection(NetlibConnection *nlc, NetlibUser *nlu, NE return 0; } - switch ((BYTE)reply[1]) { + switch ((uint8_t)reply[1]) { case 90: return 1; case 91: SetLastError(ERROR_ACCESS_DENIED); break; case 92: SetLastError(ERROR_CONNECTION_UNAVAIL); break; case 93: SetLastError(ERROR_INVALID_ACCESS); break; default: SetLastError(ERROR_INVALID_DATA); break; } - Netlib_Logf(nlu, "%s %d: Proxy connection failed (%x %u)", __FILE__, __LINE__, (BYTE)reply[1], GetLastError()); + Netlib_Logf(nlu, "%s %d: Proxy connection failed (%x %u)", __FILE__, __LINE__, (uint8_t)reply[1], GetLastError()); return 0; } static int NetlibInitSocks5Connection(NetlibConnection *nlc, NetlibUser *nlu, NETLIBOPENCONNECTION *nloc) { //rfc1928 - BYTE buf[258]; + uint8_t buf[258]; buf[0] = 5; //yep, socks5 buf[1] = 1; //one auth method @@ -185,9 +185,9 @@ static int NetlibInitSocks5Connection(NetlibConnection *nlc, NetlibUser *nlu, NE size_t nPassLen = mir_strlen(nlu->settings.szProxyAuthPassword); uint8_t *pAuthBuf = (uint8_t*)mir_alloc(3 + nUserLen + nPassLen); pAuthBuf[0] = 1; //auth version - pAuthBuf[1] = (BYTE)nUserLen; + pAuthBuf[1] = (uint8_t)nUserLen; memcpy(pAuthBuf + 2, nlu->settings.szProxyAuthUser, nUserLen); - pAuthBuf[2 + nUserLen] = (BYTE)nPassLen; + pAuthBuf[2 + nUserLen] = (uint8_t)nPassLen; memcpy(pAuthBuf + 3 + nUserLen, nlu->settings.szProxyAuthPassword, nPassLen); if (Netlib_Send(nlc, (char*)pAuthBuf, int(3 + nUserLen + nPassLen), MSG_DUMPPROXY) == SOCKET_ERROR) { Netlib_Logf(nlu, "%s %d: %s() failed (%u)", __FILE__, __LINE__, "Netlib_Send", GetLastError()); @@ -226,7 +226,7 @@ static int NetlibInitSocks5Connection(NetlibConnection *nlc, NetlibUser *nlu, NE pInit[2] = 0; //reserved if (hostIP == INADDR_NONE) { //DNS lookup through proxy pInit[3] = 3; - pInit[4] = BYTE(nHostLen - 1); + pInit[4] = uint8_t(nHostLen - 1); memcpy(pInit + 5, nloc->szHost, nHostLen - 1); } else { diff --git a/src/mir_app/src/netlib_opts.cpp b/src/mir_app/src/netlib_opts.cpp index 7ae1fee706..c364314bd1 100644 --- a/src/mir_app/src/netlib_opts.cpp +++ b/src/mir_app/src/netlib_opts.cpp @@ -198,21 +198,21 @@ static void ChangeSettingStringByEdit(HWND hwndDlg, UINT ctrlId, int iUser, int static void WriteSettingsStructToDb(const char *szSettingsModule, NETLIBUSERSETTINGS *settings, DWORD flags) { if (flags & NUF_OUTGOING) { - db_set_b(0, szSettingsModule, "NLValidateSSL", (BYTE)settings->validateSSL); - db_set_b(0, szSettingsModule, "NLUseProxy", (BYTE)settings->useProxy); - db_set_b(0, szSettingsModule, "NLProxyType", (BYTE)settings->proxyType); + db_set_b(0, szSettingsModule, "NLValidateSSL", (uint8_t)settings->validateSSL); + db_set_b(0, szSettingsModule, "NLUseProxy", (uint8_t)settings->useProxy); + db_set_b(0, szSettingsModule, "NLProxyType", (uint8_t)settings->proxyType); db_set_s(0, szSettingsModule, "NLProxyServer", settings->szProxyServer ? settings->szProxyServer : ""); db_set_w(0, szSettingsModule, "NLProxyPort", (WORD)settings->wProxyPort); - db_set_b(0, szSettingsModule, "NLUseProxyAuth", (BYTE)settings->useProxyAuth); + db_set_b(0, szSettingsModule, "NLUseProxyAuth", (uint8_t)settings->useProxyAuth); db_set_s(0, szSettingsModule, "NLProxyAuthUser", settings->szProxyAuthUser ? settings->szProxyAuthUser : ""); db_set_s(0, szSettingsModule, "NLProxyAuthPassword", settings->szProxyAuthPassword ? settings->szProxyAuthPassword : ""); - db_set_b(0, szSettingsModule, "NLDnsThroughProxy", (BYTE)settings->dnsThroughProxy); - db_set_b(0, szSettingsModule, "NLSpecifyOutgoingPorts", (BYTE)settings->specifyOutgoingPorts); + db_set_b(0, szSettingsModule, "NLDnsThroughProxy", (uint8_t)settings->dnsThroughProxy); + db_set_b(0, szSettingsModule, "NLSpecifyOutgoingPorts", (uint8_t)settings->specifyOutgoingPorts); db_set_s(0, szSettingsModule, "NLOutgoingPorts", settings->szOutgoingPorts ? settings->szOutgoingPorts : ""); } if (flags & NUF_INCOMING) { - db_set_b(0, szSettingsModule, "NLEnableUPnP", (BYTE)settings->enableUPnP); - db_set_b(0, szSettingsModule, "NLSpecifyIncomingPorts", (BYTE)settings->specifyIncomingPorts); + db_set_b(0, szSettingsModule, "NLEnableUPnP", (uint8_t)settings->enableUPnP); + db_set_b(0, szSettingsModule, "NLSpecifyIncomingPorts", (uint8_t)settings->specifyIncomingPorts); db_set_s(0, szSettingsModule, "NLIncomingPorts", settings->szIncomingPorts ? settings->szIncomingPorts : ""); } } diff --git a/src/mir_app/src/netlib_security.cpp b/src/mir_app/src/netlib_security.cpp index 0fb8734a3c..ed3de5cd15 100644 --- a/src/mir_app/src/netlib_security.cpp +++ b/src/mir_app/src/netlib_security.cpp @@ -54,8 +54,8 @@ struct NtlmType2packet DWORD type; // == 2 NTLM_String targetName; DWORD flags; - BYTE challenge[8]; - BYTE context[8]; + uint8_t challenge[8]; + uint8_t context[8]; NTLM_String targetInfo; }; @@ -220,7 +220,7 @@ char* NtlmCreateResponseFromChallenge(HANDLE hSecurity, const char *szChallenge, bool hasChallenge = szChallenge != nullptr && szChallenge[0] != '\0'; if (hasChallenge) { size_t tokenLen; - BYTE *token = (BYTE*)mir_base64_decode(szChallenge, &tokenLen); + uint8_t *token = (uint8_t*)mir_base64_decode(szChallenge, &tokenLen); if (token == nullptr) return nullptr; diff --git a/src/mir_app/src/netlib_websocket.cpp b/src/mir_app/src/netlib_websocket.cpp index dc516a2b5c..2ab76f717a 100644 --- a/src/mir_app/src/netlib_websocket.cpp +++ b/src/mir_app/src/netlib_websocket.cpp @@ -76,7 +76,7 @@ MIR_APP_DLL(bool) WebSocket_InitHeader(WSHeader &hdr, const void *pData, size_t if (bufSize < 2) return false; - auto *buf = (const BYTE *)pData; + auto *buf = (const uint8_t *)pData; hdr.bIsFinal = (buf[0] & 0x80) != 0; hdr.bIsMasked = (buf[1] & 0x80) != 0; hdr.opCode = buf[0] & 0x0F; @@ -112,9 +112,9 @@ MIR_APP_DLL(bool) WebSocket_InitHeader(WSHeader &hdr, const void *pData, size_t ///////////////////////////////////////////////////////////////////////////////////////// -static void WebSocket_Send(HNETLIBCONN nlc, const void *pData, size_t dataLen, BYTE opCode) +static void WebSocket_Send(HNETLIBCONN nlc, const void *pData, size_t dataLen, uint8_t opCode) { - BYTE header[20]; + uint8_t header[20]; size_t datalen; header[0] = 0x80 + (opCode & 0x7F); diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp index 7a32263296..e82acc3879 100644 --- a/src/mir_app/src/options.cpp +++ b/src/mir_app/src/options.cpp @@ -40,7 +40,7 @@ HANDLE hOptionsInitEvent; static class COptionsDlg *pOptionsDlg = nullptr;
// Thread for search keywords in dialogs
-static BYTE bSearchState = 0; // 0 - not executed; 1 - in progress; 2 - completed;
+static uint8_t bSearchState = 0; // 0 - not executed; 1 - in progress; 2 - completed;
static bool bLoadingPrivateOptions = false;
static int FilterLoadProgress = 100;
@@ -104,7 +104,7 @@ static void AeroPaintControl(HWND hwnd, HDC hdc, UINT msg, LPARAM lpFlags) bmi.bmiHeader.biBitCount = 32;
bmi.bmiHeader.biCompression = BI_RGB;
- BYTE *pBits;
+ uint8_t *pBits;
HBITMAP hBmp = CreateDIBSection(tempDC, &bmi, DIB_RGB_COLORS, (void **)&pBits, nullptr, 0);
if (hBmp && pBits) {
HBITMAP hOldBmp = (HBITMAP)SelectObject(tempDC, hBmp);
@@ -419,7 +419,7 @@ class COptionsDlg : public CDlgBase char buf[130];
GetTreeSettingName(tvi.lParam, buf, _countof(buf));
- db_set_b(0, "Options", buf, (BYTE)((tvi.state & TVIS_EXPANDED) ? 1 : 0));
+ db_set_b(0, "Options", buf, (uint8_t)((tvi.state & TVIS_EXPANDED) ? 1 : 0));
}
}
diff --git a/src/mir_app/src/proto_interface.cpp b/src/mir_app/src/proto_interface.cpp index fe8e39ca46..f2d44ccc6e 100644 --- a/src/mir_app/src/proto_interface.cpp +++ b/src/mir_app/src/proto_interface.cpp @@ -191,7 +191,7 @@ MEVENT PROTO_INTERFACE::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre) return 0; ptrA pszTemp; - mir_ptr<BYTE> pszBlob; + mir_ptr<uint8_t> pszBlob; DBEVENTINFO dbei = {}; dbei.flags = DBEF_UTF; diff --git a/src/mir_app/src/proto_ui.cpp b/src/mir_app/src/proto_ui.cpp index 7d56677457..309f1026d0 100644 --- a/src/mir_app/src/proto_ui.cpp +++ b/src/mir_app/src/proto_ui.cpp @@ -42,7 +42,7 @@ CProtoIntDlgBase::CProtoIntDlgBase(PROTO_INTERFACE *proto, int idDialog) : {
}
-void CProtoIntDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, BYTE type, DWORD iValue)
+void CProtoIntDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, uint8_t type, DWORD iValue)
{
ctrl.CreateDbLink(m_proto_interface->m_szModuleName, szSetting, type, iValue);
}
diff --git a/src/mir_app/src/pu_utils.cpp b/src/mir_app/src/pu_utils.cpp index e6326bc6ad..b3f68572fc 100644 --- a/src/mir_app/src/pu_utils.cpp +++ b/src/mir_app/src/pu_utils.cpp @@ -187,7 +187,7 @@ MIR_APP_DLL(bool) PU::PrepareEscalation() static int TransactPipe(int opcode, const wchar_t *p1, const wchar_t *p2) { - BYTE buf[1024]; + uint8_t buf[1024]; DWORD l1 = lstrlen(p1), l2 = lstrlen(p2); if (l1 > MAX_PATH || l2 > MAX_PATH) return ERROR_BAD_ARGUMENTS; @@ -203,7 +203,7 @@ static int TransactPipe(int opcode, const wchar_t *p1, const wchar_t *p2) else *dst++ = 0; DWORD dwBytes = 0, dwError; - if (!WriteFile(g_hPipe, buf, (DWORD)((BYTE *)dst - buf), &dwBytes, nullptr)) + if (!WriteFile(g_hPipe, buf, (DWORD)((uint8_t *)dst - buf), &dwBytes, nullptr)) return GetLastError(); dwError = 0; diff --git a/src/mir_app/src/searchresults.cpp b/src/mir_app/src/searchresults.cpp index edf93b0ff8..7a1b17fb45 100644 --- a/src/mir_app/src/searchresults.cpp +++ b/src/mir_app/src/searchresults.cpp @@ -46,12 +46,12 @@ void SaveColumnSizes(HWND hwndResults) for (int i = 0; i < NUM_COLUMNID; i++) {
char szSetting[32];
mir_snprintf(szSetting, "ColOrder%d", i);
- db_set_b(0, "FindAdd", szSetting, (BYTE)columnOrder[i]);
+ db_set_b(0, "FindAdd", szSetting, (uint8_t)columnOrder[i]);
mir_snprintf(szSetting, "ColWidth%d", i);
db_set_w(0, "FindAdd", szSetting, (WORD)ListView_GetColumnWidth(hwndResults, i));
}
- db_set_b(0, "FindAdd", "SortColumn", (BYTE)dat->iLastColumnSortIndex);
- db_set_b(0, "FindAdd", "SortAscending", (BYTE)dat->bSortAscending);
+ db_set_b(0, "FindAdd", "SortColumn", (uint8_t)dat->iLastColumnSortIndex);
+ db_set_b(0, "FindAdd", "SortAscending", (uint8_t)dat->bSortAscending);
}
static const wchar_t *szColumnNames[] = { nullptr, nullptr, L"Nick", L"First Name", L"Last Name", L"E-mail" };
diff --git a/src/mir_app/src/skin.h b/src/mir_app/src/skin.h index a4eac47092..7d739e7b9f 100644 --- a/src/mir_app/src/skin.h +++ b/src/mir_app/src/skin.h @@ -32,8 +32,8 @@ enum THotkeyType { HKT_GLOBAL, HKT_LOCAL, HKT_MANUAL }; struct THotkeyBoxData
{
- BYTE shift;
- BYTE key;
+ uint8_t shift;
+ uint8_t key;
};
struct THotkeyItem
diff --git a/src/mir_app/src/sounds.cpp b/src/mir_app/src/sounds.cpp index fb48be7383..05d2391a85 100644 --- a/src/mir_app/src/sounds.cpp +++ b/src/mir_app/src/sounds.cpp @@ -137,7 +137,7 @@ public: bool OnApply() override
{
- db_set_b(0, "Skin", "UseSound", (BYTE)IsDlgButtonChecked(m_hwnd, IDC_ENABLESOUNDS));
+ db_set_b(0, "Skin", "UseSound", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_ENABLESOUNDS));
for (auto &p : arSounds)
if (p->ptszTempFile)
diff --git a/src/mir_app/src/srmm_log.cpp b/src/mir_app/src/srmm_log.cpp index 42b103e7f8..7f35ca27b8 100644 --- a/src/mir_app/src/srmm_log.cpp +++ b/src/mir_app/src/srmm_log.cpp @@ -42,7 +42,7 @@ struct LoggerClass static OBJLIST<LoggerClass> g_arLogClasses(1, PtrKeySortT); -static CMOption<BYTE> g_bEnableCustomLogs("SRMM", "EnableCustomLogs", 0); +static CMOption<uint8_t> g_bEnableCustomLogs("SRMM", "EnableCustomLogs", 0); ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/mir_core/src/Windows/CCtrlClc.cpp b/src/mir_core/src/Windows/CCtrlClc.cpp index 9239d3d61a..8dfbfc5f06 100644 --- a/src/mir_core/src/Windows/CCtrlClc.cpp +++ b/src/mir_core/src/Windows/CCtrlClc.cpp @@ -113,9 +113,9 @@ int CCtrlClc::GetExtraColumns() const { return SendMessage(m_hwnd, CLM_GETEXTRACOLUMNS, 0, 0); } -BYTE CCtrlClc::GetExtraImage(HANDLE hItem, int iColumn) const +uint8_t CCtrlClc::GetExtraImage(HANDLE hItem, int iColumn) const { - return (BYTE)(SendMessage(m_hwnd, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, 0)) & 0xFFFF); + return (uint8_t)(SendMessage(m_hwnd, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, 0)) & 0xFFFF); } HIMAGELIST CCtrlClc::GetExtraImageList() const diff --git a/src/mir_core/src/Windows/CCtrlData.cpp b/src/mir_core/src/Windows/CCtrlData.cpp index 7f228b159e..ed6f1f194f 100644 --- a/src/mir_core/src/Windows/CCtrlData.cpp +++ b/src/mir_core/src/Windows/CCtrlData.cpp @@ -41,7 +41,7 @@ void CCtrlData::OnInit() OnReset(); } -void CCtrlData::CreateDbLink(const char* szModuleName, const char* szSetting, BYTE type, DWORD iValue) +void CCtrlData::CreateDbLink(const char* szModuleName, const char* szSetting, uint8_t type, DWORD iValue) { m_dbLink = new CDbLink(szModuleName, szSetting, type, iValue); } diff --git a/src/mir_core/src/Windows/CDbLink.cpp b/src/mir_core/src/Windows/CDbLink.cpp index 4515e032f2..b8719fd677 100644 --- a/src/mir_core/src/Windows/CDbLink.cpp +++ b/src/mir_core/src/Windows/CDbLink.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ///////////////////////////////////////////////////////////////////////////////////////// // CDbLink class -CDbLink::CDbLink(const char *szModule, const char *szSetting, BYTE type, DWORD iValue) +CDbLink::CDbLink(const char *szModule, const char *szSetting, uint8_t type, DWORD iValue) : CDataLink(type) { m_szModule = mir_strdup(szModule); @@ -35,7 +35,7 @@ CDbLink::CDbLink(const char *szModule, const char *szSetting, BYTE type, DWORD i dbv.type = DBVT_DELETED; } -CDbLink::CDbLink(const char *szModule, const char *szSetting, BYTE type, wchar_t *szValue) +CDbLink::CDbLink(const char *szModule, const char *szSetting, uint8_t type, wchar_t *szValue) : CDataLink(type), m_iDefault(0) { @@ -67,7 +67,7 @@ DWORD CDbLink::LoadInt() void CDbLink::SaveInt(DWORD value) { switch (m_type) { - case DBVT_BYTE: db_set_b(0, m_szModule, m_szSetting, (BYTE)value); break; + case DBVT_BYTE: db_set_b(0, m_szModule, m_szSetting, (uint8_t)value); break; case DBVT_WORD: db_set_w(0, m_szModule, m_szSetting, (WORD)value); break; case DBVT_DWORD: db_set_dw(0, m_szModule, m_szSetting, value); break; } diff --git a/src/mir_core/src/Windows/CDlgBase.cpp b/src/mir_core/src/Windows/CDlgBase.cpp index 5949057fda..99854ac47d 100644 --- a/src/mir_core/src/Windows/CDlgBase.cpp +++ b/src/mir_core/src/Windows/CDlgBase.cpp @@ -151,7 +151,7 @@ void CDlgBase::Show(int nCmdShow) ///////////////////////////////////////////////////////////////////////////////////////// -void CDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, BYTE type, DWORD iValue) +void CDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, uint8_t type, DWORD iValue) { ctrl.CreateDbLink(m_pPlugin.getModule(), szSetting, type, iValue); } diff --git a/src/mir_core/src/Windows/hyperlink.cpp b/src/mir_core/src/Windows/hyperlink.cpp index 65ce93c54a..5118f89982 100644 --- a/src/mir_core/src/Windows/hyperlink.cpp +++ b/src/mir_core/src/Windows/hyperlink.cpp @@ -29,7 +29,7 @@ struct HyperlinkWndData HFONT hEnableFont, hDisableFont; RECT rcText; COLORREF enableColor, disableColor, focusColor; - BYTE flags; /* see HLKF_* */ + uint8_t flags; /* see HLKF_* */ }; /* flags */ diff --git a/src/mir_core/src/Windows/langpack.cpp b/src/mir_core/src/Windows/langpack.cpp index f877a7ca5f..e43a2c1b33 100644 --- a/src/mir_core/src/Windows/langpack.cpp +++ b/src/mir_core/src/Windows/langpack.cpp @@ -182,7 +182,7 @@ static bool EnterMuuid(const char *p, MUUID &result) if (*p++ != '{') return false; - BYTE *d = (BYTE*)&result; + uint8_t *d = (uint8_t*)&result; for (int nBytes = 0; *p && nBytes < 24; p++) { if (*p == '-') @@ -201,7 +201,7 @@ static bool EnterMuuid(const char *p, MUUID &result) if (sscanf(p, "%2x", &c) != 1) return false; - *d++ = (BYTE)c; + *d++ = (uint8_t)c; nBytes++; p++; } diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp index 3f91edac6f..2b2b41ebcd 100644 --- a/src/mir_core/src/db.cpp +++ b/src/mir_core/src/db.cpp @@ -109,8 +109,8 @@ MIR_CORE_DLL(int) db_get_b(MCONTACT hContact, const char *szModule, const char * { switch(dbv.type) { case DBVT_BYTE: return dbv.bVal; - case DBVT_WORD: return BYTE(dbv.wVal); - case DBVT_DWORD: return BYTE(dbv.dVal); + case DBVT_WORD: return uint8_t(dbv.wVal); + case DBVT_DWORD: return uint8_t(dbv.dVal); } g_pCurrDb->FreeVariant(&dbv); } @@ -164,7 +164,7 @@ MIR_CORE_DLL(INT_PTR) db_get_s(MCONTACT hContact, const char *szModule, const ch if (g_pCurrDb == nullptr) return 1; - dbv->type = (BYTE)nType; + dbv->type = (uint8_t)nType; return g_pCurrDb->GetContactSettingStr(hContact, szModule, szSetting, dbv); } @@ -278,7 +278,7 @@ MIR_CORE_DLL(INT_PTR) db_set(MCONTACT hContact, const char *szModule, const char return g_pCurrDb->WriteContactSetting(hContact, &cws); } -MIR_CORE_DLL(INT_PTR) db_set_b(MCONTACT hContact, const char *szModule, const char *szSetting, BYTE val) +MIR_CORE_DLL(INT_PTR) db_set_b(MCONTACT hContact, const char *szModule, const char *szSetting, uint8_t val) { if (g_pCurrDb == nullptr) return 1; diff --git a/src/mir_core/src/http.cpp b/src/mir_core/src/http.cpp index 6527429223..093a6e1ab7 100755 --- a/src/mir_core/src/http.cpp +++ b/src/mir_core/src/http.cpp @@ -67,7 +67,7 @@ MIR_CORE_DLL(CMStringA) mir_urlEncode(const char *szUrl) CMStringA ret;
- for (const BYTE *s = (const BYTE*)szUrl; *s; s++) {
+ for (const uint8_t *s = (const uint8_t*)szUrl; *s; s++) {
if (('0' <= *s && *s <= '9') || // 0-9
('A' <= *s && *s <= 'Z') || // ABC...XYZ
('a' <= *s && *s <= 'z') || // abc...xyz
@@ -113,11 +113,11 @@ MIR_CORE_DLL(char*) mir_base64_encodebuf(const void *input, size_t inputLen, cha if (outputLen < mir_base64_encode_bufsize(inputLen))
return nullptr;
- const BYTE *s = (const BYTE*)input;
+ const uint8_t *s = (const uint8_t*)input;
char *p = output;
for (unsigned i=0; i < inputLen; ) {
int rest = 0;
- BYTE chr[3];
+ uint8_t chr[3];
chr[0] = s[i++];
chr[1] = (i < inputLen) ? s[i++] : rest++, 0;
chr[2] = (i < inputLen) ? s[i++] : rest++, 0;
@@ -171,23 +171,23 @@ MIR_CORE_DLL(void*) mir_base64_decode(const char *input, size_t *outputLen) char *p = output;
while (input < stop) {
- BYTE e[4];
+ uint8_t e[4];
for (int i=0; i < 4; ) {
if (*input == '\n' || *input == '\r') // simply skip a char
input++;
else if (*input == 0) // do not advance input
- e[i++] = (BYTE)-1;
+ e[i++] = (uint8_t)-1;
else
e[i++] = Base64DecodeTable[*input++];
}
- if (e[0] == (BYTE)-1 || e[1] == (BYTE)-1)
+ if (e[0] == (uint8_t)-1 || e[1] == (uint8_t)-1)
break;
*p++ = (e[0] << 2) | (e[1] >> 4);
- if (e[2] != (BYTE)-1)
+ if (e[2] != (uint8_t)-1)
*p++ = ((e[1] & 15) << 4) | (e[2] >> 2);
- if (e[3] != (BYTE)-1)
+ if (e[3] != (uint8_t)-1)
*p++ = ((e[2] & 3) << 6) | e[3];
}
diff --git a/src/mir_core/src/md5.cpp b/src/mir_core/src/md5.cpp index 8b7b37020f..d09463cdad 100644 --- a/src/mir_core/src/md5.cpp +++ b/src/mir_core/src/md5.cpp @@ -122,7 +122,7 @@ #define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) //gfd* -static void md5_process(mir_md5_state_t *pms, const BYTE *data /*[64]*/) +static void md5_process(mir_md5_state_t *pms, const uint8_t *data /*[64]*/) { uint32_t a = pms->abcd[0], b = pms->abcd[1], @@ -140,13 +140,13 @@ static void md5_process(mir_md5_state_t *pms, const BYTE *data /*[64]*/) */ static const int w = 1; - if (*((const BYTE *)&w)) /* dynamic little-endian */ + if (*((const uint8_t *)&w)) /* dynamic little-endian */ { /* * On little-endian machines, we can process properly aligned * data without copying it. */ - if ( !((data - (const BYTE *)nullptr) & 3)) { + if ( !((data - (const uint8_t *)nullptr) & 3)) { /* data are properly aligned */ X = (const uint32_t *)data; } else { @@ -161,7 +161,7 @@ static void md5_process(mir_md5_state_t *pms, const BYTE *data /*[64]*/) * On big-endian machines, we must arrange the bytes in the * right order. */ - const BYTE *xp = data; + const uint8_t *xp = data; int i; X = xbuf; /* (dynamic only) */ @@ -290,9 +290,9 @@ MIR_CORE_DLL(void) mir_md5_init(mir_md5_state_t *pms) pms->abcd[3] = 0x10325476; } -MIR_CORE_DLL(void) mir_md5_append(mir_md5_state_t *pms, const BYTE *data, size_t nBytes) +MIR_CORE_DLL(void) mir_md5_append(mir_md5_state_t *pms, const uint8_t *data, size_t nBytes) { - const BYTE *p = data; + const uint8_t *p = data; size_t left = nBytes; size_t offset = (pms->count[0] >> 3) & 63; uint32_t nbits = (uint32_t)(nBytes << 3); @@ -327,29 +327,29 @@ MIR_CORE_DLL(void) mir_md5_append(mir_md5_state_t *pms, const BYTE *data, size_t memcpy(pms->buf, p, left); } -MIR_CORE_DLL(void) mir_md5_finish(mir_md5_state_t *pms, BYTE digest[16]) +MIR_CORE_DLL(void) mir_md5_finish(mir_md5_state_t *pms, uint8_t digest[16]) { - static const BYTE pad[64] = { + static const uint8_t pad[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - BYTE data[8]; + uint8_t data[8]; int i; /* Save the length before padding. */ for (i = 0; i < 8; ++i) - data[i] = (BYTE)(pms->count[i >> 2] >> ((i & 3) << 3)); + data[i] = (uint8_t)(pms->count[i >> 2] >> ((i & 3) << 3)); /* Pad to 56 bytes mod 64. */ mir_md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1); /* Append the length. */ mir_md5_append(pms, data, 8); for (i = 0; i < 16; ++i) - digest[i] = (BYTE)(pms->abcd[i >> 2] >> ((i & 3) << 3)); + digest[i] = (uint8_t)(pms->abcd[i >> 2] >> ((i & 3) << 3)); } -MIR_CORE_DLL(void) mir_md5_hash(const BYTE *data, size_t len, BYTE digest[16]) +MIR_CORE_DLL(void) mir_md5_hash(const uint8_t *data, size_t len, uint8_t digest[16]) { mir_md5_state_t state; mir_md5_init(&state); diff --git a/src/mir_core/src/sha1.cpp b/src/mir_core/src/sha1.cpp index 435f6f440b..4ce2c8dbfe 100644 --- a/src/mir_core/src/sha1.cpp +++ b/src/mir_core/src/sha1.cpp @@ -94,7 +94,7 @@ MIR_CORE_DLL(void) mir_sha1_init(mir_sha1_ctx *ctx) ctx->W[i] = 0;
}
-MIR_CORE_DLL(void) mir_sha1_append(mir_sha1_ctx *ctx, const BYTE *dataIn, size_t len)
+MIR_CORE_DLL(void) mir_sha1_append(mir_sha1_ctx *ctx, const uint8_t *dataIn, size_t len)
{
/* Read the data into W and process blocks as they get full
*/
@@ -110,7 +110,7 @@ MIR_CORE_DLL(void) mir_sha1_append(mir_sha1_ctx *ctx, const BYTE *dataIn, size_t }
}
-MIR_CORE_DLL(void) mir_sha1_finish(mir_sha1_ctx *ctx, BYTE hashout[20])
+MIR_CORE_DLL(void) mir_sha1_finish(mir_sha1_ctx *ctx, uint8_t hashout[20])
{
unsigned char pad0x80 = 0x80;
unsigned char pad0x00 = 0x00;
@@ -145,7 +145,7 @@ MIR_CORE_DLL(void) mir_sha1_finish(mir_sha1_ctx *ctx, BYTE hashout[20]) mir_sha1_init(ctx);
}
-MIR_CORE_DLL(void) mir_sha1_hash(BYTE *dataIn, size_t len, BYTE hashout[20])
+MIR_CORE_DLL(void) mir_sha1_hash(uint8_t *dataIn, size_t len, uint8_t hashout[20])
{
mir_sha1_ctx ctx;
diff --git a/src/mir_core/src/sha256.cpp b/src/mir_core/src/sha256.cpp index 63fd940a62..1343929aab 100644 --- a/src/mir_core/src/sha256.cpp +++ b/src/mir_core/src/sha256.cpp @@ -103,9 +103,9 @@ static void transform(SHA256_CONTEXT *hd, const unsigned char *data) memcpy(x, data, 64); #else { - BYTE *p2; + uint8_t *p2; - for (i = 0, p2 = (BYTE*)x; i < 16; i++, p2 += 4) { + for (i = 0, p2 = (uint8_t*)x; i < 16; i++, p2 += 4) { p2[3] = *data++; p2[2] = *data++; p2[1] = *data++; @@ -219,14 +219,14 @@ digest. The handle is prepared for a new cycle, but adding bytes to the handle will the destroy the returned buffer. Returns: 32 bytes with the message the digest. */ -MIR_CORE_DLL(void) mir_sha256_final(SHA256_CONTEXT *hd, BYTE hashout[MIR_SHA256_HASH_SIZE]) +MIR_CORE_DLL(void) mir_sha256_final(SHA256_CONTEXT *hd, uint8_t hashout[MIR_SHA256_HASH_SIZE]) { uint32_t t, msb, lsb; mir_sha256_write(hd, nullptr, 0); /* flush */; t = hd->nblocks; - /* multiply by 64 to make a BYTE count */ + /* multiply by 64 to make a uint8_t count */ lsb = t << 6; msb = t >> 26; /* add the count */ @@ -262,7 +262,7 @@ MIR_CORE_DLL(void) mir_sha256_final(SHA256_CONTEXT *hd, BYTE hashout[MIR_SHA256_ hd->buf[63] = lsb; transform(hd, hd->buf); - BYTE *p = hashout; + uint8_t *p = hashout; #ifdef WORDS_BIGENDIAN #define X(a) do { *(uint32_t*)p = hd->h##a ; p += 4; } while(0) #else /* little endian */ @@ -280,7 +280,7 @@ MIR_CORE_DLL(void) mir_sha256_final(SHA256_CONTEXT *hd, BYTE hashout[MIR_SHA256_ #undef X } -MIR_CORE_DLL(void) mir_sha256_hash(const void *dataIn, size_t len, BYTE hashout[MIR_SHA256_HASH_SIZE]) +MIR_CORE_DLL(void) mir_sha256_hash(const void *dataIn, size_t len, uint8_t hashout[MIR_SHA256_HASH_SIZE]) { SHA256_CONTEXT tmp; mir_sha256_init(&tmp); diff --git a/src/mir_core/src/utils.cpp b/src/mir_core/src/utils.cpp index 4e13c82d72..0d773d10bc 100644 --- a/src/mir_core/src/utils.cpp +++ b/src/mir_core/src/utils.cpp @@ -256,7 +256,7 @@ static char szHexTable[] = "0123456789abcdef"; MIR_CORE_DLL(char*) bin2hex(const void *pData, size_t len, char *dest) { - const BYTE *p = (const BYTE*)pData; + const uint8_t *p = (const uint8_t*)pData; char *d = dest; for (size_t i = 0; i < len; i++, p++) { @@ -270,7 +270,7 @@ MIR_CORE_DLL(char*) bin2hex(const void *pData, size_t len, char *dest) MIR_CORE_DLL(wchar_t*) bin2hexW(const void *pData, size_t len, wchar_t *dest) { - const BYTE *p = (const BYTE*)pData; + const uint8_t *p = (const uint8_t*)pData; wchar_t *d = dest; for (size_t i = 0; i < len; i++, p++) { @@ -302,7 +302,7 @@ MIR_CORE_DLL(bool) hex2bin(const char *pSrc, void *pData, size_t len) if (pSrc[bufLen*2] != 0 || bufLen > len) return false; - BYTE *pDest = (BYTE*)pData; + uint8_t *pDest = (uint8_t*)pData; const char *p = (const char *)pSrc; for (size_t i = 0; i < bufLen; i++, p += 2) pDest[i] = hex2dec(p[0]) * 16 + hex2dec(p[1]); @@ -321,7 +321,7 @@ MIR_CORE_DLL(bool) hex2binW(const wchar_t *pSrc, void *pData, size_t len) if (pSrc[bufLen * 2] != 0 || bufLen > len) return false; - BYTE *pDest = (BYTE*)pData; + uint8_t *pDest = (uint8_t*)pData; const wchar_t *p = (const wchar_t *)pSrc; for (size_t i = 0; i < bufLen; i++, p += 2) pDest[i] = hex2dec(p[0]) * 16 + hex2dec(p[1]); |