Merge pull request Jack251970#77 from LanYun2022/fix

修复使用VBScript实现的右键功能在Windows11失效的问题

Author: Jack251970

ContextMenuManager/Controls/ShellExecuteDialog.cs

@@ -29,14 +29,37 @@ protected override bool RunDialog(IntPtr hwndOwner)
 
         public static string GetCommand(string fileName, string arguments, string verb, int windowStyle, string directory = null)
         {
-            arguments = arguments.Replace("\"", "\"\"");
             if (directory == null)
             {
                 ObjectPath.GetFullFilePath(fileName, out var filePath);
                 directory = Path.GetDirectoryName(filePath);
             }
-            return "mshta vbscript:createobject(\"shell.application\").shellexecute" +
-                $"(\"{fileName}\",\"{arguments}\",\"{directory}\",\"{verb}\",{windowStyle})(close)";
+
+            if (Environment.OSVersion.Version.Major >= 10)
+            {
+                string winStyleStr;
+                switch (windowStyle)
+                {
+                    case 0: winStyleStr = "Hidden"; break;
+                    case 1: winStyleStr = "Normal"; break;
+                    case 2: winStyleStr = "Minimized"; break;
+                    case 3: winStyleStr = "Maximized"; break;
+                    default: winStyleStr = "Normal"; break;
+                }
+
+                string psFileName = "'" + fileName.Replace("'", "''") + "'";
+                string psDir = string.IsNullOrEmpty(directory) ? "$null" : "'" + directory.Replace("'", "''") + "'";
+                string psVerb = "'" + verb.Replace("'", "''") + "'";
+                string psArgs = "'" + arguments.Replace("'", "''") + "'";
+
+                return $"powershell -WindowStyle Hidden -Command \"Start-Process -FilePath {psFileName} -ArgumentList {psArgs} -WorkingDirectory {psDir} -Verb {psVerb} -WindowStyle {winStyleStr}\"";
+            }
+            else
+            {
+                arguments = arguments.Replace("\"", "\"\"");
+                return "mshta vbscript:createobject(\"shell.application\").shellexecute" +
+                    $"(\"{fileName}\",\"{arguments}\",\"{directory}\",\"{verb}\",{windowStyle})(close)";
+            }
         }
 
         private sealed class ShellExecuteForm : RForm

ContextMenuManager/Methods/ObjectPath.cs

@@ -1,4 +1,4 @@
-using BluePointLilac.Methods;
+using BluePointLilac.Methods;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
@@ -13,6 +13,8 @@ internal static class ObjectPath
         public enum PathType { File, Directory, Registry }
         private const string RegAppPath = @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths";
         private const string ShellExecuteCommand = "mshta vbscript:createobject(\"shell.application\").shellexecute(\"";
+        private const string PowerShellCommandPrefix = "powershell -WindowStyle Hidden -Command \"Start-Process";
+
 
         private static readonly char[] IllegalChars = { '/', '*', '?', '\"', '<', '>', '|' };
         private static readonly List<string> IgnoreCommandParts = new() { "", "%1", "%v" };
@@ -76,6 +78,24 @@ public static string ExtractFilePath(string command)
                         }
                     }
                 }
+                else if (partCmd.StartsWith(PowerShellCommandPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    int idx = partCmd.IndexOf("-FilePath '", StringComparison.OrdinalIgnoreCase);
+                    if (idx != -1)
+                    {
+                        int start = idx + 11;
+                        int end = partCmd.IndexOf("'", start);
+                        if (end != -1)
+                        {
+                            var fileName = partCmd.Substring(start, end - start).Replace("''", "'");
+                            if (GetFullFilePath(fileName, out filePath))
+                            {
+                                FilePathDic.Add(command, filePath);
+                                return filePath;
+                            }
+                        }
+                    }
+                }
 
                 var strs = Array.FindAll(partCmd.Split(IllegalChars), str
                     => IgnoreCommandParts.Any(part => !part.Equals(str.Trim()))).Reverse().ToArray();

ContextMenuManager/Properties/Resources/Texts/EnhanceMenusDic.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--此文件为常用右键菜单字典, 可为此字典添加多语言翻译，添加一个Culture子项并设置为en-US、ja-JP等即可
 Tip属性为鼠标悬浮在开关上时的提示信息，从每个Item节点开始, 子元素Value表示该项的注册表键值，目前仅支持REG_SZ、REG_DWORD、REG_EXPAND_SZ、REG_BINARY的键值类型，
 子元素SubKey的所有子元素是该项的子项，项名即为元素名; 每一Item项和SubKey的所有子元素的属性Default为该注册表项默认值，不放在Value\REG_SZ元素里面是为了防止与可能存在的键名为Default的键产生冲突
@@ -792,6 +792,7 @@ Tip属性为鼠标悬浮在开关上时的提示信息，从每个Item节点开
         </Value>
       </Item>
       <Item KeyName='CopyAsPath'>
+        <OSVersion Compare="&lt;">10.0</OSVersion>
         <Tip Value='系统原生菜单项需按住Shift显示,&#x000A;此项可以直接显示, 路径不带双引号'/>
         <Tip Value='The system raw lettuce item needs to hold down Shift display,&#x000A;this item can be displayed directly, path without double quotation marks'>
           <Culture>en-US</Culture>
@@ -804,6 +805,20 @@ Tip属性为鼠标悬浮在开关上时的提示信息，从每个Item节点开
           <Command Default='mshta vbscript:clipboarddata.setdata("text","%1")(close)'/>
         </SubKey>
       </Item>
+      <Item KeyName='CopyAsPath'>
+        <OSVersion Compare="&gt;=">10.0</OSVersion>
+        <Tip Value='系统原生菜单项需按住Shift显示,&#x000A;此项可以直接显示, 路径不带双引号'/>
+        <Tip Value='The system raw lettuce item needs to hold down Shift display,&#x000A;this item can be displayed directly, path without double quotation marks'>
+          <Culture>en-US</Culture>
+        </Tip>
+        <Value>
+          <!--复制路径-->
+          <REG_SZ MUIVerb='@shell32.dll,-30329' Icon='imageres.dll,-5302'/>
+        </Value>
+        <SubKey>
+          <Command Default='powershell -WindowStyle Hidden -Command "Set-Clipboard -Value $args[0]" "%1"'/>
+        </SubKey>
+      </Item>
       <Item KeyName='Windows.CopyAsPath'>
         <OSVersion Compare="&gt;=">6.2</OSVersion>
         <Tip Value='系统原生菜单项需按住Shift显示,&#x000A;此项可以直接显示, 路径带双引号'/>