From ecaf332fee97fd4830e1cff5e93b802daf81154a Mon Sep 17 00:00:00 2001 From: henrypp Date: Tue, 1 Oct 2019 15:34:38 +0600 Subject: [PATCH] upd project sdk --- src/helper.cpp | 60 +++++++++++------------ src/helper.hpp | 4 +- src/log.cpp | 10 ++-- src/main.cpp | 126 ++++++++++++++++++++++++------------------------ src/main.hpp | 6 +-- src/profile.cpp | 100 +++++++++++++++++++------------------- src/timer.cpp | 6 +-- src/wfp.cpp | 32 ++++++------ 8 files changed, 171 insertions(+), 173 deletions(-) diff --git a/src/helper.cpp b/src/helper.cpp index ebaaa24b..50de4787 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -217,7 +217,7 @@ bool _app_formataddress (ADDRESS_FAMILY af, UINT8 proto, const PVOID ptr_addr, U if (ptr_cache_object->pdata) _r_str_cat (formatted_address, _countof (formatted_address), _r_fmt (L" (%s)", (LPCWSTR)ptr_cache_object->pdata)); - _r_obj_dereference (ptr_cache_object, &_app_dereferencestring); + _r_obj_dereference (ptr_cache_object); } } else @@ -232,8 +232,8 @@ bool _app_formataddress (ADDRESS_FAMILY af, UINT8 proto, const PVOID ptr_addr, U _r_fastlock_acquireexclusive (&lock_cache); - _app_freeobjects_map (cache_hosts, &_app_dereferencestring, false); - cache_hosts[addr_hash] = _r_obj_allocate (ptr_cache); + _app_freeobjects_map (cache_hosts, false); + cache_hosts[addr_hash] = _r_obj_allocate (ptr_cache, &_app_dereferencestring); _r_obj_reference (cache_hosts[addr_hash]); @@ -273,21 +273,21 @@ rstring _app_formatport (UINT16 port, LPCWSTR empty_text) return result; } -void _app_freeobjects_map (OBJECTS_MAP& ptr_map, _R_CALLBACK_OBJECT_CLEANUP cleanup_callback, bool is_forced) +void _app_freeobjects_map (OBJECTS_MAP& ptr_map, bool is_forced) { if (is_forced || ptr_map.size () >= UMAP_CACHE_LIMIT) { for (auto &p : ptr_map) - _r_obj_dereference (p.second, cleanup_callback); + _r_obj_dereference (p.second); ptr_map.clear (); } } -void _app_freeobjects_vec (OBJECTS_VEC & ptr_vec, _R_CALLBACK_OBJECT_CLEANUP cleanup_callback) +void _app_freeobjects_vec (OBJECTS_VEC & ptr_vec) { for (size_t i = 0; i < ptr_vec.size (); i++) - _r_obj_dereference (ptr_vec.at (i), cleanup_callback); + _r_obj_dereference (ptr_vec.at (i)); ptr_vec.clear (); } @@ -324,7 +324,7 @@ void _app_freelogstack () PITEM_LIST_ENTRY ptr_entry = CONTAINING_RECORD (listEntry, ITEM_LIST_ENTRY, ListEntry); - _r_obj_dereference (ptr_entry->Body, &_app_dereferencelog); + _r_obj_dereference (ptr_entry->Body); _aligned_free (ptr_entry); } @@ -573,8 +573,8 @@ PR_OBJECT _app_getsignatureinfo (size_t app_hash, PITEM_APP ptr_app) { _r_fastlock_acquireexclusive (&lock_cache); - _app_freeobjects_map (cache_signatures, &_app_dereferencestring, false); - cache_signatures[app_hash] = _r_obj_allocate (ptr_cache); + _app_freeobjects_map (cache_signatures, false); + cache_signatures[app_hash] = _r_obj_allocate (ptr_cache, &_app_dereferencestring); ptr_cache_object = _r_obj_reference (cache_signatures[app_hash]); @@ -699,8 +699,8 @@ PR_OBJECT _app_getversioninfo (size_t app_hash, PITEM_APP ptr_app) { _r_fastlock_acquireexclusive (&lock_cache); - _app_freeobjects_map (cache_versions, &_app_dereferencestring, false); - cache_versions[app_hash] = _r_obj_allocate (ptr_cache); + _app_freeobjects_map (cache_versions, false); + cache_versions[app_hash] = _r_obj_allocate (ptr_cache, &_app_dereferencestring); ptr_cache_object = _r_obj_reference (cache_versions[app_hash]); @@ -1654,7 +1654,7 @@ void _app_generate_connections (OBJECTS_MAP& ptr_map, HASHER_MAP& checker_map) _app_formataddress (ptr_network->af, 0, &ptr_network->local_addr, 0, &ptr_network->local_fmt, format_flags); _app_formataddress (ptr_network->af, 0, &ptr_network->remote_addr, 0, &ptr_network->remote_fmt, format_flags); - ptr_map[net_hash] = _r_obj_allocate (ptr_network); + ptr_map[net_hash] = _r_obj_allocate (ptr_network, &_app_dereferencenetwork); checker_map[net_hash] = true; } } @@ -1708,7 +1708,7 @@ void _app_generate_connections (OBJECTS_MAP& ptr_map, HASHER_MAP& checker_map) _app_formataddress (ptr_network->af, 0, &ptr_network->local_addr6, 0, &ptr_network->local_fmt, format_flags); _app_formataddress (ptr_network->af, 0, &ptr_network->remote_addr6, 0, &ptr_network->remote_fmt, format_flags); - ptr_map[net_hash] = _r_obj_allocate (ptr_network); + ptr_map[net_hash] = _r_obj_allocate (ptr_network, &_app_dereferencenetwork); checker_map[net_hash] = true; } } @@ -1758,7 +1758,7 @@ void _app_generate_connections (OBJECTS_MAP& ptr_map, HASHER_MAP& checker_map) _app_formataddress (ptr_network->af, 0, &ptr_network->local_addr, 0, &ptr_network->local_fmt, format_flags); - ptr_map[net_hash] = _r_obj_allocate (ptr_network); + ptr_map[net_hash] = _r_obj_allocate (ptr_network, &_app_dereferencenetwork); checker_map[net_hash] = true; } } @@ -1805,7 +1805,7 @@ void _app_generate_connections (OBJECTS_MAP& ptr_map, HASHER_MAP& checker_map) _app_formataddress (ptr_network->af, 0, &ptr_network->local_addr6, 0, &ptr_network->local_fmt, format_flags); - ptr_map[net_hash] = _r_obj_allocate (ptr_network); + ptr_map[net_hash] = _r_obj_allocate (ptr_network, &_app_dereferencenetwork); checker_map[net_hash] = true; } } @@ -1928,7 +1928,7 @@ void _app_generate_packages () { _app_load_appxmanifest (ptr_item); - apps_helper[app_hash] = _r_obj_allocate (ptr_item); + apps_helper[app_hash] = _r_obj_allocate (ptr_item, &_app_dereferenceappshelper); } RegCloseKey (hsubkey); @@ -2093,7 +2093,7 @@ void _app_generate_services () } else { - apps_helper[app_hash] = _r_obj_allocate (ptr_item); + apps_helper[app_hash] = _r_obj_allocate (ptr_item, &_app_dereferenceappshelper); } } @@ -2168,13 +2168,13 @@ void _app_generate_rulesmenu (HMENU hsubmenu, size_t app_hash) if (ptr_rule->type != DataRuleCustom || (type == 0 && (!ptr_rule->is_readonly || is_global)) || (type == 1 && (ptr_rule->is_readonly || is_global)) || (type == 2 && !is_global)) { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); continue; } if ((loop == 0 && !is_enabled) || (loop == 1 && is_enabled)) { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); continue; } @@ -2199,7 +2199,7 @@ void _app_generate_rulesmenu (HMENU hsubmenu, size_t app_hash) InsertMenuItem (hsubmenu, mii.wID, FALSE, &mii); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } } @@ -2225,7 +2225,7 @@ bool _app_item_get (EnumDataType type, size_t app_hash, rstring* display_name, r { if (ptr_app_item->type != type) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceappshelper); + _r_obj_dereference (ptr_app_object); return false; } @@ -2273,11 +2273,11 @@ bool _app_item_get (EnumDataType type, size_t app_hash, rstring* display_name, r if (ptime) *ptime = ptr_app_item->timestamp; - _r_obj_dereference (ptr_app_object, &_app_dereferenceappshelper); + _r_obj_dereference (ptr_app_object); return true; } - _r_obj_dereference (ptr_app_object, &_app_dereferenceappshelper); + _r_obj_dereference (ptr_app_object); } return false; @@ -2720,7 +2720,7 @@ bool _app_parsenetworkstring (LPCWSTR network_string, NET_ADDRESS_FORMAT * forma if (ptr_cache_object->pdata) _r_str_copy (paddr_dns, dns_length, (LPCWSTR)ptr_cache_object->pdata); - _r_obj_dereference (ptr_cache_object, &_app_dereferencestring); + _r_obj_dereference (ptr_cache_object); } return *paddr_dns; @@ -2745,8 +2745,8 @@ bool _app_parsenetworkstring (LPCWSTR network_string, NET_ADDRESS_FORMAT * forma { _r_fastlock_acquireexclusive (&lock_cache); - _app_freeobjects_map (cache_dns, &_app_dereferencestring, false); - cache_dns[dns_hash] = _r_obj_allocate (ptr_cache); + _app_freeobjects_map (cache_dns, false); + cache_dns[dns_hash] = _r_obj_allocate (ptr_cache, &_app_dereferencestring); _r_obj_reference (cache_dns[dns_hash]); @@ -3017,7 +3017,7 @@ bool _app_resolveaddress (ADDRESS_FAMILY af, LPVOID paddr, LPWSTR * pbuffer) if (ptr_cache_object->pdata) result = _r_str_alloc (pbuffer, _r_str_length ((LPCWSTR)ptr_cache_object->pdata), (LPCWSTR)ptr_cache_object->pdata); - _r_obj_dereference (ptr_cache_object, &_app_dereferencestring); + _r_obj_dereference (ptr_cache_object); } } else @@ -3043,8 +3043,8 @@ bool _app_resolveaddress (ADDRESS_FAMILY af, LPVOID paddr, LPWSTR * pbuffer) { _r_fastlock_acquireexclusive (&lock_cache); - _app_freeobjects_map (cache_arpa, &_app_dereferencestring, false); - cache_arpa[arpa_hash] = _r_obj_allocate (ptr_cache); + _app_freeobjects_map (cache_arpa, false); + cache_arpa[arpa_hash] = _r_obj_allocate (ptr_cache, &_app_dereferencestring); _r_obj_reference (cache_arpa[arpa_hash]); diff --git a/src/helper.hpp b/src/helper.hpp index 29b44c94..191fa362 100644 --- a/src/helper.hpp +++ b/src/helper.hpp @@ -27,8 +27,8 @@ void _app_setinterfacestate (HWND hwnd); bool _app_formataddress (ADDRESS_FAMILY af, UINT8 proto, const PVOID ptr_addr, UINT16 port, LPWSTR* ptr_dest, DWORD flags); rstring _app_formatport (UINT16 port, LPCWSTR empty_text); -void _app_freeobjects_map (OBJECTS_MAP& ptr_map, _R_CALLBACK_OBJECT_CLEANUP cleanup_callback, bool is_forced); -void _app_freeobjects_vec (OBJECTS_VEC& ptr_vec, _R_CALLBACK_OBJECT_CLEANUP cleanup_callback); +void _app_freeobjects_map (OBJECTS_MAP& ptr_map, bool is_forced); +void _app_freeobjects_vec (OBJECTS_VEC& ptr_vec); void _app_freethreadpool (THREADS_VEC* ptr_pool); void _app_freelogstack (); diff --git a/src/log.cpp b/src/log.cpp index 00bc13c8..e31ad620 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -120,7 +120,7 @@ void _app_logwrite (PITEM_LOG ptr_log) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } @@ -554,7 +554,7 @@ void CALLBACK _wfp_logcallback (UINT32 flags, FILETIME const *pft, UINT8 const*a // push into a slist { - ptr_entry->Body = _r_obj_allocate (ptr_log); + ptr_entry->Body = _r_obj_allocate (ptr_log, &_app_dereferencelog); InterlockedPushEntrySList (&log_stack.ListHead, &ptr_entry->ListEntry); const LONG new_item_count = InterlockedIncrement (&log_stack.item_count); @@ -845,7 +845,7 @@ UINT WINAPI LogThread (LPVOID lparam) if (!ptr_log) { - _r_obj_dereference (ptr_log_object, &_app_dereferencelog); + _r_obj_dereference (ptr_log_object); continue; } @@ -908,13 +908,13 @@ UINT WINAPI LogThread (LPVOID lparam) _app_notifyadd (config.hnotification, _r_obj_reference (ptr_log_object), ptr_app); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } } } - _r_obj_dereference (ptr_log_object, &_app_dereferencelog); + _r_obj_dereference (ptr_log_object); } _r_fastlock_releaseshared (&lock_logthread); diff --git a/src/main.cpp b/src/main.cpp index 60f764ea..9ee4ca07 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -245,12 +245,12 @@ COLORREF _app_getcolorvalue (size_t color_hash) if (ptr_clr && ptr_clr->clr_hash == color_hash) { const COLORREF result = ptr_clr->new_clr ? ptr_clr->new_clr : ptr_clr->default_clr; - _r_obj_dereference (ptr_clr_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_clr_object); return result; } - _r_obj_dereference (ptr_clr_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_clr_object); } return 0; @@ -303,7 +303,7 @@ COLORREF _app_getcolor (INT listview_id, size_t app_hash) color_value = L"ColorSystem"; } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return _app_getcolorvalue (color_value.Hash ()); } @@ -440,7 +440,7 @@ UINT WINAPI NetworkMonitorThread (LPVOID lparam) } } - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); SendDlgItemMessage (hwnd, network_listview_id, WM_SETREDRAW, TRUE, 0); @@ -466,7 +466,7 @@ UINT WINAPI NetworkMonitorThread (LPVOID lparam) network_map.erase (network_hash); - _r_obj_dereferenceex (ptr_network_object, 2, &_app_dereferencenetwork); + _r_obj_dereferenceex (ptr_network_object, 2); // redraw listview item if (is_highlighting_enabled) @@ -585,7 +585,7 @@ void addcolor (UINT locale_id, LPCWSTR config_name, bool is_enabled, LPCWSTR con ptr_clr->locale_id = locale_id; ptr_clr->default_clr = default_clr; - colors.push_back (_r_obj_allocate (ptr_clr)); + colors.push_back (_r_obj_allocate (ptr_clr, &_app_dereferencecolor)); } bool _app_installmessage (HWND hwnd, bool is_install) @@ -745,12 +745,12 @@ LONG _app_nmcustdraw_listview (LPNMLVCUSTOMDRAW lpnmlv) if (is_tableview) _r_dc_fillrect (lpnmlv->nmcd.hdc, &lpnmlv->nmcd.rc, new_clr); - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); return CDRF_NEWFONT; } } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } else if (listview_id == IDC_COLORS) { @@ -772,12 +772,12 @@ LONG _app_nmcustdraw_listview (LPNMLVCUSTOMDRAW lpnmlv) if (is_tableview) _r_dc_fillrect (lpnmlv->nmcd.hdc, &lpnmlv->nmcd.rc, lpnmlv->clrTextBk); - _r_obj_dereference (ptr_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_object); return CDRF_NEWFONT; } } - _r_obj_dereference (ptr_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_object); } } @@ -948,20 +948,20 @@ INT_PTR CALLBACK EditorProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) if (!ptr_app) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); continue; } // windows store apps (win8+) if (ptr_app->type == DataAppUWP && !_r_sys_validversion (6, 2)) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); continue; } if (ptr_rule->is_forservices && (p.first == config.ntoskrnl_hash || p.first == config.svchost_hash)) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); continue; } @@ -976,7 +976,7 @@ INT_PTR CALLBACK EditorProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) item += 1; - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } _r_fastlock_releaseshared (&lock_access); @@ -1620,10 +1620,10 @@ void _app_config_apply (HWND hwnd, INT ctrl_id) PR_OBJECT ptr_signature_object = _app_getsignatureinfo (p.first, ptr_app); if (ptr_signature_object) - _r_obj_dereference (ptr_signature_object, &_app_dereferencestring); + _r_obj_dereference (ptr_signature_object); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } _r_fastlock_releaseshared (&lock_access); @@ -1798,7 +1798,7 @@ INT_PTR CALLBACK SettingsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam item += 1; } - _r_obj_dereference (ptr_color_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_color_object); } } @@ -1953,7 +1953,7 @@ INT_PTR CALLBACK SettingsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam _r_fastlock_releaseshared (&lock_checkbox); } - _r_obj_dereference (ptr_clr_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_clr_object); } } @@ -2074,7 +2074,7 @@ INT_PTR CALLBACK SettingsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam if (ptr_clr) app.ConfigSet (ptr_clr->pcfg_name, new_val, L"colors"); - _r_obj_dereference (ptr_clr_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_clr_object); _r_listview_redraw (app.GetHWND (), _app_gettab_id (app.GetHWND ())); } @@ -2122,7 +2122,7 @@ INT_PTR CALLBACK SettingsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam if (ptr_clr) cust[i] = ptr_clr->default_clr; - _r_obj_dereference (ptr_clr_object, &_app_dereferencecolor); + _r_obj_dereference (ptr_clr_object); } } @@ -2144,7 +2144,7 @@ INT_PTR CALLBACK SettingsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam _r_listview_redraw (app.GetHWND (), _app_gettab_id (app.GetHWND ())); } - _r_obj_dereference (ptr_clr_object_current, &_app_dereferencecolor); + _r_obj_dereference (ptr_clr_object_current); break; } @@ -3289,7 +3289,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) _r_fastlock_releaseshared (&lock_checkbox); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } else if (listview_id >= IDC_RULES_BLOCKLIST && listview_id <= IDC_RULES_CUSTOM) @@ -3315,7 +3315,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) _r_fastlock_releaseshared (&lock_checkbox); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } else if (listview_id == IDC_NETWORK) @@ -3369,7 +3369,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { const time_t current_timestamp = (time_t)lparam; - _app_freeobjects_map (rules_config, &_app_dereferenceruleconfig, true); + _app_freeobjects_map (rules_config, true); _r_fs_makebackup (config.profile_path, current_timestamp); _r_fs_makebackup (config.profile_path_backup, current_timestamp); @@ -3643,7 +3643,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } else if (listview_id >= IDC_RULES_BLOCKLIST && listview_id <= IDC_RULES_CUSTOM) { @@ -3675,7 +3675,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } if (is_changed) @@ -3881,7 +3881,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) CheckMenuRadioItem (hsubmenu_timer, IDM_DISABLETIMER, IDM_DISABLETIMER, IDM_DISABLETIMER, MF_BYCOMMAND); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); if (listview_id != IDC_APPS_PROFILE) EnableMenuItem (hsubmenu, IDM_DELETE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); @@ -3902,7 +3902,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) if (ptr_rule && ptr_rule->is_readonly) EnableMenuItem (hsubmenu, IDM_DELETE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } else { @@ -3929,7 +3929,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) EnableMenuItem (hsubmenu, IDM_EXPLORE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); } - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } } @@ -3973,7 +3973,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) if (ptr_log_object) { _app_notifyshow (config.hnotification, ptr_log_object, true, false); - _r_obj_dereference (ptr_log_object, &_app_dereferencelog); + _r_obj_dereference (ptr_log_object); } break; @@ -4254,7 +4254,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) _r_fastlock_releaseshared (&lock_checkbox); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } const INT rule_listview_id = _app_getlistview_id (ptr_rule->type); @@ -4277,7 +4277,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) _wfp_create4filters (_wfp_getenginehandle (), rules, __LINE__); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); _app_listviewsort (hwnd, app_listview_id); @@ -4318,12 +4318,12 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } else { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } _wfp_create3filters (_wfp_getenginehandle (), rules, __LINE__); - _app_freeobjects_vec (rules, &_app_dereferenceapp); + _app_freeobjects_vec (rules); _app_listviewsort (hwnd, listview_id); @@ -4511,7 +4511,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } _r_fastlock_releaseshared (&lock_access); @@ -4558,7 +4558,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } // regroup rules @@ -4588,7 +4588,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } _r_fastlock_releaseshared (&lock_access); @@ -4683,7 +4683,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } _r_fastlock_releaseshared (&lock_access); @@ -5067,13 +5067,13 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) if (!_app_isappfound (app_hash)) { _r_path_explore (ptr_network->path); - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); continue; } } - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } else { @@ -5091,7 +5091,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) if (!ptr_app) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); continue; } @@ -5116,7 +5116,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) _app_timer_reset (hwnd, ptr_app); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } if ( @@ -5215,14 +5215,14 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } else { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } if (is_changed) { _wfp_create3filters (_wfp_getenginehandle (), rules, __LINE__); - _app_freeobjects_vec (rules, &_app_dereferenceapp); + _app_freeobjects_vec (rules); } } else if (listview_id >= IDC_RULES_BLOCKLIST && listview_id <= IDC_RULES_CUSTOM) @@ -5256,14 +5256,14 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } else { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } if (is_changed) { _wfp_create4filters (_wfp_getenginehandle (), rules, __LINE__); - _app_freeobjects_vec (rules, &_app_dereferencerule); + _app_freeobjects_vec (rules); } } @@ -5287,7 +5287,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) case IDM_OPENRULESEDITOR: { PITEM_RULE ptr_rule = new ITEM_RULE; - PR_OBJECT ptr_rule_object = _r_obj_allocate (ptr_rule); + PR_OBJECT ptr_rule_object = _r_obj_allocate (ptr_rule, &_app_dereferencerule); _app_ruleenable (ptr_rule, true); @@ -5365,7 +5365,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) SAFE_DELETE_ARRAY (fmt); } - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } _r_str_trim (rule_remote, DIVIDER_RULE); @@ -5405,7 +5405,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } else { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } break; @@ -5448,7 +5448,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) _app_profile_save (); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } else if (listview_id == IDC_NETWORK) { @@ -5483,7 +5483,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } break; @@ -5532,14 +5532,14 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) SendDlgItemMessage (hwnd, listview_id, LVM_DELETEITEM, (WPARAM)item, 0); network_map.erase (network_hash); - _r_obj_dereferenceex (ptr_network_object, 2, &_app_dereferencenetwork); + _r_obj_dereferenceex (ptr_network_object, 2); continue; } } } - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } break; @@ -5588,11 +5588,11 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) _app_freeapplication (app_hash); _r_fastlock_releaseexclusive (&lock_access); - _r_obj_dereferenceex (ptr_app_object, 2, &_app_dereferenceapp); + _r_obj_dereferenceex (ptr_app_object, 2); } else { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } else if (listview_id == IDC_RULES_CUSTOM) @@ -5620,11 +5620,11 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) rules_arr.at (rule_idx) = nullptr; _r_fastlock_releaseshared (&lock_access); - _r_obj_dereferenceex (ptr_rule_object, 2, &_app_dereferencerule); + _r_obj_dereferenceex (ptr_rule_object, 2); } else { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } for (auto &p : apps_checker) @@ -5654,7 +5654,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } } @@ -5709,7 +5709,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) is_deleted = true; } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } for (size_t i = 0; i < apps_list.size (); i++) @@ -5754,14 +5754,14 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) } else { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } _r_fastlock_releaseshared (&lock_access); _wfp_create3filters (_wfp_getenginehandle (), rules, __LINE__); - _app_freeobjects_vec (rules, &_app_dereferenceapp); + _app_freeobjects_vec (rules); _app_listviewsort (hwnd, _app_gettab_id (hwnd)); @@ -5826,10 +5826,10 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { ptr_app->last_notify = 0; - _app_notifyadd (config.hnotification, _r_obj_allocate (ptr_log), ptr_app); + _app_notifyadd (config.hnotification, _r_obj_allocate (ptr_log, &_app_dereferencelog), ptr_app); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } break; diff --git a/src/main.hpp b/src/main.hpp index 6c4e5182..6722e387 100644 --- a/src/main.hpp +++ b/src/main.hpp @@ -95,8 +95,6 @@ enum EnumInfo INT_PTR CALLBACK EditorProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); INT_PTR CALLBACK SettingsProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); -void _app_dereferencelog (PVOID pdata); - // config #define WM_TRAYICON WM_APP + 1 #define LANG_MENU 6 @@ -115,7 +113,7 @@ void _app_dereferencelog (PVOID pdata); #define LOG_PATH_EXT L"log" #define LOG_PATH_DEFAULT L"%USERPROFILE%\\" APP_NAME_SHORT L"." LOG_PATH_EXT #define LOG_VIEWER_DEFAULT L"%SystemRoot%\\notepad.exe" -#define LOG_SIZE_LIMIT_DEFAULT 1024ul +#define LOG_SIZE_LIMIT_DEFAULT 1024UL #define PROC_SYSTEM_PID 4 #define PROC_SYSTEM_NAME L"System" @@ -300,7 +298,7 @@ typedef struct tagITEM_APP SAFE_DELETE_ARRAY (pdata); - _r_obj_dereference (pnotification, &_app_dereferencelog); + _r_obj_dereference (pnotification); } GUIDS_VEC guids; diff --git a/src/profile.cpp b/src/profile.cpp index baa4e6d6..a3ce0bf2 100644 --- a/src/profile.cpp +++ b/src/profile.cpp @@ -36,7 +36,7 @@ bool _app_getappinfo (size_t app_hash, EnumInfo info_key, LPVOID presult, size_t } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return true; } @@ -66,7 +66,7 @@ bool _app_setappinfo (size_t app_hash, EnumInfo info_key, LONG_PTR info_value) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return true; } @@ -165,7 +165,7 @@ size_t _app_addapplication (HWND hwnd, LPCWSTR path, time_t timestamp, time_t ti PR_OBJECT ptr_signer_object = _app_getsignatureinfo (app_hash, ptr_app); if (ptr_signer_object) - _r_obj_dereference (ptr_signer_object, &_app_dereferencestring); + _r_obj_dereference (ptr_signer_object); } ptr_app->is_enabled = is_enabled; @@ -179,7 +179,7 @@ size_t _app_addapplication (HWND hwnd, LPCWSTR path, time_t timestamp, time_t ti ptr_app->is_undeletable = true; // insert object into the map - apps[app_hash] = _r_obj_allocate (ptr_app); + apps[app_hash] = _r_obj_allocate (ptr_app, &_app_dereferenceapp); // insert item if (hwnd) @@ -241,7 +241,7 @@ PR_OBJECT _app_getrulebyhash (size_t rule_hash) } } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } return nullptr; @@ -268,7 +268,7 @@ size_t _app_getnetworkapp (size_t network_hash) if (ptr_network) app_hash = ptr_network->app_hash; - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } return app_hash; @@ -318,7 +318,7 @@ void _app_freeapplication (size_t app_hash) } } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } apps.erase (app_hash); @@ -351,7 +351,7 @@ void _app_getcount (PITEM_STATUS ptr_status) ptr_status->apps_count += 1; } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } for (size_t i = 0; i < rules_arr.size (); i++) @@ -382,7 +382,7 @@ void _app_getcount (PITEM_STATUS ptr_status) } } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } @@ -440,7 +440,7 @@ rstring _app_gettooltip (INT listview_id, size_t lparam) if (ptr_network) lparam = ptr_network->app_hash; - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } } @@ -465,7 +465,7 @@ rstring _app_gettooltip (INT listview_id, size_t lparam) if (ptr_version_object->pdata) display_name = (LPCWSTR)ptr_version_object->pdata; - _r_obj_dereference (ptr_version_object, &_app_dereferencestring); + _r_obj_dereference (ptr_version_object); } if (!display_name.IsEmpty ()) @@ -497,7 +497,7 @@ rstring _app_gettooltip (INT listview_id, size_t lparam) if (ptr_signature_object->pdata) result.AppendFormat (L"\r\n%s:\r\n" SZ_TAB L"%s", app.LocaleString (IDS_SIGNATURE, nullptr).GetString (), (LPCWSTR)ptr_signature_object->pdata); - _r_obj_dereference (ptr_signature_object, &_app_dereferencestring); + _r_obj_dereference (ptr_signature_object); } } @@ -544,7 +544,7 @@ rstring _app_gettooltip (INT listview_id, size_t lparam) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } else if (listview_id >= IDC_RULES_BLOCKLIST && listview_id <= IDC_RULES_CUSTOM) @@ -580,7 +580,7 @@ rstring _app_gettooltip (INT listview_id, size_t lparam) result.AppendFormat (L"\r\n%s:\r\n%s%s", app.LocaleString (IDS_FILEPATH, nullptr).GetString (), SZ_TAB, _app_rulesexpandapps (ptr_rule, true, L"\r\n" SZ_TAB).GetString ()); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } @@ -636,7 +636,7 @@ void _app_setruleiteminfo (HWND hwnd, INT listview_id, INT item, PITEM_RULE ptr_ } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } } @@ -665,7 +665,7 @@ void _app_ruleenable (PITEM_RULE ptr_rule, bool is_enable) if (ptr_config) ptr_config->is_enabled = is_enable; - _r_obj_dereference (ptr_config_object, &_app_dereferenceruleconfig); + _r_obj_dereference (ptr_config_object); } else { @@ -676,7 +676,7 @@ void _app_ruleenable (PITEM_RULE ptr_rule, bool is_enable) ptr_config->is_enabled = is_enable; _r_str_alloc (&ptr_config->pname, _r_str_length (ptr_rule->pname), ptr_rule->pname); - rules_config[rule_hash] = _r_obj_allocate (ptr_config); + rules_config[rule_hash] = _r_obj_allocate (ptr_config, &_app_dereferenceruleconfig); } } else @@ -688,7 +688,7 @@ void _app_ruleenable (PITEM_RULE ptr_rule, bool is_enable) ptr_config->is_enabled = is_enable; _r_str_alloc (&ptr_config->pname, _r_str_length (ptr_rule->pname), ptr_rule->pname); - rules_config[rule_hash] = _r_obj_allocate (ptr_config); + rules_config[rule_hash] = _r_obj_allocate (ptr_config, &_app_dereferenceruleconfig); } } } @@ -718,7 +718,7 @@ void _app_ruleenable2 (PITEM_RULE ptr_rule, bool is_enable) if (ptr_config) ptr_config->is_enabled = is_enable; - _r_obj_dereference (ptr_config_object, &_app_dereferenceruleconfig); + _r_obj_dereference (ptr_config_object); } } } @@ -784,13 +784,13 @@ void _app_ruleblocklistset (HWND hwnd, INT spy_state, INT update_state, INT extr if (!ptr_rule || ptr_rule->type != DataRuleBlocklist) { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); continue; } if (!_app_ruleblocklistsetstate (ptr_rule, spy_state, update_state, extra_state)) { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); continue; } @@ -815,7 +815,7 @@ void _app_ruleblocklistset (HWND hwnd, INT spy_state, INT update_state, INT extr continue; } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } if (changes_count) @@ -831,7 +831,7 @@ void _app_ruleblocklistset (HWND hwnd, INT spy_state, INT update_state, INT extr if (is_instantapply) { _wfp_create4filters (_wfp_getenginehandle (), rules, __LINE__); - _app_freeobjects_vec (rules, &_app_dereferencerule); + _app_freeobjects_vec (rules); } _app_profile_save (); // required! @@ -885,7 +885,7 @@ rstring _app_rulesexpandapps (PITEM_RULE ptr_rule, bool is_fordisplay, LPCWSTR d result.Append (delimeter); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } _r_str_trim (result, delimeter); @@ -917,12 +917,12 @@ bool _app_isapphaveconnection (size_t app_hash) { if (ptr_network->is_connection) { - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); return true; } } - _r_obj_dereference (ptr_network_object, &_app_dereferencenetwork); + _r_obj_dereference (ptr_network_object); } return false; @@ -941,7 +941,7 @@ bool _app_isapphavedrive (INT letter) if (!ptr_app) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); continue; } @@ -951,12 +951,12 @@ bool _app_isapphavedrive (INT letter) { if (ptr_app->is_enabled || _app_isapphaverule (p.first)) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return true; } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } return false; @@ -978,11 +978,11 @@ bool _app_isapphaverule (size_t app_hash) if (ptr_rule && ptr_rule->is_enabled && ptr_rule->type == DataRuleCustom && ptr_rule->apps.find (app_hash) != ptr_rule->apps.end ()) { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); return true; } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } return false; @@ -1240,7 +1240,7 @@ void _app_profile_load_helper (const pugi::xml_node & root, EnumDataType type, U apps_rule.AppendFormat (L"%s%s", DIVIDER_APP, ptr_config->papps); } - _r_obj_dereference (ptr_config_object, &_app_dereferenceruleconfig); + _r_obj_dereference (ptr_config_object); if (!apps_rule.IsEmpty ()) { @@ -1285,7 +1285,7 @@ void _app_profile_load_helper (const pugi::xml_node & root, EnumDataType type, U } _r_fastlock_acquireshared (&lock_access); - rules_arr.push_back (_r_obj_allocate (ptr_rule)); + rules_arr.push_back (_r_obj_allocate (ptr_rule, &_app_dereferencerule)); _r_fastlock_releaseshared (&lock_access); } else if (type == DataRulesConfig) @@ -1317,7 +1317,7 @@ void _app_profile_load_helper (const pugi::xml_node & root, EnumDataType type, U _r_str_alloc (&ptr_config->pname, rule_name.GetLength (), rule_name); _r_str_alloc (&ptr_config->papps, attr_apps.GetLength (), attr_apps); - rules_config[rule_hash] = _r_obj_allocate (ptr_config); + rules_config[rule_hash] = _r_obj_allocate (ptr_config, &_app_dereferenceruleconfig); } } } @@ -1398,16 +1398,16 @@ void _app_profile_load (HWND hwnd, LPCWSTR path_custom) _r_fastlock_acquireexclusive (&lock_access); // clear apps - _app_freeobjects_map (apps, &_app_dereferenceapp, true); + _app_freeobjects_map (apps, true); // clear services/uwp apps - _app_freeobjects_map (apps_helper, &_app_dereferenceappshelper, true); + _app_freeobjects_map (apps_helper, true); // clear rules config - _app_freeobjects_map (rules_config, &_app_dereferenceruleconfig, true); + _app_freeobjects_map (rules_config, true); // clear rules - _app_freeobjects_vec (rules_arr, &_app_dereferencerule); + _app_freeobjects_vec (rules_arr); // generate uwp apps list (win8+) if (_r_sys_validversion (6, 2)) @@ -1604,7 +1604,7 @@ void _app_profile_load (HWND hwnd, LPCWSTR path_custom) _app_timer_set (hwnd, ptr_app, (ptr_app->timer - current_time)); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } // add services and store apps @@ -1620,7 +1620,7 @@ void _app_profile_load (HWND hwnd, LPCWSTR path_custom) if (ptr_app_item) _app_addapplication (hwnd, ptr_app_item->internal_name, ptr_app_item->timestamp, 0, 0, false, false, true); - _r_obj_dereference (ptr_item_object, &_app_dereferenceappshelper); + _r_obj_dereference (ptr_item_object); } // add rules @@ -1650,7 +1650,7 @@ void _app_profile_load (HWND hwnd, LPCWSTR path_custom) } } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } _r_fastlock_releaseshared (&lock_access); @@ -1703,7 +1703,7 @@ void _app_profile_save (LPCWSTR path_custom) { if (!ptr_app->original_path) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); continue; } @@ -1711,7 +1711,7 @@ void _app_profile_save (LPCWSTR path_custom) if (!is_used && (ptr_app->type == DataAppService || ptr_app->type == DataAppUWP)) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); continue; } @@ -1740,7 +1740,7 @@ void _app_profile_save (LPCWSTR path_custom) } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } _r_fastlock_releaseshared (&lock_access); @@ -1762,7 +1762,7 @@ void _app_profile_save (LPCWSTR path_custom) if (!ptr_rule || ptr_rule->is_readonly || _r_str_isempty (ptr_rule->pname)) { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); continue; } @@ -1807,7 +1807,7 @@ void _app_profile_save (LPCWSTR path_custom) item.append_attribute (L"is_enabled").set_value (ptr_rule->is_enabled); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } _r_fastlock_releaseshared (&lock_access); @@ -1829,7 +1829,7 @@ void _app_profile_save (LPCWSTR path_custom) if (!ptr_config || _r_str_isempty (ptr_config->pname)) { - _r_obj_dereference (ptr_config_object, &_app_dereferenceruleconfig); + _r_obj_dereference (ptr_config_object); continue; } @@ -1852,7 +1852,7 @@ void _app_profile_save (LPCWSTR path_custom) rule_apps = _app_rulesexpandapps (ptr_rule, false, DIVIDER_APP); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } @@ -1861,7 +1861,7 @@ void _app_profile_save (LPCWSTR path_custom) { if (rule_apps.IsEmpty ()) { - _r_obj_dereference (ptr_config_object, &_app_dereferenceruleconfig); + _r_obj_dereference (ptr_config_object); continue; } } @@ -1878,7 +1878,7 @@ void _app_profile_save (LPCWSTR path_custom) item.append_attribute (L"is_enabled").set_value (ptr_config->is_enabled); } - _r_obj_dereference (ptr_config_object, &_app_dereferenceruleconfig); + _r_obj_dereference (ptr_config_object); } _r_fastlock_releaseshared (&lock_access); diff --git a/src/timer.cpp b/src/timer.cpp index 52e3b517..6eabbb76 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -123,13 +123,13 @@ bool _app_istimersactive () if (ptr_app && _app_istimeractive (ptr_app)) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); _r_fastlock_releaseshared (&lock_access); return true; } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } _r_fastlock_releaseshared (&lock_access); @@ -153,7 +153,7 @@ void CALLBACK _app_timer_callback (PVOID lparam, BOOLEAN) if (!ptr_app) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return; } diff --git a/src/wfp.cpp b/src/wfp.cpp index f14fa2ad..49402159 100644 --- a/src/wfp.cpp +++ b/src/wfp.cpp @@ -464,14 +464,14 @@ void _wfp_installfilters () } else { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } } if (!rules.empty ()) { _wfp_create3filters (hengine, rules, __LINE__, is_intransact); - _app_freeobjects_vec (rules, &_app_dereferenceapp); + _app_freeobjects_vec (rules); } } @@ -494,14 +494,14 @@ void _wfp_installfilters () } else { - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } if (!rules.empty ()) { _wfp_create4filters (hengine, rules, __LINE__, is_intransact); - _app_freeobjects_vec (rules, &_app_dereferencerule); + _app_freeobjects_vec (rules); } } @@ -686,7 +686,7 @@ void _wfp_clearfilter_ids () ptr_rule->guids.clear (); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } _r_fastlock_releaseexclusive (&lock_access); @@ -775,7 +775,7 @@ bool _wfp_createrulefilter (HANDLE hengine, LPCWSTR name, size_t app_hash, LPCWS if (!ptr_app) { - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return false; } @@ -793,7 +793,7 @@ bool _wfp_createrulefilter (HANDLE hengine, LPCWSTR name, size_t app_hash, LPCWS else { _app_logerror (TEXT (__FUNCTION__), 0, ptr_app->display_name, true); - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return false; } @@ -815,7 +815,7 @@ bool _wfp_createrulefilter (HANDLE hengine, LPCWSTR name, size_t app_hash, LPCWS ByteBlobFree (&bSid); _app_logerror (TEXT (__FUNCTION__), 0, ptr_app->display_name, true); - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return false; } @@ -843,13 +843,13 @@ bool _wfp_createrulefilter (HANDLE hengine, LPCWSTR name, size_t app_hash, LPCWS if (rc != ERROR_FILE_NOT_FOUND && rc != ERROR_PATH_NOT_FOUND) _app_logerror (L"FwpmGetAppIdFromFileName", rc, path, true); - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); return false; } } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } // set ip/port condition @@ -1093,7 +1093,7 @@ bool _wfp_create4filters (HANDLE hengine, OBJECTS_VEC & ptr_rules, UINT line, bo ptr_rule->guids.clear (); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } for (size_t i = 0; i < ids.size (); i++) @@ -1187,7 +1187,7 @@ bool _wfp_create4filters (HANDLE hengine, OBJECTS_VEC & ptr_rules, UINT line, bo ptr_rule->guids = std::move (guids); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } if (!is_intransact) @@ -1215,7 +1215,7 @@ bool _wfp_create4filters (HANDLE hengine, OBJECTS_VEC & ptr_rules, UINT line, bo _wfp_setfiltersecurity (hengine, ptr_rule->guids.at (j), pacl, line); } - _r_obj_dereference (ptr_rule_object, &_app_dereferencerule); + _r_obj_dereference (ptr_rule_object); } } @@ -1258,7 +1258,7 @@ bool _wfp_create3filters (HANDLE hengine, OBJECTS_VEC & ptr_apps, UINT line, boo ptr_app->guids.clear (); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } for (size_t i = 0; i < ids.size (); i++) @@ -1297,7 +1297,7 @@ bool _wfp_create3filters (HANDLE hengine, OBJECTS_VEC & ptr_apps, UINT line, boo ptr_app->guids.insert (ptr_app->guids.end (), guids.begin (), guids.end ()); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } if (!is_intransact) @@ -1325,7 +1325,7 @@ bool _wfp_create3filters (HANDLE hengine, OBJECTS_VEC & ptr_apps, UINT line, boo _wfp_setfiltersecurity (hengine, ptr_app->guids.at (j), pacl, line); } - _r_obj_dereference (ptr_app_object, &_app_dereferenceapp); + _r_obj_dereference (ptr_app_object); } }