test

Author: PolarGoose

src/DOpusScriptingExtensions/DOpusScriptingExtensions.idl

@@ -66,10 +66,14 @@ interface IUCharDet : IDispatch
 };
 
 [object, uuid(D64C510E-343B-46EE-97B8-C42D195705DE), dual, nonextensible, pointer_default(unique)]
-interface ILockingProcess : IDispatch
+interface IProcessInfo : IDispatch
 {
   [propget, id(1)] HRESULT Pid([out, retval] UINT* val);
   [propget, id(2)] HRESULT ExecutablePath([out, retval] BSTR* val);
+  [propget, id(3)] HRESULT DomainName([out, retval] BSTR* val);
+  [propget, id(4)] HRESULT UserName([out, retval] BSTR* val);
+  [propget, id(5)] HRESULT LockedFiles([out, retval] BSTR* val);
+  [propget, id(5)] HRESULT Modules([out, retval] BSTR* val);
 };
 
 [object, uuid(6ACCC77B-D411-48C1-B8EF-6BBC5555D1E0), dual, nonextensible, pointer_default(unique)]

src/DOpusScriptingExtensions/pch.h

@@ -36,3 +36,4 @@
 #include <magic.h>
 #include <MediaInfo/MediaInfo.h>
 #include <uchardet/uchardet.h>
+#include <CsLibGuarded/cs_lock_guards.h>

src/ProcessHandlesService/LockedFilesProvider.h

@@ -82,7 +82,7 @@ class LockedFilesProvider final : boost::noncopyable {
 
     auto processFullName = GetProcessFullName(openedProcess.get());
     if (processFullName) {
-      processInfo.set_executable_full_name(ToUtf8(*processFullName));
+      processInfo.set_executable_path(ToUtf8(*processFullName));
     }
 
     auto userAndDomainName = GetUserAndDomainName(openedProcess.get());
@@ -218,7 +218,19 @@ class LockedFilesProvider final : boost::noncopyable {
         continue;
       }
 
-      return std::wstring(buffer.get(), size);
+      std::wstring_view path(buffer.get(), size);
+
+      // Some path contain '\\?\' at the beginning.
+      // Remove it to convert a path like '\\?\C:\path' to 'C:\path'
+      if (path.size() >= 7 &&
+          path.starts_with(LR"(\\?\)") &&
+          ((path[4] >= L'A' && path[4] <= L'Z') || (path[4] >= L'a' && path[4] <= L'z')) &&
+          path[5] == L':' &&
+          path[6] == L'\\') {
+        return std::wstring(path.substr(4));
+      }
+
+      return std::wstring(path);
     }
   }
 };

src/Shared/ProcessHandlesService.proto

@@ -6,7 +6,7 @@ import "google/protobuf/empty.proto";
 
 message ProcessInfo {
   uint64 process_id = 1;
-  optional string executable_full_name = 2;
+  optional string executable_path = 2;
   optional string domain_name = 3;
   optional string user_name = 4;
   repeated string locked_files = 5;

src/UnitTest/LockedFilesProviderTest.cpp

@@ -44,8 +44,10 @@ TEST_CASE("ProcessHandlesServiceGrpcServer test") {
   REQUIRE(response.process_infos_size() > 0);
   REQUIRE(response.process_infos().contains(4)); // Contains "System" process
 
+  std::cout << response.DebugString() << std::endl;
+
   AssertContainsProcess(response,
-    [](const ProcessHandlesService::ProcessInfo& info) { return info.executable_full_name() == "C:\\Windows\\System32\\backgroundTaskHost.exe"; },
+    [](const ProcessHandlesService::ProcessInfo& info) { return info.executable_path() == "C:\\Windows\\System32\\backgroundTaskHost.exe"; },
     "Should have process 'C:\\Windows\\System32\\backgroundTaskHost.exe'");
 
   AssertContainsProcess(response,

vcpkg.json

@@ -27,6 +27,7 @@
     "grpc",
     "abseil",
     "spdlog",
+    "libguarded",
     "doctest"
   ]
 }