From 39b750e821488cad8e1f9fd27716e586fba3ae40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= Date: Mon, 24 May 2021 12:34:59 +0800 Subject: [PATCH 01/13] Avoid AppxManifest.xml leak release Com stream Object immediately Co-Authored-By: Andrey Nekrasov <1828123+yuyoyuppe@users.noreply.github.com> --- Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs index 89d6dcc7d..e53fb7a52 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs @@ -17,6 +17,7 @@ using Flow.Launcher.Infrastructure; using Flow.Launcher.Plugin.Program.Logger; using Rect = System.Windows.Rect; using Flow.Launcher.Plugin.SharedModels; +using Flow.Launcher.Infrastructure.Logger; namespace Flow.Launcher.Plugin.Program.Programs { @@ -81,6 +82,11 @@ namespace Flow.Launcher.Plugin.Program.Programs Apps = new List().ToArray(); } + + if (Marshal.ReleaseComObject(stream) > 0) + { + Log.Error("Flow.Launcher.Plugin.Program.Programs.UWP", "AppxManifest.xml was leaked"); + } } From 89757de04eab1bca5f5d6c2097d0377e73c2370f Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 24 May 2021 21:04:50 +1000 Subject: [PATCH 02/13] version bump Program plugin --- Plugins/Flow.Launcher.Plugin.Program/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/plugin.json b/Plugins/Flow.Launcher.Plugin.Program/plugin.json index 2d335b77d..79044f08a 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Program/plugin.json @@ -4,7 +4,7 @@ "Name": "Program", "Description": "Search programs in Flow.Launcher", "Author": "qianlifeng", - "Version": "1.5.0", + "Version": "1.5.1", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll", From d024f8eff4c6ffdd3a001bf3c202e8f29e01bdb9 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 25 May 2021 22:20:22 +1000 Subject: [PATCH 03/13] fix loading when no action keywords present for a plugin in userdata --- Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs b/Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs index 29bc11480..dd768afb4 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs @@ -30,6 +30,11 @@ namespace Flow.Launcher.Infrastructure.UserSettings metadata.ActionKeywords = settings.ActionKeywords; metadata.ActionKeyword = settings.ActionKeywords[0]; } + else + { + metadata.ActionKeywords = new List(); + metadata.ActionKeyword = string.Empty; + } metadata.Disabled = settings.Disabled; metadata.Priority = settings.Priority; } From e06cf9cf6fada1a7bc6645d4d2d9652eccc08ae3 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 26 May 2021 08:38:55 +1000 Subject: [PATCH 04/13] add tool tip to explain functionality --- Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml | 3 +++ .../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml | 6 +++--- Plugins/Flow.Launcher.Plugin.Program/plugin.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml index ce84aa65b..e00534367 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml @@ -13,8 +13,11 @@ Reindex Indexing Index Start Menu + When enabled, Flow will load programs from the start menu Index Registry + When enabled, Flow will load programs from the registry Enable Program Description + Disabling this will also stop Flow from searching via the program desciption Suffixes Max Depth diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml index 45f2a609d..8712cdb83 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml @@ -16,9 +16,9 @@ - - - + + +