diff options
Diffstat (limited to 'plugins/SendScreenshotPlus/src')
-rw-r--r-- | plugins/SendScreenshotPlus/src/CSend.h | 6 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/UMainForm.cpp | 16 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/UMainForm.h | 30 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/Utils.cpp | 2 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/ctrl_button.cpp | 4 |
5 files changed, 29 insertions, 29 deletions
diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h index 19c34447da..1f5d106bdd 100644 --- a/plugins/SendScreenshotPlus/src/CSend.h +++ b/plugins/SendScreenshotPlus/src/CSend.h @@ -65,7 +65,7 @@ public: void SetContact(MCONTACT hContact); const char* GetURL() { return m_URL; } const char* GetURLthumbnail() {return m_URLthumb; } - BYTE GetEnableItem() {return m_EnableItem;}; + uint8_t GetEnableItem() {return m_EnableItem;}; wchar_t* GetErrorMsg() {return m_ErrorMsg;}; bool m_bDeleteAfterSend; @@ -81,8 +81,8 @@ protected: wchar_t* m_pszSendTyp; // hold string for error mess char* m_pszProto; // Contact Proto Module MCONTACT m_hContact; // Contact handle - BYTE m_EnableItem; // hold flag for send type - BYTE m_ChatRoom; // is Contact chatroom + uint8_t m_EnableItem; // hold flag for send type + uint8_t m_ChatRoom; // is Contact chatroom void Error(LPCTSTR pszFormat, ...); void svcSendFileExit(); diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index 8f4be619cb..bf41b3a463 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -407,14 +407,14 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam) this->Close(); break; case ID_chkTimed: - m_opt_chkTimed = (BYTE)Button_GetCheck((HWND)lParam); + m_opt_chkTimed = (uint8_t)Button_GetCheck((HWND)lParam); TfrmMain::chkTimedClick(); break; case ID_chkIndirectCapture: - m_opt_chkIndirectCapture = (BYTE)Button_GetCheck((HWND)lParam); + m_opt_chkIndirectCapture = (uint8_t)Button_GetCheck((HWND)lParam); break; case ID_chkClientArea: - m_opt_chkClientArea = (BYTE)Button_GetCheck((HWND)lParam); + m_opt_chkClientArea = (uint8_t)Button_GetCheck((HWND)lParam); if (m_hTargetWindow) edtSizeUpdate(m_hTargetWindow, m_opt_chkClientArea, GetParent((HWND)lParam), ID_edtSize); break; @@ -454,7 +454,7 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam) case CBN_SELCHANGE: // ComboBox controls switch (IDControl) { // lParam = Handle to the control case ID_cboxFormat: // not finish - m_opt_cboxFormat = (BYTE)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam)); + m_opt_cboxFormat = (uint8_t)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam)); break; case ID_cboxSendBy: { @@ -465,7 +465,7 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam) break; case ID_edtCaption: // cboxDesktopChange - m_opt_cboxDesktop = (BYTE)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam)); + m_opt_cboxDesktop = (uint8_t)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam)); m_hTargetWindow = nullptr; if (m_opt_cboxDesktop > 0) { edtSizeUpdate(m_Monitors[m_opt_cboxDesktop - 1].rcMonitor, GetParent((HWND)lParam), ID_edtSize); @@ -480,10 +480,10 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam) case EN_CHANGE: // Edit controls switch (IDControl) { // lParam = Handle to the control case ID_edtQuality: - m_opt_edtQuality = (BYTE)GetDlgItemInt(m_hWnd, ID_edtQuality, nullptr, FALSE); + m_opt_edtQuality = (uint8_t)GetDlgItemInt(m_hWnd, ID_edtQuality, nullptr, FALSE); break; case ID_edtTimed: - m_opt_edtTimed = (BYTE)GetDlgItemInt(m_hWnd, ID_edtTimed, nullptr, FALSE); + m_opt_edtTimed = (uint8_t)GetDlgItemInt(m_hWnd, ID_edtTimed, nullptr, FALSE); break; } break; @@ -852,7 +852,7 @@ void TfrmMain::cboxSendByChange(void *param) { BOOL bState; HICON hIcon; - BYTE itemFlag = SS_DLG_DESCRIPTION; + uint8_t itemFlag = SS_DLG_DESCRIPTION; if (m_cSend) delete m_cSend; switch (m_opt_cboxSendBy) { diff --git a/plugins/SendScreenshotPlus/src/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h index 373fc18f34..3f32a6c90a 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.h +++ b/plugins/SendScreenshotPlus/src/UMainForm.h @@ -41,11 +41,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct UPLOAD_INFO { - BYTE sendBy; //SS_* + uint8_t sendBy; //SS_* void *param; - UPLOAD_INFO(BYTE sb) : sendBy(sb), param(nullptr) { } - UPLOAD_INFO(BYTE sb, void *p) : sendBy(sb), param(p) { } + UPLOAD_INFO(uint8_t sb) : sendBy(sb), param(nullptr) { } + UPLOAD_INFO(uint8_t sb, void *p) : sendBy(sb), param(p) { } }; // Used for our own cheap TrackMouseEvent @@ -74,12 +74,12 @@ public: TfrmMain(); ~TfrmMain(); - BYTE m_opt_tabCapture; // capture tab page - BYTE m_opt_cboxDesktop; // TRadioButton *rbtnDesktop; - BYTE m_opt_chkTimed; // TCheckBox *chkTimed; - BYTE m_opt_cboxSendBy; // TComboBox *cboxSendBy; - BYTE m_opt_btnDesc; // TCheckBox *chkDesc; - BYTE m_opt_chkEditor; // TCheckBox *chkEditor; + uint8_t m_opt_tabCapture; // capture tab page + uint8_t m_opt_cboxDesktop; // TRadioButton *rbtnDesktop; + uint8_t m_opt_chkTimed; // TCheckBox *chkTimed; + uint8_t m_opt_cboxSendBy; // TComboBox *cboxSendBy; + uint8_t m_opt_btnDesc; // TCheckBox *chkDesc; + uint8_t m_opt_chkEditor; // TCheckBox *chkEditor; bool m_bOnExitSave; static void Unload(); @@ -116,13 +116,13 @@ protected: size_t m_MonitorCount; RECT m_VirtualScreen; - BYTE m_opt_chkOpenAgain; // TCheckBox *chkOpenAgain; - BYTE m_opt_chkIndirectCapture; // TCheckBox *chkIndirectCapture; - BYTE m_opt_chkClientArea; // TCheckBox *chkClientArea; - BYTE m_opt_edtQuality; // TLabeledEdit *edtQuality; + uint8_t m_opt_chkOpenAgain; // TCheckBox *chkOpenAgain; + uint8_t m_opt_chkIndirectCapture; // TCheckBox *chkIndirectCapture; + uint8_t m_opt_chkClientArea; // TCheckBox *chkClientArea; + uint8_t m_opt_edtQuality; // TLabeledEdit *edtQuality; bool m_opt_btnDeleteAfterSend; // TCheckBox *chkDeleteAfterSend; - BYTE m_opt_cboxFormat; // TComboBox *cboxFormat; - BYTE m_opt_edtTimed; // TLabeledEdit *edtTimed; + uint8_t m_opt_cboxFormat; // TComboBox *cboxFormat; + uint8_t m_opt_edtTimed; // TLabeledEdit *edtTimed; bool m_bCapture; // is capture active HWND m_hwndTab; // TabControl handle HWND m_hwndTabPage; // TabControl activ page handle diff --git a/plugins/SendScreenshotPlus/src/Utils.cpp b/plugins/SendScreenshotPlus/src/Utils.cpp index 6f1428d55d..27e095c424 100644 --- a/plugins/SendScreenshotPlus/src/Utils.cpp +++ b/plugins/SendScreenshotPlus/src/Utils.cpp @@ -213,7 +213,7 @@ FIBITMAP* CreateDIBFromDC(HDC hDC, const RECT* rect, HWND hCapture/*=NULL*/) HRGN hRgn = CreateRectRgn(0, 0, 0, 0); if (hCapture && GetWindowRgn(hCapture, hRgn) == ERROR) { if ((GetWindowLongPtr(hCapture, GWL_EXSTYLE)&WS_EX_LAYERED)) { - BYTE bAlpha = 0; + uint8_t bAlpha = 0; COLORREF crKey = 0x00000000; DWORD dwFlags = 0; if (GetLayeredWindowAttributes(hCapture, &crKey, &bAlpha, &dwFlags)) { diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp index e36dfc347f..3cfb3a14ec 100644 --- a/plugins/SendScreenshotPlus/src/ctrl_button.cpp +++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp @@ -37,7 +37,7 @@ typedef struct TMBCtrl HFONT hFont; // font DWORD dwStyle; - BYTE bFocus; + uint8_t bFocus; int stateId; // button state int defbutton; // default button @@ -604,7 +604,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L case WM_LBUTTONUP: if (bct->stateId != PBS_DISABLED) { // don't change states if disabled - BYTE bPressed = bct->stateId == PBS_PRESSED; + uint8_t bPressed = bct->stateId == PBS_PRESSED; if (bct->dwStyle & MBS_PUSHBUTTON) { if (bct->pbState) bct->pbState = 0; |