From ff28a82c87bf0e09bf4a082e427e8d4189bf89b7 Mon Sep 17 00:00:00 2001 From: henrypp Date: Sat, 16 Dec 2023 18:52:47 +0600 Subject: [PATCH] code cosmetics --- src/db.c | 10 +++++----- src/helper.c | 16 ++-------------- src/icons.c | 2 +- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/db.c b/src/db.c index d0c2bbff..c3dd1980 100644 --- a/src/db.c +++ b/src/db.c @@ -202,7 +202,7 @@ NTSTATUS _app_db_openfromfile ( if (db_info->bytes) _r_obj_clearreference (&db_info->bytes); - status = _r_fs_createfile (path->buffer, FILE_OPEN, FILE_GENERIC_READ, FILE_SHARE_READ, FILE_ATTRIBUTE_NORMAL, 0, FALSE, NULL, &hfile); + status = _r_fs_openfile (path->buffer, GENERIC_READ, FILE_SHARE_READ, FALSE, &hfile); if (!NT_SUCCESS (status)) return status; @@ -1761,7 +1761,7 @@ LPCWSTR _app_db_getservicename ( case 1028: case 1029: return L"ms-lsa"; - + case 1033: { if (proto == IPPROTO_UDP) @@ -1772,7 +1772,7 @@ LPCWSTR _app_db_getservicename ( case 1080: return L"socks"; - + case 1085: return L"webobjects"; @@ -1798,7 +1798,7 @@ LPCWSTR _app_db_getservicename ( case 1123: return L"murray"; - + case 1138: return L"encrypted_admin"; @@ -1813,7 +1813,7 @@ LPCWSTR _app_db_getservicename ( case 1433: return L"ms-sql-s"; - + case 1688: return L"nsjtp-data"; diff --git a/src/helper.c b/src/helper.c index 7083cc4e..d0e93317 100644 --- a/src/helper.c +++ b/src/helper.c @@ -1772,13 +1772,7 @@ VOID NTAPI _app_queue_fileinformation ( if (!_app_isappvalidbinary (ptr_app_info->path)) return; - status = _r_fs_openfile ( - ptr_app_info->path->buffer, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_DELETE | FILE_SHARE_WRITE, - FALSE, - &hfile - ); + status = _r_fs_openfile (ptr_app_info->path->buffer, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE | FILE_SHARE_WRITE, FALSE, &hfile); if (!NT_SUCCESS (status)) { @@ -1862,13 +1856,7 @@ VOID NTAPI _app_queue_notifyinformation ( { if (_app_isappvalidbinary (ptr_app_info->path)) { - status = _r_fs_openfile ( - ptr_app_info->path->buffer, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_DELETE | FILE_SHARE_WRITE, - FALSE, - &hfile - ); + status = _r_fs_openfile (ptr_app_info->path->buffer, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE | FILE_SHARE_WRITE, FALSE, &hfile); if (NT_SUCCESS (status)) { diff --git a/src/icons.c b/src/icons.c index e31366ac..54032997 100644 --- a/src/icons.c +++ b/src/icons.c @@ -130,7 +130,7 @@ HICON _app_icons_getsafeapp_hicon ( is_iconshidded = _r_config_getboolean (L"IsIconsHidden", FALSE); - if (is_iconshidded || !_app_isappvalidbinary (ptr_app->type, ptr_app->real_path)) + if (is_iconshidded || !_app_isappvalidbinary (ptr_app->real_path)) { hicon = _app_icons_getdefaulttype_hicon (ptr_app->type, icon_info);