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/StatusManager | |
parent | 1039b2829a264280493ba0fa979214fe024dc70c (diff) |
DWORD -> uint32_t
Diffstat (limited to 'plugins/StatusManager')
-rw-r--r-- | plugins/StatusManager/src/aaa_main.cpp | 6 | ||||
-rw-r--r-- | plugins/StatusManager/src/aaa_options.cpp | 2 | ||||
-rw-r--r-- | plugins/StatusManager/src/commonstatus.cpp | 2 | ||||
-rw-r--r-- | plugins/StatusManager/src/ks_main.cpp | 14 | ||||
-rw-r--r-- | plugins/StatusManager/src/ks_options.cpp | 8 | ||||
-rw-r--r-- | plugins/StatusManager/src/ss_main.cpp | 2 | ||||
-rw-r--r-- | plugins/StatusManager/src/ss_profiles.cpp | 2 | ||||
-rw-r--r-- | plugins/StatusManager/src/stdafx.h | 2 |
8 files changed, 19 insertions, 19 deletions
diff --git a/plugins/StatusManager/src/aaa_main.cpp b/plugins/StatusManager/src/aaa_main.cpp index 49ee3e5444..5cfa722dc9 100644 --- a/plugins/StatusManager/src/aaa_main.cpp +++ b/plugins/StatusManager/src/aaa_main.cpp @@ -44,16 +44,16 @@ static int mouseStationaryTimer; HHOOK hMirandaMouseHook = nullptr; HHOOK hMirandaKeyBoardHook = nullptr; #pragma data_seg("Shared") -DWORD lastInput = 0; +uint32_t lastInput = 0; POINT lastMousePos = { 0 }; HHOOK hMouseHook = nullptr; HHOOK hKeyBoardHook = nullptr; #pragma data_seg() #pragma comment(linker, "/section:Shared,rws") -DWORD lastMirandaInput = 0; +uint32_t lastMirandaInput = 0; static UINT_PTR hAutoAwayTimer; // prototypes -extern DWORD StatusModeToProtoFlag(int status); +extern uint32_t StatusModeToProtoFlag(int status); int AutoAwayOptInitialise(WPARAM wParam, LPARAM lParam); diff --git a/plugins/StatusManager/src/aaa_options.cpp b/plugins/StatusManager/src/aaa_options.cpp index a773698ef1..296b54c7d6 100644 --- a/plugins/StatusManager/src/aaa_options.cpp +++ b/plugins/StatusManager/src/aaa_options.cpp @@ -60,7 +60,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break; } - DWORD protoModeMsgFlags = 0; + uint32_t protoModeMsgFlags = 0; for (int i = 0; i < protoCount; i++) if (CallProtoService(proto[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND & ~PF1_INDIVMODEMSG) protoModeMsgFlags |= CallProtoService(proto[i]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0); diff --git a/plugins/StatusManager/src/commonstatus.cpp b/plugins/StatusManager/src/commonstatus.cpp index a50b1917fa..f0ffb071b6 100644 --- a/plugins/StatusManager/src/commonstatus.cpp +++ b/plugins/StatusManager/src/commonstatus.cpp @@ -98,7 +98,7 @@ char* StatusModeToDbSetting(int status, const char *suffix) return str; } -DWORD StatusModeToProtoFlag(int status) +uint32_t StatusModeToProtoFlag(int status) { // *not* the same as in core, <offline> switch (status) { diff --git a/plugins/StatusManager/src/ks_main.cpp b/plugins/StatusManager/src/ks_main.cpp index 0772dc3cb9..ce3f747921 100644 --- a/plugins/StatusManager/src/ks_main.cpp +++ b/plugins/StatusManager/src/ks_main.cpp @@ -65,7 +65,7 @@ INT_PTR IsProtocolEnabledService(WPARAM wParam, LPARAM lParam); static int ProcessPopup(int reason, LPARAM lParam); LRESULT CALLBACK KSPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); -static DWORD CALLBACK MessageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); +static uint32_t CALLBACK MessageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); // options.c extern int KeepStatusOptionsInit(WPARAM wparam, LPARAM); @@ -497,7 +497,7 @@ static int ProcessProtoAck(WPARAM, LPARAM lParam) return 0; } -static VOID CALLBACK CheckConnectingTimer(HWND, UINT, UINT_PTR, DWORD) +static void CALLBACK CheckConnectingTimer(HWND, UINT, UINT_PTR, DWORD) { StopTimer(IDT_CHECKCONNECTING); @@ -516,7 +516,7 @@ static VOID CALLBACK CheckConnectingTimer(HWND, UINT, UINT_PTR, DWORD) } } -static VOID CALLBACK CheckAckStatusTimer(HWND, UINT, UINT_PTR, DWORD) +static void CALLBACK CheckAckStatusTimer(HWND, UINT, UINT_PTR, DWORD) { bool needChecking = false; @@ -552,7 +552,7 @@ static VOID CALLBACK CheckAckStatusTimer(HWND, UINT, UINT_PTR, DWORD) StartTimer(IDT_CHECKCONN, initDelay, FALSE); } -static VOID CALLBACK CheckConnectionTimer(HWND, UINT, UINT_PTR, DWORD) +static void CALLBACK CheckConnectionTimer(HWND, UINT, UINT_PTR, DWORD) { log_debug(0, "CheckConnectionTimer"); bool setStatus = false; @@ -678,7 +678,7 @@ static void CheckContinuouslyFunction(void *) else { char *start, *end; char host[MAX_PATH]; - DWORD *addr; + uint32_t *addr; struct hostent *hostent; char reply[sizeof(ICMP_ECHO_REPLY) + 8]; @@ -698,7 +698,7 @@ static void CheckContinuouslyFunction(void *) strncpy(host, start, end - start); hostent = gethostbyname(host); if (hostent != nullptr) { - addr = (DWORD *)(*hostent->h_addr_list); + addr = (uint32_t *)(*hostent->h_addr_list); bLastPingResult = (IcmpSendEcho(hICMPFile, *addr, nullptr, 0, nullptr, reply, sizeof(ICMP_ECHO_REPLY) + 8, 5000) != 0); if (bLastPingResult) @@ -995,7 +995,7 @@ INT_PTR AnnounceStatusChangeService(WPARAM, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// // window for suspend -static DWORD CALLBACK MessageWndProc(HWND, UINT msg, WPARAM wParam, LPARAM lParam) +static uint32_t CALLBACK MessageWndProc(HWND, UINT msg, WPARAM wParam, LPARAM lParam) { static TProtoSettings *ps = nullptr; diff --git a/plugins/StatusManager/src/ks_options.cpp b/plugins/StatusManager/src/ks_options.cpp index 4848eff393..d2afed8488 100644 --- a/plugins/StatusManager/src/ks_options.cpp +++ b/plugins/StatusManager/src/ks_options.cpp @@ -120,7 +120,7 @@ static INT_PTR CALLBACK DlgProcKSBasicOpts(HWND hwndDlg, UINT msg, WPARAM wParam KSPlugin.setByte(SETTING_MAXRETRIES, (uint8_t)GetDlgItemInt(hwndDlg, IDC_MAXRETRIES, nullptr, FALSE)); KSPlugin.setByte(SETTING_CHECKCONNECTION, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CHECKCONNECTION)); KSPlugin.setByte(SETTING_SHOWCONNECTIONPOPUPS, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOWCONNECTIONPOPUPS)); - KSPlugin.setDword(SETTING_INITDELAY, (DWORD)GetDlgItemInt(hwndDlg, IDC_INITDELAY, nullptr, FALSE)); + KSPlugin.setDword(SETTING_INITDELAY, (uint32_t)GetDlgItemInt(hwndDlg, IDC_INITDELAY, nullptr, FALSE)); KSPlugin.setByte(SETTING_CHKINET, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CHKINET)); KSPlugin.setByte(SETTING_CONTCHECK, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CONTCHECK)); KSPlugin.setByte(SETTING_BYPING, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_BYPING)); @@ -215,8 +215,8 @@ static INT_PTR CALLBACK DlgProcKSAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, case PSN_APPLY: KSPlugin.setByte(SETTING_INCREASEEXPONENTIAL, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_INCREASEEXPONENTIAL)); - KSPlugin.setDword(SETTING_MAXDELAY, (DWORD)GetDlgItemInt(hwndDlg, IDC_MAXDELAY, nullptr, FALSE)); - KSPlugin.setDword(SETTING_MAXCONNECTINGTIME, (DWORD)GetDlgItemInt(hwndDlg, IDC_MAXCONNECTINGTIME, nullptr, FALSE)); + KSPlugin.setDword(SETTING_MAXDELAY, (uint32_t)GetDlgItemInt(hwndDlg, IDC_MAXDELAY, nullptr, FALSE)); + KSPlugin.setDword(SETTING_MAXCONNECTINGTIME, (uint32_t)GetDlgItemInt(hwndDlg, IDC_MAXCONNECTINGTIME, nullptr, FALSE)); KSPlugin.setByte(SETTING_FIRSTOFFLINE, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_FIRSTOFFLINE)); KSPlugin.setByte(SETTING_NOLOCKED, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_NOLOCKED)); KSPlugin.setByte(SETTING_CNCOTHERLOC, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CNCOTHERLOC)); @@ -232,7 +232,7 @@ static INT_PTR CALLBACK DlgProcKSAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, KSPlugin.setByte(SETTING_CHECKAPMRESUME, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CHECKAPMRESUME)); KSPlugin.setWord(SETTING_PINGCOUNT, (uint16_t)GetDlgItemInt(hwndDlg, IDC_PINGCOUNT, nullptr, FALSE)); - KSPlugin.setDword(SETTING_CNTDELAY, (DWORD)GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE) == 0 ? CHECKCONTIN_DELAY : GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE)); + KSPlugin.setDword(SETTING_CNTDELAY, (uint32_t)GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE) == 0 ? CHECKCONTIN_DELAY : GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE)); } break; } diff --git a/plugins/StatusManager/src/ss_main.cpp b/plugins/StatusManager/src/ss_main.cpp index 2f10ca761f..f838c1cdd7 100644 --- a/plugins/StatusManager/src/ss_main.cpp +++ b/plugins/StatusManager/src/ss_main.cpp @@ -314,7 +314,7 @@ static int OnShutdown(WPARAM, LPARAM) } /* Window proc for poweroff event */ -static DWORD CALLBACK MessageWndProc(HWND, UINT msg, WPARAM wParam, LPARAM) +static uint32_t CALLBACK MessageWndProc(HWND, UINT msg, WPARAM wParam, LPARAM) { switch (msg) { case WM_ENDSESSION: diff --git a/plugins/StatusManager/src/ss_profiles.cpp b/plugins/StatusManager/src/ss_profiles.cpp index da945ccb85..ac309881ba 100644 --- a/plugins/StatusManager/src/ss_profiles.cpp +++ b/plugins/StatusManager/src/ss_profiles.cpp @@ -231,7 +231,7 @@ static UINT GetFsModifiers(uint16_t wHotKey) return fsm; } -static DWORD CALLBACK MessageWndProc(HWND, UINT msg, WPARAM wParam, LPARAM) +static uint32_t CALLBACK MessageWndProc(HWND, UINT msg, WPARAM wParam, LPARAM) { if (msg == WM_HOTKEY) { for (int i = 0; i < hkiCount; i++) diff --git a/plugins/StatusManager/src/stdafx.h b/plugins/StatusManager/src/stdafx.h index 79f1a1e99b..4d348ca203 100644 --- a/plugins/StatusManager/src/stdafx.h +++ b/plugins/StatusManager/src/stdafx.h @@ -63,6 +63,6 @@ int OnCommonOptionsInit(WPARAM wParam, LPARAM); void InitCommonOptions(); char* StatusModeToDbSetting(int status, const char *suffix); -DWORD StatusModeToProtoFlag(int status); +uint32_t StatusModeToProtoFlag(int status); #endif //_COMMON_H_ |