Improve startup performance, Improve installer mutant handling, Improve single instance (2/2)

Author: dmex

ProcessHacker/main.c

@@ -252,17 +252,26 @@ INT WINAPI wWinMain(
         HANDLE mutantHandle;
         OBJECT_ATTRIBUTES oa;
         UNICODE_STRING mutantName;
+        PPH_STRING objectName;
+        PH_FORMAT format[2];
+
+        PhInitFormatS(&format[0], L"PhMutant_");
+        PhInitFormatU(&format[1], HandleToUlong(NtCurrentProcessId()));
+
+        objectName = PhFormat(format, 2, 16);
+        PhStringRefToUnicodeString(&objectName->sr, &mutantName);
 
-        RtlInitUnicodeString(&mutantName, L"\\BaseNamedObjects\\ProcessHackerMutant");
         InitializeObjectAttributes(
             &oa,
             &mutantName,
-            0,
-            NULL,
+            OBJ_CASE_INSENSITIVE,
+            PhGetNamespaceHandle(),
             NULL
             );
 
         NtCreateMutant(&mutantHandle, MUTANT_ALL_ACCESS, &oa, FALSE);
+
+        PhDereferenceObject(objectName);
     }
 
     // Set priority.
@@ -418,26 +427,48 @@ VOID PhUnregisterMessageLoopFilter(
     PhFree(FilterEntry);
 }
 
-VOID PhActivatePreviousInstance(
-    VOID
+static BOOLEAN NTAPI PhpPreviousInstancesCallback(
+    _In_ PPH_STRINGREF Name,
+    _In_ PPH_STRINGREF TypeName,
+    _In_opt_ PVOID Context
     )
 {
-    HWND hwnd;
-
-    hwnd = FindWindow(PH_MAINWND_CLASSNAME, NULL);
+    ULONG64 processId64;
+    PH_STRINGREF firstPart;
+    PH_STRINGREF secondPart;
 
-    if (hwnd)
+    if (
+        PhStartsWithStringRef2(Name, L"PhMutant_", TRUE) &&
+        PhSplitStringRefAtChar(Name, L'_', &firstPart, &secondPart) &&
+        PhStringToInteger64(&secondPart, 10, &processId64)
+        )
     {
-        ULONG_PTR result;
+        HWND hwnd;
 
-        SendMessageTimeout(hwnd, WM_PH_ACTIVATE, PhStartupParameters.SelectPid, 0, SMTO_BLOCK, 5000, &result);
+        hwnd = PhGetProcessMainWindow((HANDLE)processId64, NULL);
 
-        if (result == PH_ACTIVATE_REPLY)
+        if (hwnd)
         {
-            SetForegroundWindow(hwnd);
-            RtlExitUserProcess(STATUS_SUCCESS);
+            ULONG_PTR result;
+
+            SendMessageTimeout(hwnd, WM_PH_ACTIVATE, PhStartupParameters.SelectPid, 0, SMTO_BLOCK, 5000, &result);
+
+            if (result == PH_ACTIVATE_REPLY)
+            {
+                SetForegroundWindow(hwnd);
+                RtlExitUserProcess(STATUS_SUCCESS);
+            }
         }
     }
+
+    return TRUE;
+}
+
+VOID PhActivatePreviousInstance(
+    VOID
+    )
+{
+    PhEnumDirectoryObjects(PhGetNamespaceHandle(), PhpPreviousInstancesCallback, NULL);
 }
 
 VOID PhInitializeCommonControls(

phlib/include/phutil.h

@@ -1059,6 +1059,41 @@ PhParseCommandLineFuzzy(
     _Out_opt_ PPH_STRING *FullFileName
     );
 
+FORCEINLINE
+HANDLE 
+NTAPI
+PhGetNamespaceHandle(
+    VOID
+    )
+{
+    static PH_INITONCE initOnce = PH_INITONCE_INIT;
+    static UNICODE_STRING namespacePathUs = RTL_CONSTANT_STRING(L"\\BaseNamedObjects\\ProcessHacker");
+    static HANDLE directory = NULL;
+
+    if (PhBeginInitOnce(&initOnce))
+    {
+        OBJECT_ATTRIBUTES objectAttributes;
+
+        InitializeObjectAttributes(
+            &objectAttributes,
+            &namespacePathUs,
+            OBJ_OPENIF,
+            NULL,
+            NULL
+            );
+
+        NtCreateDirectoryObject(
+            &directory,
+            MAXIMUM_ALLOWED,
+            &objectAttributes
+            );
+
+        PhEndInitOnce(&initOnce);
+    }
+
+    return directory;
+}
+
 #ifdef __cplusplus
 }
 #endif