From 5014090f9dfa7a614844816f319eaf6f31ea0ecf Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 4 Aug 2017 01:46:27 -0400
Subject: [PATCH] Fix PreprocessorDefinitions for ARM AppVeyor error'd with
 "error MSB8022: Compiling Desktop applications for the ARM platform is not
 supported"

---
 .appveyor.yml    |  7 -------
 cryptdll.vcxproj | 17 +++++++++++++++++
 cryptest.vcxproj | 17 +++++++++++++++++
 cryptlib.vcxproj | 18 ++++++++++++++++++
 dlltest.vcxproj  | 17 +++++++++++++++++
 5 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 5277c594..90c14dfd 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,9 +25,6 @@ image:
 
 build: off
 
-# Extra copy gyrations due to broken MSbuild. Run 'make appveyor' to update the vcxproj files. Also see
-# https://stackoverflow.com/questions/45474857/why-does-appveyor-use-vs2010-tools-for-vs2015-image
-
 test_script:
 
 - cmd: >-
@@ -42,10 +39,6 @@ test_script:
 
     cryptest.exe tv all
 
-# Right now, we have a few failures that we don't know how to workaround.
-#  - https://stackoverflow.com/questions/43441273/how-to-run-vcupgrade-before-appveyor-build
-#  - https://stackoverflow.com/questions/43423761/cant-perform-64-bit-testing-under-appveyor
-
 notifications:
   - provider: Email
     to:
diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj
index 73d775bc..66c29151 100644
--- a/cryptdll.vcxproj
+++ b/cryptdll.vcxproj
@@ -12,6 +12,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -20,6 +24,10 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
   <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
@@ -123,6 +131,15 @@
       <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
+  <!-- ARM Configurations -->
+  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
+    <ClCompile>
+      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineARM</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <!-- X64 Configurations -->
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'" Label="X64 Configuration">
     <Link>
diff --git a/cryptest.vcxproj b/cryptest.vcxproj
index 15ab2a5a..c738b877 100644
--- a/cryptest.vcxproj
+++ b/cryptest.vcxproj
@@ -12,6 +12,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -20,6 +24,10 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="DLL-Import Debug|Win32">
       <Configuration>DLL-Import Debug</Configuration>
       <Platform>Win32</Platform>
@@ -177,6 +185,15 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <!-- ARM Configurations -->
+  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
+    <ClCompile>
+      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineARM</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <!-- FIPS Validated Warning -->
   <ItemDefinitionGroup Label="FIPS Warning">
     <PreBuildEvent Condition="'$(Configuration)'=='DLL-Import Debug' Or '$(Configuration)'=='DLL-Import Release'">
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index 7c04159e..14ccf291 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -12,6 +12,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -20,6 +24,11 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
     <ProjectConfiguration Include="DLL-Import Debug|Win32">
       <Configuration>DLL-Import Debug</Configuration>
       <Platform>Win32</Platform>
@@ -159,6 +168,15 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
+  <!-- ARM Configurations -->
+  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
+    <ClCompile>
+      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineARM</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <!-- Original File with special treatment -->
   <!-- Source Files -->
   <!-- The order of the first three matters -->
diff --git a/dlltest.vcxproj b/dlltest.vcxproj
index 7ad5d0a6..c6624cae 100644
--- a/dlltest.vcxproj
+++ b/dlltest.vcxproj
@@ -12,6 +12,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -20,6 +24,10 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
   <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
@@ -123,6 +131,15 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <!-- ARM Configurations -->
+  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
+    <ClCompile>
+      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineARM</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <!-- Source Files -->
   <ItemGroup>
     <ClCompile Include="dlltest.cpp" />