From 390c505aaaf91840c078aa4e0b6abeb32d601bb4 Mon Sep 17 00:00:00 2001 From: henrypp Date: Fri, 15 Nov 2019 03:02:02 +0600 Subject: [PATCH] code cosmetics --- src/helper.cpp | 8 ++++---- src/helper.hpp | 6 +++--- src/profile.cpp | 12 ++++++------ src/profile.hpp | 12 ++++++------ src/timer.cpp | 2 +- src/timer.hpp | 2 +- src/wfp.cpp | 8 ++++---- src/wfp.hpp | 8 ++++---- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/helper.cpp b/src/helper.cpp index d22364d4..42bbd186 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -324,7 +324,7 @@ void _app_freelogstack () } } -void _app_getappicon (PITEM_APP ptr_app, bool is_small, PINT picon_id, HICON * picon) +void _app_getappicon (const PITEM_APP ptr_app, bool is_small, PINT picon_id, HICON* picon) { const bool is_iconshidden = app.ConfigGet (L"IsIconsHidden", false).AsBool (); @@ -441,7 +441,7 @@ bool _app_getfileicon (LPCWSTR path, bool is_small, PINT picon_id, HICON * picon return result; } -PR_OBJECT _app_getsignatureinfo (size_t app_hash, PITEM_APP ptr_app) +PR_OBJECT _app_getsignatureinfo (size_t app_hash, const PITEM_APP ptr_app) { if (!app.ConfigGet (L"IsCertificatesEnabled", false).AsBool ()) return nullptr; @@ -542,7 +542,7 @@ PR_OBJECT _app_getsignatureinfo (size_t app_hash, PITEM_APP ptr_app) return ptr_cache_object; } -PR_OBJECT _app_getversioninfo (size_t app_hash, PITEM_APP ptr_app) +PR_OBJECT _app_getversioninfo (size_t app_hash, const PITEM_APP ptr_app) { if (!app_hash || !ptr_app || _r_str_isempty (ptr_app->real_path)) return nullptr; @@ -1436,7 +1436,7 @@ rstring _app_getstatename (DWORD state) return nullptr; } -rstring _app_getservicenamefromtag (HANDLE pid, PVOID ptag) +rstring _app_getservicenamefromtag (HANDLE pid, const PVOID ptag) { rstring result; const HMODULE hlib = GetModuleHandle (L"advapi32.dll"); diff --git a/src/helper.hpp b/src/helper.hpp index dc90fb67..4fd71b32 100644 --- a/src/helper.hpp +++ b/src/helper.hpp @@ -32,11 +32,11 @@ void _app_freeobjects_vec (OBJECTS_VEC& ptr_vec); void _app_freethreadpool (THREADS_VEC* ptr_pool); void _app_freelogstack (); -void _app_getappicon (PITEM_APP ptr_app, bool is_small, PINT picon_id, HICON* picon); +void _app_getappicon (const PITEM_APP ptr_app, bool is_small, PINT picon_id, HICON* picon); void _app_getdisplayname (size_t app_hash, ITEM_APP* ptr_app, LPWSTR* extracted_name); bool _app_getfileicon (LPCWSTR path, bool is_small, PINT picon_id, HICON* picon); -PR_OBJECT _app_getsignatureinfo (size_t app_hash, PITEM_APP ptr_app); -PR_OBJECT _app_getversioninfo (size_t app_hash, PITEM_APP ptr_app); +PR_OBJECT _app_getsignatureinfo (size_t app_hash, const PITEM_APP ptr_app); +PR_OBJECT _app_getversioninfo (size_t app_hash, const PITEM_APP ptr_app); rstring _app_getservicename (UINT16 port, LPCWSTR empty_text); rstring _app_getprotoname (UINT8 proto, ADDRESS_FAMILY af); rstring _app_getstatename (DWORD state); diff --git a/src/profile.cpp b/src/profile.cpp index 5261f41f..723fe85a 100644 --- a/src/profile.cpp +++ b/src/profile.cpp @@ -373,7 +373,7 @@ void _app_getcount (PITEM_STATUS ptr_status) } } -INT _app_getappgroup (size_t app_hash, PITEM_APP const ptr_app) +INT _app_getappgroup (size_t app_hash, const PITEM_APP ptr_app) { // if(!app.ConfigGet (L"IsEnableGroups", false).AsBool ()) // return INVALID_INT; @@ -388,7 +388,7 @@ INT _app_getappgroup (size_t app_hash, PITEM_APP const ptr_app) return ptr_app->is_enabled ? 0 : 2; } -INT _app_getrulegroup (PITEM_RULE const ptr_rule) +INT _app_getrulegroup (const PITEM_RULE ptr_rule) { // if(!app.ConfigGet (L"IsEnableGroups", false).AsBool ()) // return INVALID_INT; @@ -402,7 +402,7 @@ INT _app_getrulegroup (PITEM_RULE const ptr_rule) return 0; } -INT _app_getruleicon (PITEM_RULE const ptr_rule) +INT _app_getruleicon (const PITEM_RULE ptr_rule) { if (!ptr_rule) return 0; @@ -823,7 +823,7 @@ void _app_ruleblocklistset (HWND hwnd, INT spy_state, INT update_state, INT extr } } -rstring _app_rulesexpandapps (PITEM_RULE const ptr_rule, bool is_fordisplay, LPCWSTR delimeter) +rstring _app_rulesexpandapps (const PITEM_RULE ptr_rule, bool is_fordisplay, LPCWSTR delimeter) { rstring result; @@ -973,7 +973,7 @@ bool _app_isapphaverule (size_t app_hash) return false; } -bool _app_isappused (PITEM_APP const ptr_app, size_t app_hash) +bool _app_isappused (const PITEM_APP ptr_app, size_t app_hash) { if (ptr_app && (ptr_app->is_enabled || ptr_app->is_silent) || _app_isapphaverule (app_hash)) return true; @@ -981,7 +981,7 @@ bool _app_isappused (PITEM_APP const ptr_app, size_t app_hash) return false; } -bool _app_isappexists (PITEM_APP const ptr_app) +bool _app_isappexists (const PITEM_APP ptr_app) { if (!ptr_app) return false; diff --git a/src/profile.hpp b/src/profile.hpp index 66845d8b..7818f657 100644 --- a/src/profile.hpp +++ b/src/profile.hpp @@ -18,9 +18,9 @@ void _app_freeapplication (size_t app_hash); void _app_getcount (PITEM_STATUS ptr_status); -INT _app_getappgroup (size_t app_hash, PITEM_APP const ptr_app); -INT _app_getrulegroup (PITEM_RULE const ptr_rule); -INT _app_getruleicon (PITEM_RULE const ptr_rule); +INT _app_getappgroup (size_t app_hash, const PITEM_APP ptr_app); +INT _app_getrulegroup (const PITEM_RULE ptr_rule); +INT _app_getruleicon (const PITEM_RULE ptr_rule); rstring _app_gettooltip (INT listview_id, size_t lparam); @@ -34,14 +34,14 @@ bool _app_ruleblocklistsetchange (PITEM_RULE ptr_rule, INT new_state); bool _app_ruleblocklistsetstate (PITEM_RULE ptr_rule, INT spy_state, INT update_state, INT extra_state); void _app_ruleblocklistset (HWND hwnd, INT spy_state, INT update_state, INT extra_state, bool is_instantapply); -rstring _app_rulesexpandapps (PITEM_RULE const ptr_rule, bool is_fordisplay, LPCWSTR delimeter); +rstring _app_rulesexpandapps (const PITEM_RULE ptr_rule, bool is_fordisplay, LPCWSTR delimeter); bool _app_isappfound (size_t app_hash); bool _app_isapphaveconnection (size_t app_hash); bool _app_isapphavedrive (INT letter); bool _app_isapphaverule (size_t app_hash); -bool _app_isappused (PITEM_APP const ptr_app, size_t app_hash); -bool _app_isappexists (PITEM_APP const ptr_app); +bool _app_isappused (const PITEM_APP ptr_app, size_t app_hash); +bool _app_isappexists (const PITEM_APP ptr_app); //bool _app_isruleblocklist (LPCWSTR name); bool _app_isrulehost (LPCWSTR rule); diff --git a/src/timer.cpp b/src/timer.cpp index fd6e5942..c0cdb672 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -103,7 +103,7 @@ void _app_timer_reset (HWND hwnd, PITEM_APP ptr_app) } } -bool _app_istimeractive (PITEM_APP const ptr_app) +bool _app_istimeractive (const PITEM_APP ptr_app) { return ptr_app->htimer || (ptr_app->timer && (ptr_app->timer > _r_unixtime_now ())); } diff --git a/src/timer.hpp b/src/timer.hpp index f3686a76..4533ec17 100644 --- a/src/timer.hpp +++ b/src/timer.hpp @@ -6,7 +6,7 @@ void _app_timer_set (HWND hwnd, PITEM_APP ptr_app, time_t seconds); void _app_timer_reset (HWND hwnd, PITEM_APP ptr_app); -bool _app_istimeractive (PITEM_APP const ptr_app); +bool _app_istimeractive (const PITEM_APP ptr_app); bool _app_istimersactive (); void CALLBACK _app_timer_callback (PVOID lparam, BOOLEAN); diff --git a/src/wfp.cpp b/src/wfp.cpp index 273533da..de3f309b 100644 --- a/src/wfp.cpp +++ b/src/wfp.cpp @@ -1124,7 +1124,7 @@ bool _wfp_createrulefilter (HANDLE hengine, LPCWSTR name, size_t app_hash, LPCWS return true; } -bool _wfp_create4filters (HANDLE hengine, OBJECTS_VEC & ptr_rules, UINT line, bool is_intransact) +bool _wfp_create4filters (HANDLE hengine, const OBJECTS_VEC& ptr_rules, UINT line, bool is_intransact) { if (!hengine || ptr_rules.empty ()) return false; @@ -1290,7 +1290,7 @@ bool _wfp_create4filters (HANDLE hengine, OBJECTS_VEC & ptr_rules, UINT line, bo return true; } -bool _wfp_create3filters (HANDLE hengine, OBJECTS_VEC & ptr_apps, UINT line, bool is_intransact) +bool _wfp_create3filters (HANDLE hengine, const OBJECTS_VEC& ptr_apps, UINT line, bool is_intransact) { if (!hengine || ptr_apps.empty ()) return false; @@ -1698,7 +1698,7 @@ bool _wfp_create2filters (HANDLE hengine, UINT line, bool is_intransact) return true; } -void _wfp_setfiltersecurity (HANDLE hengine, const GUID& filter_id, PACL const pacl, UINT line) +void _wfp_setfiltersecurity (HANDLE hengine, const GUID& filter_id, const PACL pacl, UINT line) { if (!hengine || filter_id == GUID_NULL) return; @@ -2013,7 +2013,7 @@ DWORD _FwpmGetAppIdFromFileName1 (LPCWSTR path, FWP_BYTE_BLOB** lpblob, EnumData return ERROR_FILE_NOT_FOUND; } -bool ByteBlobAlloc (PVOID const data, size_t length, FWP_BYTE_BLOB** lpblob) +bool ByteBlobAlloc (const PVOID data, size_t length, FWP_BYTE_BLOB** lpblob) { if (!data || !length || !lpblob) return false; diff --git a/src/wfp.hpp b/src/wfp.hpp index f1da639d..b876df81 100644 --- a/src/wfp.hpp +++ b/src/wfp.hpp @@ -28,11 +28,11 @@ bool _wfp_destroyfilters_array (HANDLE hengine, GUIDS_VEC& ptr_filters, UINT lin bool _wfp_createrulefilter (HANDLE hengine, LPCWSTR name, size_t app_hash, LPCWSTR rule_remote, LPCWSTR rule_local, UINT8 protocol, ADDRESS_FAMILY af, FWP_DIRECTION dir, UINT8 weight, FWP_ACTION_TYPE action, UINT32 flag, GUIDS_VEC* pmfarr); -bool _wfp_create4filters (HANDLE hengine, OBJECTS_VEC& ptr_rules, UINT line, bool is_intransact = false); -bool _wfp_create3filters (HANDLE hengine, OBJECTS_VEC& ptr_apps, UINT line, bool is_intransact = false); +bool _wfp_create4filters (HANDLE hengine, const OBJECTS_VEC& ptr_rules, UINT line, bool is_intransact = false); +bool _wfp_create3filters (HANDLE hengine, const OBJECTS_VEC& ptr_apps, UINT line, bool is_intransact = false); bool _wfp_create2filters (HANDLE hengine, UINT line, bool is_intransact = false); -void _wfp_setfiltersecurity (HANDLE hengine, const GUID& filter_id, PACL const pacl, UINT line); +void _wfp_setfiltersecurity (HANDLE hengine, const GUID& filter_id, const PACL pacl, UINT line); size_t _wfp_dumpfilters (HANDLE hengine, const GUID* pprovider, GUIDS_VEC* ptr_filters); @@ -41,5 +41,5 @@ void _mps_changeconfig2 (bool is_enable); DWORD _FwpmGetAppIdFromFileName1 (LPCWSTR path, FWP_BYTE_BLOB** lpblob, EnumDataType type); -bool ByteBlobAlloc (PVOID const data, size_t length, FWP_BYTE_BLOB** lpblob); +bool ByteBlobAlloc (const PVOID data, size_t length, FWP_BYTE_BLOB** lpblob); void ByteBlobFree (FWP_BYTE_BLOB** lpblob);