From bfa613e1025ab5a057a8312d49079beab700abfa Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 10 Dec 2017 01:57:54 +0000
Subject: [PATCH] Win32: Implemented SSPI support and added files in VS2015
 Express project

---
 projects/msw/xestiacal.vcxproj         | 17 +++++++++----
 projects/msw/xestiacal.vcxproj.filters | 33 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/projects/msw/xestiacal.vcxproj b/projects/msw/xestiacal.vcxproj
index 45c2117..cd9dfa6 100644
--- a/projects/msw/xestiacal.vcxproj
+++ b/projects/msw/xestiacal.vcxproj
@@ -258,7 +258,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SQLITE_32BIT);$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_32BIT)\include;$(WXWIDGETS_32BIT_DEBUG)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT_DEBUG)\include;$(LIBXML2_32BIT)\include\libxml2\;.\..\..\lib\vc_dll\mswud;.\..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -299,7 +299,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>$(SQLITE_32BIT);$(CURL_32BIT)\builds\libcurl-vc-x86-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_32BIT)\include;$(WXWIDGETS_32BIT)\lib\vc_dll\mswud;$(WXWIDGETS_32BIT)\include;$(SFML_32BIT)\include;$(LIBXML2_32BIT)\include\libxml2;.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -434,7 +434,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SQLITE_64BIT);$(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl\include;$(ICONV_64BIT)\include;$(WXWIDGETS_64BIT_DEBUG)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT_DEBUG)\include;$(LIBXML2_64BIT)\include\libxml2;.\..\..\source\common;.;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -481,7 +481,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>$(SQLITE_64BIT);$(CURL_64BIT)\builds\libcurl-vc-x64-release-dll-zlib-static-ipv6-sspi-winssl\include;$(ICONV_64BIT)\include;$(WXWIDGETS_64BIT)\lib\vc_x64_dll\mswud;$(WXWIDGETS_64BIT)\include;$(LIBXML2_64BIT)\include\libxml2;.\..\..\lib\vc_x64_dll\mswu;.\..\..\source\common;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;SECURITY_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -530,11 +530,14 @@
     <ClCompile Include="..\..\source\common\svrblist.cpp" />
     <ClCompile Include="..\..\source\common\text.cpp" />
     <ClCompile Include="..\..\source\common\uuid.cpp" />
+    <ClCompile Include="..\..\source\common\win32ssl.cpp" />
     <ClCompile Include="..\..\source\forms\about\frmAbout.cpp" />
+    <ClCompile Include="..\..\source\forms\actmgr\frmActivityMgr.cpp" />
     <ClCompile Include="..\..\source\forms\calendareditor\frmCalendarEditor.cpp" />
     <ClCompile Include="..\..\source\forms\calendarselectmonth\frmCalendarSelectMonth.cpp" />
     <ClCompile Include="..\..\source\forms\editaccount\frmEditAccount.cpp" />
     <ClCompile Include="..\..\source\forms\eventeditor\frmEventEditor.cpp" />
+    <ClCompile Include="..\..\source\forms\main\frmMain-Setup.cpp" />
     <ClCompile Include="..\..\source\forms\main\frmMain-Window.cpp" />
     <ClCompile Include="..\..\source\forms\main\frmMain.cpp" />
     <ClCompile Include="..\..\source\forms\newaccount\frmNewAccount.cpp" />
@@ -542,6 +545,8 @@
     <ClCompile Include="..\..\source\forms\update\frmUpdate.cpp" />
     <ClCompile Include="..\..\source\libraries\CalendarDataStorage\CalendarDataStorage.cpp" />
     <ClCompile Include="..\..\source\main.cpp" />
+    <ClCompile Include="..\..\source\objects\CalDAV\CalDAV-XMLProcessing.cpp" />
+    <ClCompile Include="..\..\source\objects\CalDAV\CalDAV.cpp" />
     <ClCompile Include="..\..\source\objects\calendarevent\CalendarEvent-Save.cpp" />
     <ClCompile Include="..\..\source\objects\calendarevent\CalendarEvent.cpp" />
     <ClCompile Include="..\..\source\objects\calendarlist\CalendarList.cpp" />
@@ -570,12 +575,15 @@
     <ClInclude Include="..\..\source\common\monthviewgen.h" />
     <ClInclude Include="..\..\source\common\preferences.h" />
     <ClInclude Include="..\..\source\common\random.h" />
+    <ClInclude Include="..\..\source\common\sslcertstructs.h" />
     <ClInclude Include="..\..\source\common\structs.h" />
     <ClInclude Include="..\..\source\common\svrblist.h" />
     <ClInclude Include="..\..\source\common\text.h" />
     <ClInclude Include="..\..\source\common\types.h" />
     <ClInclude Include="..\..\source\common\uuid.h" />
+    <ClInclude Include="..\..\source\common\win32ssl.h" />
     <ClInclude Include="..\..\source\forms\about\frmAbout.h" />
+    <ClInclude Include="..\..\source\forms\actmgr\frmActivityMgr.h" />
     <ClInclude Include="..\..\source\forms\calendareditor\frmCalendarEditor.h" />
     <ClInclude Include="..\..\source\forms\calendarselectmonth\frmCalendarSelectMonth.h" />
     <ClInclude Include="..\..\source\forms\editaccount\frmEditAccount.h" />
@@ -585,6 +593,7 @@
     <ClInclude Include="..\..\source\forms\preferences\frmPreferences.h" />
     <ClInclude Include="..\..\source\forms\update\frmUpdate.h" />
     <ClInclude Include="..\..\source\libraries\CalendarDataStorage\CalendarDataStorage.h" />
+    <ClInclude Include="..\..\source\objects\CalDAV\CalDAV.h" />
     <ClInclude Include="..\..\source\objects\calendarevent\CalendarEvent.h" />
     <ClInclude Include="..\..\source\objects\calendarlist\CalendarList.h" />
     <ClInclude Include="..\..\source\objects\calendarobject\CalendarObject.h" />
diff --git a/projects/msw/xestiacal.vcxproj.filters b/projects/msw/xestiacal.vcxproj.filters
index a41932f..ab40c0e 100644
--- a/projects/msw/xestiacal.vcxproj.filters
+++ b/projects/msw/xestiacal.vcxproj.filters
@@ -54,6 +54,12 @@
     <Filter Include="Source Files\UI\frmCalendarSelectMonth">
       <UniqueIdentifier>{3e1c1354-e6aa-4bfc-abdf-2e77737f6d53}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\CalDAV">
+      <UniqueIdentifier>{cc74288e-bad5-4fab-bf57-36fd9a4bdcde}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Activity Manager">
+      <UniqueIdentifier>{1c122662-e27f-41c9-9d72-65feacf5c6a0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\AppXestiaCalendar.cpp">
@@ -173,6 +179,21 @@
     <ClCompile Include="..\..\source\forms\calendarselectmonth\frmCalendarSelectMonth.cpp">
       <Filter>Source Files\UI\frmCalendarSelectMonth</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\forms\main\frmMain-Setup.cpp">
+      <Filter>Source Files\UI\frmMain</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\common\win32ssl.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\objects\CalDAV\CalDAV.cpp">
+      <Filter>Source Files\CalDAV</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\objects\CalDAV\CalDAV-XMLProcessing.cpp">
+      <Filter>Source Files\CalDAV</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\forms\actmgr\frmActivityMgr.cpp">
+      <Filter>Source Files\Activity Manager</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\AppXestiaCalendar.h">
@@ -292,5 +313,17 @@
     <ClInclude Include="..\..\source\forms\calendarselectmonth\frmCalendarSelectMonth.h">
       <Filter>Source Files\UI\frmCalendarSelectMonth</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\common\sslcertstructs.h">
+      <Filter>Source Files\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\common\win32ssl.h">
+      <Filter>Source Files\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\objects\CalDAV\CalDAV.h">
+      <Filter>Source Files\CalDAV</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\forms\actmgr\frmActivityMgr.h">
+      <Filter>Source Files\Activity Manager</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.39.5