Fix commit 3c1cb4f

Author: dmex

ProcessHacker/main.c

@@ -277,9 +277,17 @@ INT WINAPI wWinMain(
 
     // Create a mutant for the installer.
     {
-        static UNICODE_STRING objectNameUs = RTL_CONSTANT_STRING(L"PhMutant");  
+        HANDLE mutantHandle;
+        PPH_STRING objectName;
         OBJECT_ATTRIBUTES objectAttributes;
-        HANDLE objectHandle;
+        UNICODE_STRING objectNameUs;
+        PH_FORMAT format[2];
+
+        PhInitFormatS(&format[0], L"PhMutant_");
+        PhInitFormatU(&format[1], HandleToUlong(NtCurrentProcessId()));
+
+        objectName = PhFormat(format, 2, 16);
+        PhStringRefToUnicodeString(&objectName->sr, &objectNameUs);
 
         InitializeObjectAttributes(
             &objectAttributes,
@@ -289,7 +297,14 @@ INT WINAPI wWinMain(
             NULL
             );
 
-        NtCreateMutant(&objectHandle, MUTANT_ALL_ACCESS, &objectAttributes, TRUE);
+        NtCreateMutant(
+            &mutantHandle, 
+            MUTANT_QUERY_STATE,
+            &objectAttributes, 
+            TRUE
+            );
+
+        PhDereferenceObject(objectName);
     }
 
     // Set the default priority.
@@ -451,13 +466,13 @@ static BOOLEAN NTAPI PhpPreviousInstancesCallback(
     _In_opt_ PVOID Context
     )
 {
-    static PH_STRINGREF objectNameSr = PH_STRINGREF_INIT(L"PhMutant");
+    static PH_STRINGREF objectNameSr = PH_STRINGREF_INIT(L"PhMutant_");
     HANDLE objectHandle;
     UNICODE_STRING objectNameUs;
     OBJECT_ATTRIBUTES objectAttributes;
     MUTANT_OWNER_INFORMATION objectInfo;
 
-    if (!PhEqualStringRef(Name, &objectNameSr, FALSE))
+    if (!PhStartsWithStringRef(Name, &objectNameSr, FALSE))
         return TRUE;
     if (!PhStringRefToUnicodeString(Name, &objectNameUs))
         return TRUE;

tools/CustomSetupTool/CustomSetupTool/appsup.c

@@ -437,9 +437,9 @@ static BOOLEAN NTAPI PhpPreviousInstancesCallback(
     OBJECT_ATTRIBUTES objectAttributes;
     MUTANT_OWNER_INFORMATION objectInfo;
 
-    if (!PhEqualStringRef2(Name, L"PhMutant", TRUE) &&
-        !PhEqualStringRef2(Name, L"PhSetupMutant", TRUE) &&
-        !PhEqualStringRef2(Name, L"PeViewerMutant", TRUE))
+    if (!PhStartsWithStringRef2(Name, L"PhMutant_", TRUE) &&
+        !PhStartsWithStringRef2(Name, L"PhSetupMutant_", TRUE) &&
+        !PhStartsWithStringRef2(Name, L"PeViewerMutant_", TRUE))
     {
         return TRUE;
     }

tools/CustomSetupTool/CustomSetupTool/main.c

@@ -217,9 +217,17 @@ VOID SetupInitializeMutant(
     VOID
     )
 {
-    static UNICODE_STRING objectNameUs = RTL_CONSTANT_STRING(L"PhSetupMutant");
+    HANDLE mutantHandle;
+    PPH_STRING objectName;
     OBJECT_ATTRIBUTES objectAttributes;
-    HANDLE objectHandle;
+    UNICODE_STRING objectNameUs;
+    PH_FORMAT format[2];
+
+    PhInitFormatS(&format[0], L"PhSetupMutant_");
+    PhInitFormatU(&format[1], HandleToUlong(NtCurrentProcessId()));
+
+    objectName = PhFormat(format, 2, 16);
+    PhStringRefToUnicodeString(&objectName->sr, &objectNameUs);
 
     InitializeObjectAttributes(
         &objectAttributes,
@@ -229,7 +237,14 @@ VOID SetupInitializeMutant(
         NULL
         );
 
-    NtCreateMutant(&objectHandle, MUTANT_ALL_ACCESS, &objectAttributes, TRUE);
+    NtCreateMutant(
+        &mutantHandle,
+        MUTANT_QUERY_STATE,
+        &objectAttributes,
+        TRUE
+        );
+
+    PhDereferenceObject(objectName);
 }
 
 INT WINAPI wWinMain(

tools/peview/main.c

@@ -57,9 +57,17 @@ INT WINAPI wWinMain(
 
     // Create a mutant for the installer.
     {
-        static UNICODE_STRING objectNameUs = RTL_CONSTANT_STRING(L"PeViewerMutant");
+        HANDLE mutantHandle;
+        PPH_STRING objectName;
         OBJECT_ATTRIBUTES objectAttributes;
-        HANDLE objectHandle;
+        UNICODE_STRING objectNameUs;
+        PH_FORMAT format[2];
+
+        PhInitFormatS(&format[0], L"PeViewerMutant_");
+        PhInitFormatU(&format[1], HandleToUlong(NtCurrentProcessId()));
+
+        objectName = PhFormat(format, 2, 16);
+        PhStringRefToUnicodeString(&objectName->sr, &objectNameUs);
 
         InitializeObjectAttributes(
             &objectAttributes,
@@ -69,7 +77,14 @@ INT WINAPI wWinMain(
             NULL
             );
 
-        NtCreateMutant(&objectHandle, MUTANT_ALL_ACCESS, &objectAttributes, TRUE);
+        NtCreateMutant(
+            &mutantHandle,
+            MUTANT_QUERY_STATE,
+            &objectAttributes,
+            TRUE
+            );
+
+        PhDereferenceObject(objectName);
     }
 
     PhGuiSupportInitialization();