From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 23 Oct 2018 12:03:00 +0000 (-0700)
Subject: bpo-34980: P/Invoke QueryFullProcessImageName to get process names (GH-9901)
X-Git-Tag: v3.7.2rc1~241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a253dcd97fa669b8615476b287ef4dd0a935014;p=thirdparty%2FPython%2Fcpython.git

bpo-34980: P/Invoke QueryFullProcessImageName to get process names (GH-9901)

(cherry picked from commit fa5329424f4206630c34f75629fa78738db647f0)

Co-authored-by: Jeremy Kloth <jeremy.kloth@gmail.com>
---

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 7016130b6fe8..6d36977456e0 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -109,19 +109,34 @@
       <FileName Required="true" />
     </ParameterGroup>
     <Task>
-      <Code Type="Fragment" Language="cs">
+      <Using Namespace="System.Diagnostics"/>
+      <Using Namespace="System.IO"/>
+      <Using Namespace="System.Runtime.InteropServices"/>
+      <Using Namespace="System.Text"/>
+      <Code Type="Method" Language="cs">
 <![CDATA[
-string fullPath = System.IO.Path.GetFullPath(FileName);
-Log.LogMessage("Looking for " + fullPath, MessageImportance.Normal);
-foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses()) {
-    try {
-        Log.LogMessage("Found running process: " + p.MainModule.FileName, MessageImportance.Low);
-        if (fullPath.Equals(System.IO.Path.GetFullPath(p.MainModule.FileName), StringComparison.OrdinalIgnoreCase)) {
-            Log.LogMessage("Terminating " + p.MainModule.FileName, MessageImportance.High);
-            p.Kill();
+[DllImport("kernel32.dll", SetLastError=true, CharSet=CharSet.Unicode)]
+public static extern bool QueryFullProcessImageName([In]IntPtr hProcess, [In]int dwFlags,
+                                                    [Out]StringBuilder lpExeName, ref int lpdwSize);
+public override bool Execute() {
+    string fullPath = Path.GetFullPath(FileName);
+    Log.LogMessage("Looking for " + fullPath, MessageImportance.Normal);
+    foreach (Process p in Process.GetProcesses()) {
+        try {
+            int pathLength = 32768;
+            StringBuilder pathBuilder = new StringBuilder(pathLength);
+            if (QueryFullProcessImageName(p.Handle, 0, pathBuilder, ref pathLength)) {
+                string exeName = Path.GetFullPath(pathBuilder.ToString());
+                Log.LogMessage("Found running process: " + exeName, MessageImportance.Low);
+                if (fullPath.Equals(exeName, StringComparison.OrdinalIgnoreCase)) {
+                    Log.LogMessage("Terminating " + exeName, MessageImportance.High);
+                    p.Kill();
+                }
+            }
+        } catch {
         }
-    } catch {
     }
+    return true;
 }
 ]]>
       </Code>