Fix token usage

Author: dmex

ProcessHacker/memlists.c

@@ -170,6 +170,12 @@ INT_PTR CALLBACK PhpMemoryListsDlgProc(
     {
     case WM_INITDIALOG:
         {
+            if (NT_SUCCESS(PhOpenProcessToken(NtCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &tokenHandle)))
+            {
+                PhSetTokenPrivilege(tokenHandle, L"SeProfileSingleProcessPrivilege", NULL, SE_PRIVILEGE_ENABLED);
+                NtClose(tokenHandle);
+            }
+
             PhRegisterCallback(&PhProcessesUpdatedEvent, ProcessesUpdatedCallback, NULL, &ProcessesUpdatedRegistration);
             PhpUpdateMemoryListInfo(hwndDlg);
 
@@ -237,9 +243,9 @@ INT_PTR CALLBACK PhpMemoryListsDlgProc(
                                 HANDLE tokenHandle;
                                 MEMORY_COMBINE_INFORMATION_EX combineInfo = { 0 };
 
-                                if (NT_SUCCESS(NtOpenProcessToken(NtCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &tokenHandle)))
+                                if (NT_SUCCESS(PhOpenProcessToken(NtCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &tokenHandle)))
                                 {
-                                    PhSetTokenPrivilege(tokenHandle, SE_PROF_SINGLE_PROCESS_NAME, NULL, SE_PRIVILEGE_ENABLED);
+                                    PhSetTokenPrivilege(tokenHandle, L"SeProfileSingleProcessPrivilege", NULL, SE_PRIVILEGE_ENABLED);
                                     NtClose(tokenHandle);
                                 }
 

ProcessHacker/tokprp.c

@@ -669,7 +669,12 @@ INT_PTR CALLBACK PhpTokenPageProc(
 
                     if (appContainerName)
                     {
-                        SetDlgItemText(hwndDlg, IDC_USER, appContainerName->Buffer);
+                        PPH_STRING packageFamilyName;
+
+                        packageFamilyName = PhConcatStrings2(appContainerName->Buffer, L" (APP_PACKAGE)");
+                        SetDlgItemText(hwndDlg, IDC_USER, packageFamilyName->Buffer);
+
+                        PhDereferenceObject(packageFamilyName);
                         PhDereferenceObject(appContainerName);
                     }
 

phlib/appresolver.c

@@ -167,7 +167,7 @@ PPH_STRING PhGetAppContainerPackageName(
 
     if (SUCCEEDED(AppContainerLookupMoniker_I(AppContainerSid, &packageMonikerName)))
     {
-        packageFamilyName = PhConcatStrings2(packageMonikerName, L" (APP_PACKAGE)");
+        packageFamilyName = PhCreateString(packageMonikerName);
         AppContainerFreeMemory_I(packageMonikerName);
     }
 

phlib/hndlinfo.c

@@ -371,16 +371,10 @@ PPH_STRING PhFormatNativeKeyName(
 
     if (PhBeginInitOnce(&initOnce))
     {
-        HANDLE currentTokenHandle;
         PTOKEN_USER tokenUser;
         PPH_STRING stringSid = NULL;
 
-        currentTokenHandle = PhGetOwnTokenAttributes().TokenHandle;
-
-        if (currentTokenHandle && NT_SUCCESS(PhGetTokenUser(
-            currentTokenHandle,
-            &tokenUser
-            )))
+        if (NT_SUCCESS(PhGetTokenUser(PhGetOwnTokenAttributes().TokenHandle, &tokenUser)))
         {
             stringSid = PhSidToStringSid(tokenUser->User.Sid);
             PhFree(tokenUser);

phlib/native.c

@@ -74,17 +74,24 @@ PH_TOKEN_ATTRIBUTES PhGetOwnTokenAttributes(
     )
 {
     static PH_INITONCE initOnce = PH_INITONCE_INIT;
-    static PH_TOKEN_ATTRIBUTES attributes;
+    static PH_TOKEN_ATTRIBUTES attributes = { 0 };
 
     if (PhBeginInitOnce(&initOnce))
     {
         BOOLEAN elevated = TRUE;
         TOKEN_ELEVATION_TYPE elevationType = TokenElevationTypeFull;
 
         if (WindowsVersion >= WINDOWS_8)
-            attributes.TokenHandle = NtCurrentProcessToken();           
+        {
+            attributes.TokenHandle = NtCurrentProcessToken();
+        }
         else
-            PhOpenProcessToken(NtCurrentProcess(), TOKEN_QUERY, &attributes.TokenHandle);
+        {
+            HANDLE tokenHandle;
+
+            if (NT_SUCCESS(PhOpenProcessToken(NtCurrentProcess(), TOKEN_QUERY, &tokenHandle)))
+                attributes.TokenHandle = tokenHandle;
+        }
 
         if (attributes.TokenHandle)
         {
@@ -312,14 +319,6 @@ NTSTATUS PhOpenProcessToken(
 {
     NTSTATUS status;
 
-#ifdef _DEBUG
-    if (WINDOWS_HAS_IMMERSIVE && ProcessHandle == NtCurrentProcess())
-    {
-        *TokenHandle = NtCurrentProcessToken();
-        return STATUS_SUCCESS;
-    }
-#endif
-
     if (KphIsVerified() && (DesiredAccess & KPH_TOKEN_READ_ACCESS) == DesiredAccess)
     {
         status = KphOpenProcessToken(

plugins/DotNetTools/counters.c

@@ -557,7 +557,7 @@ BOOLEAN OpenDotNetPublicControlBlock_V4(
 
     if (WINDOWS_HAS_IMMERSIVE && IsImmersive)
     {
-        if (NT_SUCCESS(NtOpenProcessToken(&tokenHandle, TOKEN_QUERY, ProcessHandle)))
+        if (NT_SUCCESS(NtOpenProcessToken(ProcessHandle, TOKEN_QUERY, &tokenHandle)))
         {
             ULONG returnLength = 0;