diff options
author | George Hazan <ghazan@miranda.im> | 2021-12-26 20:31:39 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2021-12-26 20:31:39 +0300 |
commit | cddcd7483a7c472598af098e759e5d309024f606 (patch) | |
tree | b0a227d6e087c41958cc84d27bc323353248aae5 /plugins/SendScreenshotPlus | |
parent | 1039b2829a264280493ba0fa979214fe024dc70c (diff) |
DWORD -> uint32_t
Diffstat (limited to 'plugins/SendScreenshotPlus')
-rw-r--r-- | plugins/SendScreenshotPlus/src/CSend.cpp | 4 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/CSend.h | 2 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/UMainForm.cpp | 8 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/Utils.h | 2 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/ctrl_button.cpp | 2 | ||||
-rw-r--r-- | plugins/SendScreenshotPlus/src/stdafx.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp index bea4f55d33..fd8c6280b7 100644 --- a/plugins/SendScreenshotPlus/src/CSend.cpp +++ b/plugins/SendScreenshotPlus/src/CSend.cpp @@ -333,7 +333,7 @@ int CSend::OnSend(void *obj, WPARAM, LPARAM lParam) break; case ACKTYPE_FILE: self->m_szEventMsg.Insert(0, "aaaa"); - self->m_cbEventMsg += sizeof(DWORD); + self->m_cbEventMsg += sizeof(uint32_t); self->DB_EventAdd((uint16_t)EVENTTYPE_FILE); break; } @@ -481,7 +481,7 @@ int CSend::HTTPFormCreate(NETLIBHTTPREQUEST* nlhr, int requestType, const char* { union { - DWORD num; + uint32_t num; unsigned char cr[4]; }; num = GetTickCount() ^ 0x8000; for (int i = 0; i < 4; ++i) { diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h index 3d45488836..d54dad24a5 100644 --- a/plugins/SendScreenshotPlus/src/CSend.h +++ b/plugins/SendScreenshotPlus/src/CSend.h @@ -89,7 +89,7 @@ protected: void svcSendMsgExit(const char* szMessage); void Exit(unsigned int Result); - DWORD m_cbEventMsg; // sizeof EventMsg(T) buffer + uint32_t m_cbEventMsg; // sizeof EventMsg(T) buffer CMStringA m_szEventMsg; // EventMsg char* HANDLE m_hSend; // protocol send handle HANDLE m_hOnSend; // HookEventObj on ME_PROTO_ACK diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index bf41b3a463..8d3b3c5b59 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -276,7 +276,7 @@ void TfrmMain::wmInitdialog(WPARAM, LPARAM) ShowWindow(m_hwndTabPage, SW_SHOW); // enable Drag&Drop for local file pane - typedef BOOL(WINAPI *ChangeWindowMessageFilterEx_t)(HWND hwnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct); + typedef BOOL(WINAPI *ChangeWindowMessageFilterEx_t)(HWND hwnd, UINT message, uint32_t action, PCHANGEFILTERSTRUCT pChangeFilterStruct); ChangeWindowMessageFilterEx_t pChangeWindowMessageFilterEx; pChangeWindowMessageFilterEx = (ChangeWindowMessageFilterEx_t)GetProcAddress(GetModuleHandleA("user32"), "ChangeWindowMessageFilterEx"); if (pChangeWindowMessageFilterEx) { // Win7+, UAC fix @@ -732,7 +732,7 @@ TfrmMain::~TfrmMain() void TfrmMain::LoadOptions(void) { - DWORD rgb = g_plugin.getDword("AlphaColor", 16777215); + uint32_t rgb = g_plugin.getDword("AlphaColor", 16777215); m_AlphaColor.rgbRed = GetRValue(rgb); m_AlphaColor.rgbGreen = GetGValue(rgb); m_AlphaColor.rgbBlue = GetBValue(rgb); @@ -760,7 +760,7 @@ void TfrmMain::SaveOptions(void) { if (m_bOnExitSave) { g_plugin.setDword("AlphaColor", - (DWORD)RGB(m_AlphaColor.rgbRed, m_AlphaColor.rgbGreen, m_AlphaColor.rgbBlue)); + (uint32_t)RGB(m_AlphaColor.rgbRed, m_AlphaColor.rgbGreen, m_AlphaColor.rgbBlue)); g_plugin.setByte("JpegQuality", m_opt_edtQuality); @@ -1084,7 +1084,7 @@ void TfrmMain::FormClose() shex.nShow = SW_SHOWNORMAL; ShellExecuteEx(&shex); if (shex.hProcess) { - DWORD res; + uint32_t res; MSG msg; do { // wait for editor exit or messages/input diff --git a/plugins/SendScreenshotPlus/src/Utils.h b/plugins/SendScreenshotPlus/src/Utils.h index feacba0947..58b450157b 100644 --- a/plugins/SendScreenshotPlus/src/Utils.h +++ b/plugins/SendScreenshotPlus/src/Utils.h @@ -66,7 +66,7 @@ public: inline ~EventHandle() { CloseHandle(_hEvent); } inline void Set() { SetEvent(_hEvent); } inline void Wait() { WaitForSingleObject(_hEvent, INFINITE); } - inline void Wait(DWORD dwMilliseconds) { WaitForSingleObject(_hEvent, dwMilliseconds); } + inline void Wait(uint32_t dwMilliseconds) { WaitForSingleObject(_hEvent, dwMilliseconds); } inline operator HANDLE() { return _hEvent; } }; diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp index 1a32592248..e3d29d71b0 100644 --- a/plugins/SendScreenshotPlus/src/ctrl_button.cpp +++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp @@ -36,7 +36,7 @@ typedef struct TMBCtrl HBITMAP hBitmap; HFONT hFont; // font - DWORD dwStyle; + uint32_t dwStyle; uint8_t bFocus; int stateId; // button state diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h index 11b55b6e2f..f65a9c0193 100644 --- a/plugins/SendScreenshotPlus/src/stdafx.h +++ b/plugins/SendScreenshotPlus/src/stdafx.h @@ -95,7 +95,7 @@ using namespace std; #define MSGINFO (text) MessageBox(NULL, text, L"SendSS", MB_OK | MB_ICONINFORMATION) typedef struct _MGLOBAL { - DWORD mirandaVersion; // mirandaVersion + uint32_t mirandaVersion; // mirandaVersion BOOLEAN PopupActionsExist : 1; // Popup+ or MS_POPUP_REGISTERACTIONS exist BOOLEAN PluginHTTPExist : 1; // HTTPServer or MS_HTTP_ACCEPT_CONNECTIONS exist BOOLEAN PluginFTPExist : 1; // FTPFile or MS_FTPFILE_UPLOAD exist |