summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdonais Romero González <[email protected]>2018-11-02 15:26:28 -0700
committerGitHub <[email protected]>2018-11-02 15:26:28 -0700
commit1a37d4aff3ce9d75306d176c3bcfc8343eab63ef (patch)
tree5fd8bcef3744c01d12f6ba375b09eab4099661a3
parentdcd3c85cb1caa3445460bb6f83b6abc8a139091a (diff)
Enforce Control Flow Guard disabling on unsupported scenarios (#309)
-rw-r--r--input/layout/fe_kbds/jpn/101/kbd101.vcxproj4
-rw-r--r--input/layout/fe_kbds/jpn/106/kbd106.vcxproj4
-rw-r--r--usb/usbview/usbview.vcxproj1
3 files changed, 9 insertions, 0 deletions
diff --git a/input/layout/fe_kbds/jpn/101/kbd101.vcxproj b/input/layout/fe_kbds/jpn/101/kbd101.vcxproj
index ad201083..0c56f44c 100644
--- a/input/layout/fe_kbds/jpn/101/kbd101.vcxproj
+++ b/input/layout/fe_kbds/jpn/101/kbd101.vcxproj
@@ -169,6 +169,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
@@ -196,6 +197,7 @@
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
@@ -222,6 +224,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
@@ -249,6 +252,7 @@
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
diff --git a/input/layout/fe_kbds/jpn/106/kbd106.vcxproj b/input/layout/fe_kbds/jpn/106/kbd106.vcxproj
index 133ef341..0d14c18d 100644
--- a/input/layout/fe_kbds/jpn/106/kbd106.vcxproj
+++ b/input/layout/fe_kbds/jpn/106/kbd106.vcxproj
@@ -169,6 +169,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
@@ -196,6 +197,7 @@
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
@@ -222,6 +224,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
@@ -249,6 +252,7 @@
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<ExceptionHandling>
</ExceptionHandling>
+ <ControlFlowGuard>false</ControlFlowGuard>
</ClCompile>
<Midl>
<PreprocessorDefinitions>%(PreprocessorDefinitions);FE_SB;FE_IME</PreprocessorDefinitions>
diff --git a/usb/usbview/usbview.vcxproj b/usb/usbview/usbview.vcxproj
index 556eb823..92bf7f40 100644
--- a/usb/usbview/usbview.vcxproj
+++ b/usb/usbview/usbview.vcxproj
@@ -154,6 +154,7 @@
<ClCompile Include="uvcview.c" />
<ClCompile Include="xmlhelper.cpp">
<CompileAsManaged>true</CompileAsManaged>
+ <ControlFlowGuard>false</ControlFlowGuard>
<BasicRuntimeChecks Condition="'$(UseDebugLibraries)'=='true'">
</BasicRuntimeChecks>
</ClCompile>