From cadc5b2d986f81e6cf994cd685204d52d551f243 Mon Sep 17 00:00:00 2001
From: henrypp <support@henrypp.org>
Date: Fri, 8 Sep 2023 20:50:49 +0600
Subject: [PATCH] upd _app_isappvalidbinary

---
 src/helper.c | 21 +++++++++------------
 src/helper.h |  2 +-
 src/icons.c  |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/helper.c b/src/helper.c
index b6c2902a..9a2781e4 100644
--- a/src/helper.c
+++ b/src/helper.c
@@ -537,25 +537,22 @@ BOOLEAN _app_isappsigned (
 
 BOOLEAN _app_isappvalidbinary (
 	_In_ ENUM_TYPE_DATA type,
-	_In_ PR_STRING path
+	_In_opt_ PR_STRING path
 )
 {
-	static R_STRINGREF valid_exts[] = {
-		PR_STRINGREF_INIT (L".exe"),
-		PR_STRINGREF_INIT (L".dll"),
-	};
+	static R_STRINGREF valid_exts = PR_STRINGREF_INIT (L".exe");
 
 	if (type != DATA_APP_REGULAR && type != DATA_APP_SERVICE && type != DATA_APP_UWP)
 		return FALSE;
 
+	if (!path)
+		return FALSE;
+
 	if (!_app_isappvalidpath (&path->sr))
 		return FALSE;
 
-	for (SIZE_T i = 0; i < RTL_NUMBER_OF (valid_exts); i++)
-	{
-		if (_r_str_isendsswith (&path->sr, &valid_exts[i], TRUE))
-			return TRUE;
-	}
+	if (_r_str_isendsswith (&path->sr, &valid_exts, TRUE))
+		return TRUE;
 
 	return FALSE;
 }
@@ -1697,7 +1694,7 @@ NTSTATUS _app_timercallback (
 
 		while (_r_obj_enumhashtablepointer (apps_table, &ptr_app, NULL, &enum_key))
 		{
-			if (!ptr_app->hash || !ptr_app->real_path || !_app_isappvalidbinary (ptr_app->type, ptr_app->real_path))
+			if (!ptr_app->hash || !_app_isappvalidbinary (ptr_app->type, ptr_app->real_path))
 				continue;
 
 			if (!_app_isappused (ptr_app, FALSE))
@@ -1819,7 +1816,7 @@ VOID NTAPI _app_queuefileinformation (
 
 	if (!NT_SUCCESS (status))
 	{
-		if (status != STATUS_OBJECT_NAME_NOT_FOUND && status != STATUS_FILE_IS_A_DIRECTORY && status != STATUS_ACCESS_DENIED)
+		if (status != STATUS_OBJECT_NAME_NOT_FOUND && status != STATUS_OBJECT_PATH_NOT_FOUND && status != STATUS_ACCESS_DENIED)
 			_r_log (LOG_LEVEL_ERROR, NULL, L"_r_fs_createfile", status, ptr_app_info->path->buffer);
 
 		return;
diff --git a/src/helper.h b/src/helper.h
index ac8ae7a3..13f389e3 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -126,7 +126,7 @@ BOOLEAN _app_isappsigned (
 
 BOOLEAN _app_isappvalidbinary (
 	_In_ ENUM_TYPE_DATA type,
-	_In_ PR_STRING path
+	_In_opt_ PR_STRING path
 );
 
 BOOLEAN _app_isappvalidpath (
diff --git a/src/icons.c b/src/icons.c
index 64ab6b14..ac55e788 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 (!ptr_app->real_path || is_iconshidded || !_app_isappvalidbinary (ptr_app->type, ptr_app->real_path))
+	if (is_iconshidded || !_app_isappvalidbinary (ptr_app->type, ptr_app->real_path))
 	{
 		hicon = _app_icons_getdefaulttype_hicon (ptr_app->type, icon_info);