The whitespace was inconsistent in this area, so I replaced the tabs
with spaces.

-tom
From eeaca371370ce9e4996a1a4c6a598205866a2c44 Mon Sep 17 00:00:00 2001
From: Tom Ritter <t...@ritter.vg>
Date: Mon, 22 Jan 2018 20:19:19 -0600
Subject: [PATCH 1/2] Fix whitespace near the PROCESS_MITIGATION structs

---
 mingw-w64-headers/include/winnt.h | 60 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/mingw-w64-headers/include/winnt.h 
b/mingw-w64-headers/include/winnt.h
index c298d532..8aee9593 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -4082,57 +4082,57 @@ __buildmemorybarrier()
 
     typedef struct _PROCESS_MITIGATION_ASLR_POLICY {
       __C89_NAMELESS union {
-       DWORD Flags;
-       __C89_NAMELESS struct {
-         DWORD EnableBottomUpRandomization : 1;
-         DWORD EnableForceRelocateImages : 1;
-         DWORD EnableHighEntropy : 1;
-         DWORD DisallowStrippedImages : 1;
-         DWORD ReservedFlags : 28;
-       };
+        DWORD Flags;
+        __C89_NAMELESS struct {
+          DWORD EnableBottomUpRandomization : 1;
+          DWORD EnableForceRelocateImages : 1;
+          DWORD EnableHighEntropy : 1;
+          DWORD DisallowStrippedImages : 1;
+          DWORD ReservedFlags : 28;
+        };
       };
     } PROCESS_MITIGATION_ASLR_POLICY,*PPROCESS_MITIGATION_ASLR_POLICY;
 
     typedef struct _PROCESS_MITIGATION_DEP_POLICY {
       __C89_NAMELESS union {
-       DWORD Flags;
-       __C89_NAMELESS struct {
-         DWORD Enable : 1;
-         DWORD DisableAtlThunkEmulation : 1;
-         DWORD ReservedFlags : 30;
-       };
+        DWORD Flags;
+        __C89_NAMELESS struct {
+          DWORD Enable : 1;
+          DWORD DisableAtlThunkEmulation : 1;
+          DWORD ReservedFlags : 30;
+        };
       };
       BOOLEAN Permanent;
     } PROCESS_MITIGATION_DEP_POLICY,*PPROCESS_MITIGATION_DEP_POLICY;
 
     typedef struct _PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY {
       __C89_NAMELESS union {
-       DWORD Flags;
-       __C89_NAMELESS struct {
-         DWORD RaiseExceptionOnInvalidHandleReference : 1;
-         DWORD HandleExceptionsPermanentlyEnabled : 1;
-         DWORD ReservedFlags : 30;
-       };
+        DWORD Flags;
+        __C89_NAMELESS struct {
+          DWORD RaiseExceptionOnInvalidHandleReference : 1;
+          DWORD HandleExceptionsPermanentlyEnabled : 1;
+          DWORD ReservedFlags : 30;
+        };
       };
     } 
PROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY,*PPROCESS_MITIGATION_STRICT_HANDLE_CHECK_POLICY;
 
     typedef struct _PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY {
       __C89_NAMELESS union {
-       DWORD Flags;
-       __C89_NAMELESS struct {
-         DWORD DisallowWin32kSystemCalls : 1;
-         DWORD ReservedFlags : 31;
-       };
+        DWORD Flags;
+        __C89_NAMELESS struct {
+          DWORD DisallowWin32kSystemCalls : 1;
+          DWORD ReservedFlags : 31;
+        };
       };
     } 
PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY,*PPROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY;
 
     typedef struct _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY {
       __C89_NAMELESS union {
-       DWORD Flags;
-       __C89_NAMELESS struct {
-         DWORD DisableExtensionPoints : 1;
-         DWORD ReservedFlags : 31;
-       };
+        DWORD Flags;
+        __C89_NAMELESS struct {
+          DWORD DisableExtensionPoints : 1;
+          DWORD ReservedFlags : 31;
+        };
       };
     } 
PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY,*PPROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY;
 
-- 
2.14.1

From 08b87a434bb67552b0828952376c0a1f925d6ee7 Mon Sep 17 00:00:00 2001
From: Tom Ritter <t...@ritter.vg>
Date: Mon, 22 Jan 2018 20:24:41 -0600
Subject: [PATCH 2/2] Add several Process Mitigation structs

Adds:
 - PROCESS_MITIGATION_FONT_DISABLE_POLICY
 - PROCESS_MITIGATION_IMAGE_LOAD_POLICY
 - PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY
 - PROCESS_MITIGATION_DYNAMIC_CODE_POLICY
 - PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY
---
 mingw-w64-headers/include/winnt.h | 65 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/mingw-w64-headers/include/winnt.h 
b/mingw-w64-headers/include/winnt.h
index 8aee9593..efcd74d0 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -4072,11 +4072,15 @@ __buildmemorybarrier()
     typedef enum _PROCESS_MITIGATION_POLICY {
       ProcessDEPPolicy,
       ProcessASLRPolicy,
-      ProcessReserved1MitigationPolicy,
+      ProcessDynamicCodePolicy,
       ProcessStrictHandleCheckPolicy,
       ProcessSystemCallDisablePolicy,
       ProcessMitigationOptionsMask,
       ProcessExtensionPointDisablePolicy,
+      ProcessControlFlowGuardPolicy,
+      ProcessSignaturePolicy,
+      ProcessFontDisablePolicy,
+      ProcessImageLoadPolicy,
       MaxProcessMitigationPolicy
     } PROCESS_MITIGATION_POLICY,*PPROCESS_MITIGATION_POLICY;
 
@@ -4136,6 +4140,65 @@ __buildmemorybarrier()
       };
     } 
PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY,*PPROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY;
 
+    typedef struct _PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY {
+      __C89_NAMELESS union {
+        DWORD  Flags;
+        __C89_NAMELESS struct {
+          DWORD EnableControlFlowGuard  :1;
+          DWORD EnableExportSuppression  :1;
+          DWORD StrictMode  :1;
+          DWORD ReservedFlags  :29;
+        };
+      };
+    } PROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY, 
*PPROCESS_MITIGATION_CONTROL_FLOW_GUARD_POLICY;
+
+    typedef struct _PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY {
+      __C89_NAMELESS union {
+        DWORD  Flags;
+        __C89_NAMELESS struct {
+          DWORD MicrosoftSignedOnly  :1;
+          DWORD StoreSignedOnly  :1;
+          DWORD MitigationOptIn  :1;
+          DWORD ReservedFlags  :29;
+        };
+      };
+    } PROCESS_MITIGATION_BINARY_SIGNATURE_POLICY, 
*PPROCESS_MITIGATION_BINARY_SIGNATURE_POLICY;
+
+    typedef struct _PROCESS_MITIGATION_DYNAMIC_CODE_POLICY {
+      __C89_NAMELESS union {
+        DWORD  Flags;
+        __C89_NAMELESS struct {
+          DWORD ProhibitDynamicCode  :1;
+          DWORD AllowThreadOptOut  :1;
+          DWORD AllowRemoteDowngrade  :1;
+          DWORD ReservedFlags  :30;
+        };
+      };
+    } PROCESS_MITIGATION_DYNAMIC_CODE_POLICY, 
*PPROCESS_MITIGATION_DYNAMIC_CODE_POLICY;
+
+    typedef struct _PROCESS_MITIGATION_FONT_DISABLE_POLICY {
+      __C89_NAMELESS union {
+        DWORD  Flags;
+        __C89_NAMELESS struct {
+          DWORD DisableNonSystemFonts  :1;
+          DWORD AuditNonSystemFontLoading  :1;
+          DWORD ReservedFlags  :30;
+        };
+      };
+    } PROCESS_MITIGATION_FONT_DISABLE_POLICY, 
*PPROCESS_MITIGATION_FONT_DISABLE_POLICY;
+
+    typedef struct _PROCESS_MITIGATION_IMAGE_LOAD_POLICY {
+      __C89_NAMELESS union {
+        DWORD  Flags;
+        __C89_NAMELESS struct {
+          DWORD NoRemoteImages  :1;
+          DWORD NoLowMandatoryLabelImages  :1;
+          DWORD PreferSystem32Images  :1;
+          DWORD ReservedFlags  :29;
+        };
+      };
+    } PROCESS_MITIGATION_IMAGE_LOAD_POLICY, 
*PPROCESS_MITIGATION_IMAGE_LOAD_POLICY;
+
     typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION {
       LARGE_INTEGER TotalUserTime;
       LARGE_INTEGER TotalKernelTime;
-- 
2.14.1

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to