From 62a186697df33c96dc1a6dac0f4dfc38652fb96f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 16:39:04 +0300 Subject: BYTE -> uint8_t --- plugins/FloatingContacts/src/bitmap_funcs.cpp | 40 +++++++++++++-------------- plugins/FloatingContacts/src/bitmap_funcs.h | 6 ++-- plugins/FloatingContacts/src/fltcont.h | 6 ++-- plugins/FloatingContacts/src/main.cpp | 12 ++++---- plugins/FloatingContacts/src/options.cpp | 32 ++++++++++----------- plugins/FloatingContacts/src/thumbs.cpp | 4 +-- plugins/FloatingContacts/src/thumbs.h | 6 ++-- 7 files changed, 53 insertions(+), 53 deletions(-) (limited to 'plugins/FloatingContacts/src') diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index 8412e0430f..c6ed9cfc34 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp @@ -59,7 +59,7 @@ MyBitmap::~MyBitmap() free(); } -void MyBitmap::setAlpha(BYTE level) +void MyBitmap::setAlpha(uint8_t level) { if (!bits) return; @@ -72,7 +72,7 @@ void MyBitmap::setAlpha(BYTE level) } } -void MyBitmap::setAlphaRect(int x1, int y1, int x2, int y2, BYTE level) +void MyBitmap::setAlphaRect(int x1, int y1, int x2, int y2, uint8_t level) { if (!bits) return; @@ -550,12 +550,12 @@ void MyBitmap::Blur(int w, int h) { if ((w <= 0) || (h <= 0)) return; - BYTE *buf_src = new BYTE[width*height * 4]; + uint8_t *buf_src = new uint8_t[width*height * 4]; long *buf_tmp = new long[width*height * 4]; - BYTE *buf_dst = (BYTE *)bits; + uint8_t *buf_dst = (uint8_t *)bits; memcpy(buf_src, buf_dst, width*height * 4); - BYTE *src, *dst; + uint8_t *src, *dst; long *tmp; src = buf_src; @@ -591,7 +591,7 @@ void MyBitmap::Blur(int w, int h) ReadP(tmp, width, height, x - w, y + h, k) - ReadP(tmp, width, height, x + w, y - h, k); - *dst = BYTE(tot*mul); + *dst = uint8_t(tot*mul); ++dst; ++src; @@ -605,7 +605,7 @@ void MyBitmap::Blur(int w, int h) void MyBitmap::IncreaseAlpha(float q) { - BYTE *p = (BYTE *)bits; + uint8_t *p = (uint8_t *)bits; for (int i = 0; i < height; ++i) { for (int j = 0; j < width; ++j) { @@ -617,7 +617,7 @@ void MyBitmap::IncreaseAlpha(float q) float q1 = min(q, 255.f / p[3]); for (int k = 0; k < 4; ++k) { - *p = (BYTE)min(255, *p * q1); + *p = (uint8_t)min(255, *p * q1); ++p; } } @@ -649,14 +649,14 @@ void MyBitmap::DrawIcon(HICON hic, int x, int y, int w, int h) DestroyIcon(hicTmp); } - BYTE *cbit = new BYTE[bmpColor.bmWidthBytes*bmpColor.bmHeight]; - BYTE *mbit = new BYTE[bmpMask.bmWidthBytes*bmpMask.bmHeight]; + uint8_t *cbit = new uint8_t[bmpColor.bmWidthBytes*bmpColor.bmHeight]; + uint8_t *mbit = new uint8_t[bmpMask.bmWidthBytes*bmpMask.bmHeight]; GetBitmapBits(info.hbmColor, bmpColor.bmWidthBytes*bmpColor.bmHeight, cbit); GetBitmapBits(info.hbmMask, bmpMask.bmWidthBytes*bmpMask.bmHeight, mbit); for (int i = 0; i < bmpColor.bmHeight; i++) { for (int j = 0; j < bmpColor.bmWidth; j++) { - BYTE *pixel = cbit + i*bmpColor.bmWidthBytes + j * 4; + uint8_t *pixel = cbit + i*bmpColor.bmWidthBytes + j * 4; if (!pixel[3]) { pixel[3] = (*(mbit + i*bmpMask.bmWidthBytes + j*bmpMask.bmBitsPixel / 8) & (1 << (7 - j % 8))) ? 0 : 255; } @@ -693,7 +693,7 @@ void MyBitmap::DrawText(wchar_t *str, int x, int y, int blur, int strength) sz.cx += (blur + 2) * 2; sz.cy += (blur + 2) * 2; x -= blur + 2; y -= blur + 2; - static BYTE pbGammaWeight[256] = { 0 }; + static uint8_t pbGammaWeight[256] = { 0 }; static BOOL bGammaWeightFilled = FALSE; if (!bGammaWeightFilled) { @@ -705,7 +705,7 @@ void MyBitmap::DrawText(wchar_t *str, int x, int y, int blur, int strength) f = (double)i / 255; f = pow(f, (1 / gamma)); - pbGammaWeight[i] = (BYTE)(255 * f); + pbGammaWeight[i] = (uint8_t)(255 * f); } bGammaWeightFilled = 1; } @@ -765,12 +765,12 @@ void MyBitmap::DrawText(wchar_t *str, int x, int y, int blur, int strength) gx = (pbGammaWeight[gx] * (255 - g) + gx*(g)) / 255; rx = (pbGammaWeight[rx] * (255 - r) + rx*(r)) / 255; - mx = (BYTE)(max(max(bx, rx), gx)); + mx = (uint8_t)(max(max(bx, rx), gx)); if (1) { - bx = (bx < mx) ? (BYTE)(((WORD)bx * 7 + (WORD)mx) >> 3) : bx; - rx = (rx < mx) ? (BYTE)(((WORD)rx * 7 + (WORD)mx) >> 3) : rx; - gx = (gx < mx) ? (BYTE)(((WORD)gx * 7 + (WORD)mx) >> 3) : gx; + bx = (bx < mx) ? (uint8_t)(((WORD)bx * 7 + (WORD)mx) >> 3) : bx; + rx = (rx < mx) ? (uint8_t)(((WORD)rx * 7 + (WORD)mx) >> 3) : rx; + gx = (gx < mx) ? (uint8_t)(((WORD)gx * 7 + (WORD)mx) >> 3) : gx; // reduce boldeness at white fonts } COLOR32 cl = row_dst[j]; @@ -811,7 +811,7 @@ HRGN MyBitmap::buildOpaqueRgn(int level, bool opaque) const int addRectsCount = 64; int rectsCount = addRectsCount; - PRGNDATA pRgnData = (PRGNDATA)(new BYTE[sizeof(RGNDATAHEADER) + (rectsCount)*sizeof(RECT)]); + PRGNDATA pRgnData = (PRGNDATA)(new uint8_t[sizeof(RGNDATAHEADER) + (rectsCount)*sizeof(RECT)]); LPRECT pRects = (LPRECT)(&pRgnData->Buffer); memset(pRgnData, 0, sizeof(RGNDATAHEADER) + (rectsCount)*sizeof(RECT)); @@ -830,7 +830,7 @@ HRGN MyBitmap::buildOpaqueRgn(int level, bool opaque) SetRect(&pRects[pRgnData->rdh.nCount++], first, i, j, i + 1); if ((int)(pRgnData->rdh.nCount) >= rectsCount) { rectsCount += addRectsCount; - LPRGNDATA pRgnDataNew = (LPRGNDATA)(new BYTE[sizeof(RGNDATAHEADER) + (rectsCount)*sizeof(RECT)]); + LPRGNDATA pRgnDataNew = (LPRGNDATA)(new uint8_t[sizeof(RGNDATAHEADER) + (rectsCount)*sizeof(RECT)]); memcpy(pRgnDataNew, pRgnData, sizeof(RGNDATAHEADER) + pRgnData->rdh.nCount * sizeof(RECT)); delete[] pRgnData; pRgnData = pRgnDataNew; @@ -851,7 +851,7 @@ HRGN MyBitmap::buildOpaqueRgn(int level, bool opaque) SetRect(&pRects[pRgnData->rdh.nCount++], first, i, j, i + 1); if ((int)(pRgnData->rdh.nCount) >= rectsCount) { rectsCount += addRectsCount; - LPRGNDATA pRgnDataNew = (LPRGNDATA)(new BYTE[sizeof(RGNDATAHEADER) + (rectsCount)*sizeof(RECT)]); + LPRGNDATA pRgnDataNew = (LPRGNDATA)(new uint8_t[sizeof(RGNDATAHEADER) + (rectsCount)*sizeof(RECT)]); memcpy(pRgnDataNew, pRgnData, sizeof(RGNDATAHEADER) + pRgnData->rdh.nCount * sizeof(RECT)); delete[] pRgnData; pRgnData = pRgnDataNew; diff --git a/plugins/FloatingContacts/src/bitmap_funcs.h b/plugins/FloatingContacts/src/bitmap_funcs.h index 23192b6cf7..ff7476a028 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.h +++ b/plugins/FloatingContacts/src/bitmap_funcs.h @@ -55,9 +55,9 @@ public: HDC getDC() { return dcBmp; } HBITMAP getBitmap() { return hBmp; } - void setAlpha(BYTE level); - void setAlphaRect(int x1, int y1, int x2, int y2, BYTE level); - void setAlphaRect(RECT rc, BYTE level) { setAlphaRect(rc.left, rc.top, rc.right, rc.bottom, level); } + void setAlpha(uint8_t level); + void setAlphaRect(int x1, int y1, int x2, int y2, uint8_t level); + void setAlphaRect(RECT rc, uint8_t level) { setAlphaRect(rc.left, rc.top, rc.right, rc.bottom, level); } void makeOpaque(); void makeOpaqueRect(int x1, int y1, int x2, int y2); diff --git a/plugins/FloatingContacts/src/fltcont.h b/plugins/FloatingContacts/src/fltcont.h index 81afdedce5..4d2724cf8b 100644 --- a/plugins/FloatingContacts/src/fltcont.h +++ b/plugins/FloatingContacts/src/fltcont.h @@ -72,7 +72,7 @@ enum //extern BOOL bMoveTogether; //extern BOOL bFixedWidth; //extern int nThumbWidth; -//extern BYTE thumbAlpha; +//extern uint8_t thumbAlpha; //extern BOOL bShowTip; extern BOOL bEnableTip; //extern WORD TimeIn; @@ -99,7 +99,7 @@ extern WORD nBackgroundBmpUse; typedef struct _FCOptions { - BYTE thumbAlpha; + uint8_t thumbAlpha; BOOL bHideOffline; BOOL bHideAll; BOOL bHideWhenFullscreen; @@ -140,7 +140,7 @@ void ApplyOptionsChanges(); void OnStatusChanged(); -void SetThumbsOpacity(BYTE btAlpha); +void SetThumbsOpacity(uint8_t btAlpha); int OnOptionsInitialize(WPARAM wParam, LPARAM lParam); diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index b8bb8e05f1..57894b3426 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -34,7 +34,7 @@ static void CreateThumbsFont(void); static void CreateBackgroundBrush(void); static int GetContactStatus(MCONTACT hContact); static void GetScreenRect(void); -extern void SetThumbsOpacity(BYTE btAlpha); +extern void SetThumbsOpacity(uint8_t btAlpha); static int ClcStatusToPf2(int status); static VOID CALLBACK ToTopTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); @@ -278,7 +278,7 @@ static int OnPrebuildContactMenu(WPARAM wParam, LPARAM) static void LoadDBSettings() { - fcOpt.thumbAlpha = (BYTE)((double)g_plugin.getByte("Opacity", 100) * 2.55); + fcOpt.thumbAlpha = (uint8_t)((double)g_plugin.getByte("Opacity", 100) * 2.55); fcOpt.bHideOffline = (BOOL)g_plugin.getByte("HideOffline", 0); fcOpt.bHideAll = (BOOL)g_plugin.getByte("HideAll", 0); fcOpt.bHideWhenFullscreen = (BOOL)g_plugin.getByte("HideWhenFullscreen", 0); @@ -423,7 +423,7 @@ static LRESULT __stdcall CommWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM return DefWindowProc(hwnd, uMsg, wParam, lParam); } -extern void SetThumbsOpacity(BYTE btAlpha) +extern void SetThumbsOpacity(uint8_t btAlpha) { for (auto &it : thumbList) it->SetThumbOpacity(btAlpha); @@ -672,7 +672,7 @@ static IconItemT g_iconList[] = static INT_PTR OnMainMenu_HideAll(WPARAM, LPARAM) { fcOpt.bHideAll = !fcOpt.bHideAll; - g_plugin.setByte("HideAll", (BYTE)fcOpt.bHideAll); + g_plugin.setByte("HideAll", (uint8_t)fcOpt.bHideAll); OnStatusChanged(); @@ -696,7 +696,7 @@ static INT_PTR OnContactMenu_Remove(WPARAM hContact, LPARAM) static INT_PTR OnHotKey_HideWhenCListShow(WPARAM, LPARAM) { fcOpt.bHideWhenCListShow = !fcOpt.bHideWhenCListShow; - g_plugin.setByte("HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow); + g_plugin.setByte("HideWhenCListShow", (uint8_t)fcOpt.bHideWhenCListShow); OnStatusChanged(); return 0; } @@ -825,7 +825,7 @@ static LRESULT __stdcall newMirandaWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, HideThumbsOnShowCList(); } else if (!(wp->flags & SWP_NOMOVE)) { - BYTE method = db_get_b(0, "ModernData", "HideBehind", 0); + uint8_t method = db_get_b(0, "ModernData", "HideBehind", 0); if (method) { WORD wBehindEdgeBorderSize = db_get_w(0, "ModernData", "HideBehindBorderSize", 0); RECT rc = { wp->x, wp->y, wp->x + wp->cx, wp->y + wp->cy }; diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index 1db6ba9569..5e9406527f 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -106,42 +106,42 @@ static INT_PTR APIENTRY OptWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA BOOL bSuccess = FALSE; fcOpt.bHideOffline = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_OFFLINE); - g_plugin.setByte("HideOffline", (BYTE)fcOpt.bHideOffline); + g_plugin.setByte("HideOffline", (uint8_t)fcOpt.bHideOffline); fcOpt.bHideAll = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_ALL); - g_plugin.setByte("HideAll", (BYTE)fcOpt.bHideAll); + g_plugin.setByte("HideAll", (uint8_t)fcOpt.bHideAll); fcOpt.bHideWhenFullscreen = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_WHEN_FULSCREEN); - g_plugin.setByte("HideWhenFullscreen", (BYTE)fcOpt.bHideWhenFullscreen); + g_plugin.setByte("HideWhenFullscreen", (uint8_t)fcOpt.bHideWhenFullscreen); fcOpt.bMoveTogether = IsDlgButtonChecked(hwndDlg, IDC_CHK_STICK); - g_plugin.setByte("MoveTogether", (BYTE)fcOpt.bMoveTogether); + g_plugin.setByte("MoveTogether", (uint8_t)fcOpt.bMoveTogether); fcOpt.bFixedWidth = IsDlgButtonChecked(hwndDlg, IDC_CHK_WIDTH); - g_plugin.setByte("FixedWidth", (BYTE)fcOpt.bFixedWidth); + g_plugin.setByte("FixedWidth", (uint8_t)fcOpt.bFixedWidth); fcOpt.nThumbWidth = GetDlgItemInt(hwndDlg, IDC_TXT_WIDTH, &bSuccess, FALSE); g_plugin.setDword("Width", fcOpt.nThumbWidth); if (bEnableTip) { fcOpt.bShowTip = IsDlgButtonChecked(hwndDlg, IDC_CHK_TIP); - g_plugin.setByte("ShowTip", (BYTE)fcOpt.bShowTip); + g_plugin.setByte("ShowTip", (uint8_t)fcOpt.bShowTip); fcOpt.TimeIn = GetDlgItemInt(hwndDlg, IDC_TXT_TIMEIN, &bSuccess, FALSE); g_plugin.setWord("TimeIn", fcOpt.TimeIn); } fcOpt.bToTop = IsDlgButtonChecked(hwndDlg, IDC_CHK_TOTOP); - g_plugin.setByte("ToTop", (BYTE)fcOpt.bToTop); + g_plugin.setByte("ToTop", (uint8_t)fcOpt.bToTop); fcOpt.ToTopTime = GetDlgItemInt(hwndDlg, IDC_TXT_TOTOPTIME, &bSuccess, FALSE); g_plugin.setWord("ToTopTime", fcOpt.ToTopTime); fcOpt.bHideWhenCListShow = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_WHEN_CLISTSHOW); - g_plugin.setByte("HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow); + g_plugin.setByte("HideWhenCListShow", (uint8_t)fcOpt.bHideWhenCListShow); fcOpt.bUseSingleClick = IsDlgButtonChecked(hwndDlg, IDC_CHK_SINGLECLK); - g_plugin.setByte("UseSingleClick", (BYTE)fcOpt.bUseSingleClick); + g_plugin.setByte("UseSingleClick", (uint8_t)fcOpt.bUseSingleClick); fcOpt.bShowIdle = IsDlgButtonChecked(hwndDlg, IDC_CHK_SHOWIDLE); - g_plugin.setByte("ShowIdle", (BYTE)fcOpt.bShowIdle); + g_plugin.setByte("ShowIdle", (uint8_t)fcOpt.bShowIdle); ApplyOptionsChanges(); OnStatusChanged(); @@ -193,7 +193,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP SHAutoComplete(GetDlgItem(hwndDlg, IDC_FILENAME), 1); // Windows 2K/XP - BYTE btOpacity = (BYTE)g_plugin.getByte("Opacity", 100); + uint8_t btOpacity = (uint8_t)g_plugin.getByte("Opacity", 100); SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_SETRANGE, TRUE, MAKELONG(0, 100)); SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_SETPOS, TRUE, btOpacity); @@ -225,7 +225,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP case WM_HSCROLL: if (wParam != TB_ENDTRACK) { int nPos = (int)SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_GETPOS, 0, 0); - fcOpt.thumbAlpha = (BYTE)((nPos * 255) / 100); + fcOpt.thumbAlpha = (uint8_t)((nPos * 255) / 100); SetThumbsOpacity(fcOpt.thumbAlpha); mir_snprintf(szPercent, "%d%%", nPos); @@ -278,26 +278,26 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP if (0 == ((LPNMHDR)lParam)->idFrom) { switch (((LPNMHDR)lParam)->code) { case PSN_RESET: - fcOpt.thumbAlpha = (BYTE)((double)g_plugin.getByte("Opacity", 100) * 2.55); + fcOpt.thumbAlpha = (uint8_t)((double)g_plugin.getByte("Opacity", 100) * 2.55); SetThumbsOpacity(fcOpt.thumbAlpha); break; case PSN_APPLY: // Border - g_plugin.setByte("DrawBorder", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DRAWBORDER)); + g_plugin.setByte("DrawBorder", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_DRAWBORDER)); COLORREF col = SendDlgItemMessage(hwndDlg, IDC_LTEDGESCOLOR, CPM_GETCOLOUR, 0, 0); g_plugin.setDword("LTEdgesColor", col); col = SendDlgItemMessage(hwndDlg, IDC_RBEDGESCOLOR, CPM_GETCOLOUR, 0, 0); g_plugin.setDword("RBEdgesColor", col); - g_plugin.setByte("Opacity", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_GETPOS, 0, 0)); + g_plugin.setByte("Opacity", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_GETPOS, 0, 0)); // Backgroud col = SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_GETCOLOUR, 0, 0); g_plugin.setDword("BkColor", col); - g_plugin.setByte("BkUseBitmap", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); + g_plugin.setByte("BkUseBitmap", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); wchar_t str[MAX_PATH]; GetDlgItemText(hwndDlg, IDC_FILENAME, str, _countof(str)); diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index 8455c8b8ef..91a34c1212 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -447,7 +447,7 @@ void ThumbInfo::ThumbDeselect(BOOL bMouse) SetThumbOpacity(fcOpt.thumbAlpha); } -void ThumbInfo::SetThumbOpacity(BYTE bAlpha) +void ThumbInfo::SetThumbOpacity(uint8_t bAlpha) { if (bAlpha != btAlpha) { btAlpha = bAlpha; @@ -663,7 +663,7 @@ void ThumbInfo::PopupMessageDialog() Clist_ContactDoubleClicked(hContact); } -void ThumbInfo::OnTimer(BYTE idTimer) +void ThumbInfo::OnTimer(uint8_t idTimer) { if (idTimer == TIMERID_SELECT_T) { KillTimer(hwnd, TIMERID_SELECT_T); diff --git a/plugins/FloatingContacts/src/thumbs.h b/plugins/FloatingContacts/src/thumbs.h index b7af34f8f3..339a58ac43 100644 --- a/plugins/FloatingContacts/src/thumbs.h +++ b/plugins/FloatingContacts/src/thumbs.h @@ -22,7 +22,7 @@ struct ThumbInfo BOOL fTipTimerActive; POINT ptTipSt; - BYTE btAlpha; + uint8_t btAlpha; MyBitmap bmpContent; POINT ptPos; @@ -44,11 +44,11 @@ public: void OnMouseMove(int nX, int nY); void ThumbSelect(BOOL bMouse); void ThumbDeselect(BOOL bMouse); - void SetThumbOpacity(BYTE btAlpha); + void SetThumbOpacity(uint8_t btAlpha); void KillTip(); void UpdateContent(); void PopupMessageDialog(); - void OnTimer(BYTE idTimer); + void OnTimer(uint8_t idTimer); }; void UndockThumbs(ThumbInfo *pThumb1, ThumbInfo *pThumb2); -- cgit v1.2.3