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/TipperYM/src/bitmap_func.cpp | 8 ++++---- plugins/TipperYM/src/bitmap_func.h | 4 ++-- plugins/TipperYM/src/options.cpp | 32 ++++++++++++++++---------------- plugins/TipperYM/src/options.h | 16 ++++++++-------- plugins/TipperYM/src/popwin.cpp | 4 ++-- plugins/TipperYM/src/skin_parser.cpp | 10 +++++----- plugins/TipperYM/src/subst.cpp | 2 +- plugins/TipperYM/src/translations.cpp | 10 +++++----- 8 files changed, 43 insertions(+), 43 deletions(-) (limited to 'plugins/TipperYM/src') diff --git a/plugins/TipperYM/src/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp index d10a95c460..3915087916 100644 --- a/plugins/TipperYM/src/bitmap_func.cpp +++ b/plugins/TipperYM/src/bitmap_func.cpp @@ -429,7 +429,7 @@ COLOR32* SaveAlpha(LPRECT lpRect) return res; } -void RestoreAlpha(LPRECT lpRect, COLOR32 *pBits, BYTE alpha) +void RestoreAlpha(LPRECT lpRect, COLOR32 *pBits, uint8_t alpha) { GdiFlush(); @@ -461,14 +461,14 @@ BOOL IsAlphaTransparent(HBITMAP hBitmap) return FALSE; DWORD dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8); - BYTE *p = (BYTE *)mir_calloc(dwLen); + uint8_t *p = (uint8_t *)mir_calloc(dwLen); if (p == nullptr) return FALSE; GetBitmapBits(hBitmap, dwLen, p); for (int y = 0; y < bmp.bmHeight; y++) { - BYTE *px = p + bmp.bmWidth * 4 * y; + uint8_t *px = p + bmp.bmWidth * 4 * y; for (int x = 0; x < bmp.bmWidth; x++) { if (px[3] != 0) { mir_free(p); @@ -601,7 +601,7 @@ void ColorizeBitmap() } // code from Clist Modern by FYR -HRGN CreateOpaqueRgn(BYTE level, bool bOpaque) +HRGN CreateOpaqueRgn(uint8_t level, bool bOpaque) { if (!skin.colBits) return nullptr; diff --git a/plugins/TipperYM/src/bitmap_func.h b/plugins/TipperYM/src/bitmap_func.h index 96d5c7a29f..205d7ead75 100644 --- a/plugins/TipperYM/src/bitmap_func.h +++ b/plugins/TipperYM/src/bitmap_func.h @@ -64,9 +64,9 @@ void DestroySkinBitmap(); int DrawTextAlpha(HDC hdc, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat); void DrawIconExAlpha(HDC hdc, int xLeft, int yTop, HICON hIcon, int cxWidth, int cyWidth, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags, bool bIsSmiley); COLOR32* SaveAlpha(LPRECT lpRect); -void RestoreAlpha(LPRECT lpRect, COLOR32 *pBits, BYTE alpha = 0xff); +void RestoreAlpha(LPRECT lpRect, COLOR32 *pBits, uint8_t alpha = 0xff); void PremultipleChannels(); void ColorizeBitmap(); -HRGN CreateOpaqueRgn(BYTE level, bool bOpaque); +HRGN CreateOpaqueRgn(uint8_t level, bool bOpaque); #endif diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index 2548b4be14..594d282921 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -181,7 +181,7 @@ void SaveDS(DISPLAYSUBST *ds, int index) mir_snprintf(setting, "Name%d", index); db_set_ws(0, MODULE_ITEMS, setting, ds->swzName); mir_snprintf(setting, "Type%d", index); - db_set_b(0, MODULE_ITEMS, setting, (BYTE)ds->type); + db_set_b(0, MODULE_ITEMS, setting, (uint8_t)ds->type); mir_snprintf(setting, "Module%d", index); db_set_s(0, MODULE_ITEMS, setting, ds->szModuleName); mir_snprintf(setting, "Setting%d", index); @@ -245,7 +245,7 @@ void SaveDI(DISPLAYITEM *di, int index) } mir_snprintf(setting, "DIType%d", index); - db_set_b(0, MODULE_ITEMS, setting, (BYTE)di->type); + db_set_b(0, MODULE_ITEMS, setting, (uint8_t)di->type); mir_snprintf(setting, "DILineAbove%d", index); db_set_b(0, MODULE_ITEMS, setting, di->bLineAbove ? 1 : 0); mir_snprintf(setting, "DIValNewline%d", index); @@ -260,12 +260,12 @@ void SaveOptions() { g_plugin.setDword("MaxWidth", opt.iWinWidth); g_plugin.setDword("MaxHeight", opt.iWinMaxHeight); - g_plugin.setByte("AvatarOpacity", (BYTE)opt.iAvatarOpacity); + g_plugin.setByte("AvatarOpacity", (uint8_t)opt.iAvatarOpacity); g_plugin.setByte("AvatarRoundCorners", (opt.bAvatarRound ? 1 : 0)); - g_plugin.setByte("TitleIconLayout", (BYTE)opt.titleIconLayout); + g_plugin.setByte("TitleIconLayout", (uint8_t)opt.titleIconLayout); g_plugin.setByte("TitleShow", (opt.bShowTitle ? 1 : 0)); if (ServiceExists(MS_AV_DRAWAVATAR)) - g_plugin.setByte("AVLayout", (BYTE)opt.avatarLayout); + g_plugin.setByte("AVLayout", (uint8_t)opt.avatarLayout); opt.bWaitForAvatar = (opt.avatarLayout == PAV_NONE) ? false : true; g_plugin.setDword("AVSize", opt.iAvatarSize); @@ -281,11 +281,11 @@ void SaveOptions() g_plugin.setWord("OuterAvatarPadding", opt.iOuterAvatarPadding); g_plugin.setWord("InnerAvatarPadding", opt.iInnerAvatarPadding); g_plugin.setWord("TextPadding", opt.iTextPadding); - g_plugin.setByte("Position", (BYTE)opt.pos); + g_plugin.setByte("Position", (uint8_t)opt.pos); g_plugin.setDword("MinWidth", (DWORD)opt.iMinWidth); g_plugin.setDword("MinHeight", (DWORD)opt.iMinHeight); g_plugin.setDword("SidebarWidth", (DWORD)opt.iSidebarWidth); - g_plugin.setByte("MouseTollerance", (BYTE)opt.iMouseTollerance); + g_plugin.setByte("MouseTollerance", (uint8_t)opt.iMouseTollerance); g_plugin.setByte("SBarTips", (opt.bStatusBarTips ? 1 : 0)); g_plugin.setWord("LabelVAlign", opt.iLabelValign); @@ -329,9 +329,9 @@ void SaveSkinOptions() g_plugin.setByte("DropShadow", (opt.bDropShadow ? 1 : 0)); g_plugin.setByte("RoundCorners", (opt.bRound ? 1 : 0)); g_plugin.setByte("AeroGlass", (opt.bAeroGlass ? 1 : 0)); - g_plugin.setByte("Opacity", (BYTE)opt.iOpacity); - g_plugin.setByte("ShowEffect", (BYTE)opt.showEffect); - g_plugin.setByte("ShowEffectSpeed", (BYTE)opt.iAnimateSpeed); + g_plugin.setByte("Opacity", (uint8_t)opt.iOpacity); + g_plugin.setByte("ShowEffect", (uint8_t)opt.showEffect); + g_plugin.setByte("ShowEffectSpeed", (uint8_t)opt.iAnimateSpeed); g_plugin.setByte("LoadFonts", (opt.bLoadFonts ? 1 : 0)); g_plugin.setByte("LoadProportions", (opt.bLoadProportions ? 1 : 0)); g_plugin.setDword("EnableColoring", opt.iEnableColoring); @@ -367,7 +367,7 @@ void LoadOptions() opt.iAvatarOpacity = g_plugin.getByte("AvatarOpacity", 100); if (opt.iAvatarOpacity > 100) opt.iAvatarOpacity = 100; opt.bAvatarRound = (g_plugin.getByte("AvatarRoundCorners", opt.bRound ? 1 : 0) == 1); - opt.titleIconLayout = (PopupIconTitleLayout)g_plugin.getByte("TitleIconLayout", (BYTE)PTL_LEFTICON); + opt.titleIconLayout = (PopupIconTitleLayout)g_plugin.getByte("TitleIconLayout", (uint8_t)PTL_LEFTICON); opt.bShowTitle = (g_plugin.getByte("TitleShow", 1) == 1); if (ServiceExists(MS_AV_DRAWAVATAR)) opt.avatarLayout = (PopupAvLayout)g_plugin.getByte("AVLayout", PAV_RIGHT); @@ -422,11 +422,11 @@ void LoadOptions() opt.iOuterAvatarPadding = g_plugin.getWord("OuterAvatarPadding", 6); opt.iInnerAvatarPadding = g_plugin.getWord("InnerAvatarPadding", 10); opt.iTextPadding = g_plugin.getWord("TextPadding", 4); - opt.pos = (PopupPosition)g_plugin.getByte("Position", (BYTE)PP_BOTTOMRIGHT); + opt.pos = (PopupPosition)g_plugin.getByte("Position", (uint8_t)PP_BOTTOMRIGHT); opt.iMinWidth = g_plugin.getDword("MinWidth", 0); opt.iMinHeight = g_plugin.getDword("MinHeight", 0); - opt.iMouseTollerance = g_plugin.getByte("MouseTollerance", (BYTE)GetSystemMetrics(SM_CXSMICON)); + opt.iMouseTollerance = g_plugin.getByte("MouseTollerance", (uint8_t)GetSystemMetrics(SM_CXSMICON)); opt.bStatusBarTips = (g_plugin.getByte("SBarTips", 1) == 1); // convert defunct last message and status message options to new 'sys' items, and remove the old settings @@ -533,7 +533,7 @@ void LoadOptions() opt.bDropShadow = g_plugin.getByte("DropShadow", 1) ? true : false; opt.bRound = g_plugin.getByte("RoundCorners", 1) ? true : false; opt.bAeroGlass = g_plugin.getByte("AeroGlass", 0) ? true : false; - opt.showEffect = (PopupShowEffect)g_plugin.getByte("ShowEffect", (BYTE)PSE_FADE); + opt.showEffect = (PopupShowEffect)g_plugin.getByte("ShowEffect", (uint8_t)PSE_FADE); opt.iAnimateSpeed = g_plugin.getByte("ShowEffectSpeed", 12); if (opt.iAnimateSpeed < 1) @@ -1893,13 +1893,13 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam, switch (LOWORD(wParam)) { case IDC_BTN_OK: { - BYTE isChecked; + uint8_t isChecked; int count = 0; for (auto &hContact : Contacts()) { HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0); if (hItem) { - isChecked = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0); + isChecked = (uint8_t)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0); g_plugin.setByte(hContact, "FavouriteContact", isChecked); if (isChecked) count++; diff --git a/plugins/TipperYM/src/options.h b/plugins/TipperYM/src/options.h index deccb7dd50..fe3a491f12 100644 --- a/plugins/TipperYM/src/options.h +++ b/plugins/TipperYM/src/options.h @@ -74,10 +74,10 @@ struct DIListNode struct MARGINS { - BYTE top; - BYTE right; - BYTE bottom; - BYTE left; + uint8_t top; + uint8_t right; + uint8_t bottom; + uint8_t left; }; struct EXTRAICONDATA @@ -88,8 +88,8 @@ struct EXTRAICONDATA struct ICONSTATE { - BYTE order; - BYTE vis; + uint8_t order; + uint8_t vis; }; enum PopupAvLayout { PAV_NONE = 0, PAV_LEFT = 1, PAV_RIGHT = 2 }; @@ -158,8 +158,8 @@ struct OPTIONS bool bLimitMsg; int iLimitCharCount; int iSmileyAddFlags; - BYTE exIconsOrder[EXICONS_COUNT]; - BYTE exIconsVis[EXICONS_COUNT]; + uint8_t exIconsOrder[EXICONS_COUNT]; + uint8_t exIconsVis[EXICONS_COUNT]; }; extern OPTIONS opt; diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index 4b08036ac0..10e3744cfc 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -499,7 +499,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa HDC hdcMem = CreateCompatibleDC(hdc); SelectObject(hdcMem, hbmpAvatar); - blend.SourceConstantAlpha = (BYTE)(opt.iAvatarOpacity / 100.0 * 255); + blend.SourceConstantAlpha = (uint8_t)(opt.iAvatarOpacity / 100.0 * 255); AlphaBlend(hdc, rcAvatar.left, rcAvatar.top, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, bm.bmWidth, bm.bmHeight, blend); blend.SourceConstantAlpha = 255; @@ -512,7 +512,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa FrameRect(hdc, &rcAvatar, hbrBorder); DeleteObject(hbrBorder); - RestoreAlpha(&rcAvatar, pBits, (BYTE)(opt.iAvatarOpacity / 100.0 * 255)); + RestoreAlpha(&rcAvatar, pBits, (uint8_t)(opt.iAvatarOpacity / 100.0 * 255)); } if (hrgnAvatar) { diff --git a/plugins/TipperYM/src/skin_parser.cpp b/plugins/TipperYM/src/skin_parser.cpp index 971dce8e12..fa0e439a25 100644 --- a/plugins/TipperYM/src/skin_parser.cpp +++ b/plugins/TipperYM/src/skin_parser.cpp @@ -194,13 +194,13 @@ void ParseFontPart(FILE *fp, wchar_t *buff) } else if (wcsstr(buff, L"color")) { if (GetSettingName(buff, "Col", szSetting, sizeof(szSetting) - 1)) { - BYTE r = _wtoi(pch); + uint8_t r = _wtoi(pch); pch = wcschr(pch, ' '); if (++pch) { - BYTE g = _wtoi(pch); + uint8_t g = _wtoi(pch); pch = wcschr(pch, ' '); if (++pch) { - BYTE b = _wtoi(pch); + uint8_t b = _wtoi(pch); COLORREF color = RGB(r, g, b); g_plugin.setDword(szSetting, color); } @@ -211,13 +211,13 @@ void ParseFontPart(FILE *fp, wchar_t *buff) if (GetSettingName(buff, "Size", szSetting, sizeof(szSetting) - 1)) { HDC hdc = GetDC(nullptr); int size = -MulDiv(_wtoi(pch), GetDeviceCaps(hdc, LOGPIXELSY), 72); - g_plugin.setByte(szSetting, (BYTE)size); + g_plugin.setByte(szSetting, (uint8_t)size); ReleaseDC(nullptr, hdc); } } else if (wcsstr(buff, L"effect")) { if (GetSettingName(buff, "Sty", szSetting, sizeof(szSetting) - 1)) { - BYTE effect = 0; + uint8_t effect = 0; if (wcsstr(pch, L"font_bold")) effect |= DBFONTF_BOLD; if (wcsstr(pch, L"font_italic")) diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp index 68de205802..920de10718 100644 --- a/plugins/TipperYM/src/subst.cpp +++ b/plugins/TipperYM/src/subst.cpp @@ -168,7 +168,7 @@ wchar_t* GetLastMessageText(MCONTACT hContact, bool received) DBEVENTINFO dbei = {}; db_event_get(hDbEvent, &dbei); if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT) == received) { - dbei.pBlob = (BYTE *)alloca(dbei.cbBlob); + dbei.pBlob = (uint8_t *)alloca(dbei.cbBlob); db_event_get(hDbEvent, &dbei); if (dbei.cbBlob == 0 || dbei.pBlob == nullptr) return nullptr; diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp index 3f506ac7c8..7fc31e59b4 100644 --- a/plugins/TipperYM/src/translations.cpp +++ b/plugins/TipperYM/src/translations.cpp @@ -254,7 +254,7 @@ wchar_t *ByteToYesNo(MCONTACT hContact, const char *szModuleName, const char *sz wchar_t *ByteToGender(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen) { - BYTE val = (BYTE)db_get_b(hContact, szModuleName, szSettingName, 0); + uint8_t val = (uint8_t)db_get_b(hContact, szModuleName, szSettingName, 0); if (val == 'F') wcsncpy(buff, TranslateT("Female"), bufflen); else if (val == 'M') @@ -720,8 +720,8 @@ static DBVTranslation internalTranslations[] = { WordToStatusDesc, LPGENW("WORD to status description") }, { TimestampToTime, LPGENW("DWORD timestamp to time") }, { TimestampToTimeDifference, LPGENW("DWORD timestamp to time difference") }, - { ByteToYesNo, LPGENW("BYTE to Yes/No") }, - { ByteToGender, LPGENW("BYTE to Male/Female (ICQ)") }, + { ByteToYesNo, LPGENW("uint8_t to Yes/No") }, + { ByteToGender, LPGENW("uint8_t to Male/Female (ICQ)") }, { WordToCountry, LPGENW("WORD to country name") }, { DwordToIp, LPGENW("DWORD to IP address") }, { DayMonthYearToDate, LPGENW("Day|Month|Year to date") }, @@ -735,10 +735,10 @@ static DBVTranslation internalTranslations[] = { TimestampToLongDate, LPGENW("DWORD timestamp to date (long)") }, { EmptyXStatusToDefaultName, LPGENW("xStatus: empty xStatus name to default name") }, { SecondsToTimeDifference, LPGENW("DWORD seconds to time difference") }, - { TimezoneToTime, LPGENW("BYTE timezone to time") }, + { TimezoneToTime, LPGENW("uint8_t timezone to time") }, { ByteToDay, LPGENW("WORD to name of a day (0..6, 0 is Sunday)") }, { ByteToMonth, LPGENW("WORD to name of a month (1..12, 1 is January)") }, - { ByteToLanguage, LPGENW("BYTE to language (ICQ)") }, + { ByteToLanguage, LPGENW("uint8_t to language (ICQ)") }, }; void InitTranslations() -- cgit v1.2.3