Merge remote-tracking branch 'refs/remotes/origin/master' into tracert

Author: dmex

ProcessHacker/procmtgn.c

@@ -208,6 +208,17 @@ BOOLEAN PhDescribeProcessMitigationPolicy(
 
                 result = TRUE;
             }
+
+            if (data->AllowThreadOptOut)
+            {
+                if (ShortDescription)
+                    *ShortDescription = PhCreateString(L"Dynamic code prohibited (per-thread)");
+
+                if (LongDescription)
+                    *LongDescription = PhCreateString(L"Allows individual threads to opt out of the restrictions on dynamic code generation.\r\n");
+
+                result = TRUE;
+            }
         }
         break;
     case ProcessStrictHandleCheckPolicy:
@@ -351,6 +362,17 @@ BOOLEAN PhDescribeProcessMitigationPolicy(
 
                 result = TRUE;
             }
+
+            if (data->PreferSystem32Images)
+            {
+                if (ShortDescription)
+                    *ShortDescription = PhCreateString(L"Prefer system32 images");
+
+                if (LongDescription)
+                    *LongDescription = PhCreateString(L"Forces images to load from the System32 folder in which Windows is installed first, then from the application directory before the standard DLL search order.\r\n");
+
+                result = TRUE;
+            }
         }
         break;
     default:

ProcessHacker/prpggen.c

@@ -36,7 +36,7 @@
 #include <settings.h>
 
 static PWSTR ProtectedSignerStrings[] =
-    { L"", L" (Authenticode)", L" (CodeGen)", L" (Antimalware)", L" (Lsa)", L" (Windows)", L" (WinTcb)" };
+    { L"", L" (Authenticode)", L" (CodeGen)", L" (Antimalware)", L" (Lsa)", L" (Windows)", L" (WinTcb)", L" (WinSystem)" };
 
 NTSTATUS PhpProcessGeneralOpenProcess(
     _Out_ PHANDLE Handle,

phnt/include/ntpsapi.h

@@ -603,6 +603,7 @@ typedef enum _PS_PROTECTED_SIGNER
     PsProtectedSignerLsa,
     PsProtectedSignerWindows,
     PsProtectedSignerWinTcb,
+    PsProtectedSignerWinSystem,
     PsProtectedSignerMax
 } PS_PROTECTED_SIGNER;