Add function to retrieve path and use it to only return file name rather than full path

Author: JohnMcPMS

src/AppInstallerSharedLib/Filesystem.cpp

@@ -497,4 +497,16 @@ namespace AppInstaller::Filesystem
 
         return result;
     }
+
+    std::filesystem::path GetExecutablePathForProcess(HANDLE process)
+    {
+        wil::unique_cotaskmem_string imageName = nullptr;
+        if (SUCCEEDED(wil::QueryFullProcessImageNameW(process, 0, imageName)) &&
+            (imageName.get() != nullptr))
+        {
+            return imageName.get();
+        }
+
+        return {};
+    }
 }

src/AppInstallerSharedLib/Public/winget/Filesystem.h

@@ -119,4 +119,7 @@ namespace AppInstaller::Filesystem
     // Gets the PathDetails used for the given path.
     // This is exposed primarily to allow for testing, GetPathTo should be preferred.
     PathDetails GetPathDetailsFor(PathName path, bool forDisplay = false);
+
+    // Gets the path to the executable for the given process id.
+    std::filesystem::path GetExecutablePathForProcess(HANDLE process);
 }

src/Microsoft.Management.Deployment/Helpers.cpp

@@ -6,6 +6,7 @@
 #include <winrt/Windows.Security.Authorization.AppCapabilityAccess.h>
 #include <appmodel.h>
 #include <Helpers.h>
+#include <winget/Filesystem.h>
 #include <winget/Security.h>
 #include <AppInstallerRuntime.h>
 
@@ -144,11 +145,10 @@ namespace winrt::Microsoft::Management::Deployment::implementation
             }
 
             // if the caller doesn't have an AppUserModelID then fall back to the executable name
-            wil::unique_cotaskmem_string imageName = nullptr;
-            if (SUCCEEDED(wil::QueryFullProcessImageNameW(processHandle.get(), 0, imageName)) &&
-                (imageName.get() != nullptr))
+            std::filesystem::path executablePath = AppInstaller::Filesystem::GetExecutablePathForProcess(processHandle.get());
+            if (executablePath.has_filename())
             {
-                return imageName.get();
+                return executablePath.filename();
             }
         }