diff --git a/.gitignore b/.gitignore
index 875ba48c..0afbf6f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,7 @@
/contrib/ports/win32/msvc/Release unittests
/contrib/ports/win32/msvc/Release fuzz
/contrib/ports/win32/msvc/Release fuzz2
-/contrib/ports/win32/msvc/Release fuzz3
+/contrib/ports/win32/msvc/x64
/contrib/ports/win32/msvc/*.user
/contrib/ports/win32/msvc/*.ncb
/contrib/ports/win32/msvc/*.cache
diff --git a/contrib/ports/win32/include/arch/cc.h b/contrib/ports/win32/include/arch/cc.h
index 0a0c0321..ded66c60 100644
--- a/contrib/ports/win32/include/arch/cc.h
+++ b/contrib/ports/win32/include/arch/cc.h
@@ -80,7 +80,11 @@ typedef int sys_prot_t;
#define S16_F "hd"
#define X16_F "hx"
+#ifdef _WIN64
+#define SZT_F "llu"
+#else
#define SZT_F "lu"
+#endif
#endif /* _MSC_VER */
/* Compiler hints for packing structures */
diff --git a/contrib/ports/win32/msvc/libcheck.vcxproj b/contrib/ports/win32/msvc/libcheck.vcxproj
index c33fdab6..dc4fe459 100644
--- a/contrib/ports/win32/msvc/libcheck.vcxproj
+++ b/contrib/ports/win32/msvc/libcheck.vcxproj
@@ -5,14 +5,23 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}
libcheck
+ 10.0
@@ -21,20 +30,37 @@
true
v143
+
+ StaticLibrary
+ MultiByte
+ true
+ v143
+
StaticLibrary
MultiByte
v143
+
+ StaticLibrary
+ MultiByte
+ v143
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
@@ -43,6 +69,14 @@
$(Configuration)\$(ProjectName)\
$(Configuration)\$(ProjectName)\
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
Disabled
@@ -55,6 +89,17 @@
EditAndContinue
+
+
+ Disabled
+ ..\check;..\..\..\..\..\check\src;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+ Level3
+ ProgramDatabase
+
+
MaxSpeed
@@ -67,6 +112,18 @@
ProgramDatabase
+
+
+ MaxSpeed
+ true
+ ..\check;..\..\..\..\..\check\src;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+ Level3
+ ProgramDatabase
+
+
diff --git a/contrib/ports/win32/msvc/lwIP.vcxproj b/contrib/ports/win32/msvc/lwIP.vcxproj
index a3552d2f..0184b290 100644
--- a/contrib/ports/win32/msvc/lwIP.vcxproj
+++ b/contrib/ports/win32/msvc/lwIP.vcxproj
@@ -5,29 +5,54 @@
Debug fuzz
Win32
+
+ Debug fuzz
+ x64
+
Debug unittests
Win32
+
+ Debug unittests
+ x64
+
Debug
Win32
+
+ Debug
+ x64
+
Release fuzz
Win32
+
+ Release fuzz
+ x64
+
Release unittests
Win32
+
+ Release unittests
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}
+ 10.0
@@ -36,36 +61,72 @@
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
StaticLibrary
false
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
StaticLibrary
false
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
StaticLibrary
false
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
StaticLibrary
false
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
StaticLibrary
false
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
@@ -73,26 +134,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
@@ -109,6 +194,30 @@
$(Configuration)\$(ProjectName)\
$(Configuration)\$(ProjectName)\
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
MaxSpeed
@@ -133,6 +242,30 @@
true
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ MultiThreaded
+ true
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ true
+
+
Disabled
@@ -157,6 +290,30 @@
true
+
+
+ Disabled
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ true
+
+
Disabled
@@ -181,6 +338,30 @@
true
+
+
+ Disabled
+ ..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ true
+
+
Disabled
@@ -205,6 +386,30 @@
true
+
+
+ Disabled
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ true
+
+
MaxSpeed
@@ -229,6 +434,30 @@
true
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ MultiThreaded
+ true
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ true
+
+
MaxSpeed
@@ -253,64 +482,130 @@
true
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ MultiThreaded
+ true
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ true
+
+
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
Document
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
Document
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
Document
@@ -318,11 +613,17 @@
Document
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
@@ -339,21 +640,33 @@
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
@@ -366,19 +679,31 @@
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
@@ -466,11 +791,17 @@
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
@@ -499,17 +830,25 @@
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)
true
+ true
true
+ true
diff --git a/contrib/ports/win32/msvc/lwIP_Test.sln b/contrib/ports/win32/msvc/lwIP_Test.sln
index ce59abd2..a6b89dfb 100644
--- a/contrib/ports/win32/msvc/lwIP_Test.sln
+++ b/contrib/ports/win32/msvc/lwIP_Test.sln
@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34031.279
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwIP_Test", "lwIP_Test.vcxproj", "{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwIP pcapif", "lwIP_pcapif.vcxproj", "{6F44E49E-9F21-4144-91EC-53B92AEF62CE}"
@@ -11,25 +13,43 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Debug|Win32.ActiveCfg = Debug|Win32
{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Debug|Win32.Build.0 = Debug|Win32
+ {8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Debug|x64.ActiveCfg = Debug|x64
+ {8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Debug|x64.Build.0 = Debug|x64
{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Release|Win32.ActiveCfg = Release|Win32
{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Release|Win32.Build.0 = Release|Win32
+ {8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Release|x64.ActiveCfg = Release|x64
+ {8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}.Release|x64.Build.0 = Release|x64
{6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Debug|Win32.ActiveCfg = Debug|Win32
{6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Debug|Win32.Build.0 = Debug|Win32
+ {6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Debug|x64.ActiveCfg = Debug|x64
+ {6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Debug|x64.Build.0 = Debug|x64
{6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Release|Win32.ActiveCfg = Release|Win32
{6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Release|Win32.Build.0 = Release|Win32
+ {6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Release|x64.ActiveCfg = Release|x64
+ {6F44E49E-9F21-4144-91EC-53B92AEF62CE}.Release|x64.Build.0 = Release|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|Win32.ActiveCfg = Debug|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|Win32.Build.0 = Debug|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x64.ActiveCfg = Debug|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x64.Build.0 = Debug|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|Win32.ActiveCfg = Release|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|Win32.Build.0 = Release|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x64.ActiveCfg = Release|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x64.Build.0 = Release|x64
{0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Debug|Win32.ActiveCfg = Debug|Win32
{0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Debug|Win32.Build.0 = Debug|Win32
+ {0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Debug|x64.ActiveCfg = Debug|x64
+ {0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Debug|x64.Build.0 = Debug|x64
{0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Release|Win32.ActiveCfg = Release|Win32
{0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Release|Win32.Build.0 = Release|Win32
+ {0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Release|x64.ActiveCfg = Release|x64
+ {0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/contrib/ports/win32/msvc/lwIP_Test.vcxproj b/contrib/ports/win32/msvc/lwIP_Test.vcxproj
index 94b3a734..bd33dcc7 100644
--- a/contrib/ports/win32/msvc/lwIP_Test.vcxproj
+++ b/contrib/ports/win32/msvc/lwIP_Test.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}
@@ -22,12 +30,24 @@
MultiByte
v143
+
+ Application
+ false
+ MultiByte
+ v143
+
Application
false
MultiByte
v143
+
+ Application
+ false
+ MultiByte
+ v143
+
@@ -35,16 +55,26 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
- $(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
false
+ false
true
+ true
@@ -88,6 +118,47 @@
Packet.dll;wpcap.dll;%(DelayLoadDLLs)
+
+
+ .\Release/test.tlb
+
+
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ true
+ MultiThreaded
+ true
+
+
+ $(IntDir)$(TargetName).pch
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ Default
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ Packet.lib;wpcap.lib;%(AdditionalDependencies)
+ true
+ $(PCAP_DIR)\Lib;..\..\..\..\..\winpcap\WpdPack\Lib;%(AdditionalLibraryDirectories)
+ .\Release/test.pdb
+ Console
+ false
+
+
+ true
+ $(TargetDir)$(TargetName).map
+ Packet.dll;wpcap.dll;%(DelayLoadDLLs)
+
+
.\Debug/test.tlb
@@ -129,6 +200,46 @@
Packet.dll;wpcap.dll;%(DelayLoadDLLs)
+
+
+ .\Debug/test.tlb
+
+
+
+
+ Disabled
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..;%(AdditionalIncludeDirectories)
+ _CONSOLE;WIN32;_DEBUG;LWIP_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ $(IntDir)$(TargetName).pch
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ Packet.lib;wpcap.lib;%(AdditionalDependencies)
+ true
+ $(PCAP_DIR)\Lib;..\..\..\..\..\winpcap\WpdPack\Lib;%(AdditionalLibraryDirectories)
+ true
+ Console
+ false
+
+
+ false
+ $(TargetDir)$(TargetName).map
+ Packet.dll;wpcap.dll;%(DelayLoadDLLs)
+
+
diff --git a/contrib/ports/win32/msvc/lwIP_fuzz.sln b/contrib/ports/win32/msvc/lwIP_fuzz.sln
index ceb9660c..11b52e32 100644
--- a/contrib/ports/win32/msvc/lwIP_fuzz.sln
+++ b/contrib/ports/win32/msvc/lwIP_fuzz.sln
@@ -1,41 +1,74 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34031.279
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwIP", "lwIP.vcxproj", "{2CC276FA-B226-49C9-8F82-7FCD5A228E28}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwip_fuzz", "lwip_fuzz.vcxproj", "{71B3B3F4-621C-11EE-8C99-0242AC120002}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug_fuzz2|x64 = Debug_fuzz2|x64
Debug_fuzz2|x86 = Debug_fuzz2|x86
+ Debug_fuzz3|x64 = Debug_fuzz3|x64
Debug_fuzz3|x86 = Debug_fuzz3|x86
+ Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Release_fuzz2|x64 = Release_fuzz2|x64
Release_fuzz2|x86 = Release_fuzz2|x86
+ Release_fuzz3|x64 = Release_fuzz3|x64
Release_fuzz3|x86 = Release_fuzz3|x86
+ Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz2|x64.ActiveCfg = Debug fuzz|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz2|x64.Build.0 = Debug fuzz|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz2|x86.ActiveCfg = Debug fuzz|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz2|x86.Build.0 = Debug fuzz|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz3|x64.ActiveCfg = Debug fuzz|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz3|x64.Build.0 = Debug fuzz|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz3|x86.ActiveCfg = Debug fuzz|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug_fuzz3|x86.Build.0 = Debug fuzz|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x64.ActiveCfg = Debug fuzz|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x64.Build.0 = Debug fuzz|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x86.ActiveCfg = Debug fuzz|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x86.Build.0 = Debug fuzz|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz2|x64.ActiveCfg = Release fuzz|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz2|x64.Build.0 = Release fuzz|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz2|x86.ActiveCfg = Release fuzz|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz2|x86.Build.0 = Release fuzz|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz3|x64.ActiveCfg = Release fuzz|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz3|x64.Build.0 = Release fuzz|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz3|x86.ActiveCfg = Release fuzz|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release_fuzz3|x86.Build.0 = Release fuzz|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x64.ActiveCfg = Release fuzz|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x64.Build.0 = Release fuzz|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x86.ActiveCfg = Release fuzz|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x86.Build.0 = Release fuzz|Win32
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz2|x64.ActiveCfg = Debug fuzz2|x64
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz2|x64.Build.0 = Debug fuzz2|x64
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz2|x86.ActiveCfg = Debug fuzz2|Win32
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz2|x86.Build.0 = Debug fuzz2|Win32
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz3|x64.ActiveCfg = Debug fuzz3|x64
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz3|x64.Build.0 = Debug fuzz3|x64
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz3|x86.ActiveCfg = Debug fuzz3|Win32
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug_fuzz3|x86.Build.0 = Debug fuzz3|Win32
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug|x64.ActiveCfg = Debug|x64
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug|x64.Build.0 = Debug|x64
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug|x86.ActiveCfg = Debug|Win32
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Debug|x86.Build.0 = Debug|Win32
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz2|x64.ActiveCfg = Release fuzz2|x64
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz2|x64.Build.0 = Release fuzz2|x64
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz2|x86.ActiveCfg = Release fuzz2|Win32
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz2|x86.Build.0 = Release fuzz2|Win32
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz3|x64.ActiveCfg = Release fuzz3|x64
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz3|x64.Build.0 = Release fuzz3|x64
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz3|x86.ActiveCfg = Release fuzz3|Win32
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Release_fuzz3|x86.Build.0 = Release fuzz3|Win32
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Release|x64.ActiveCfg = Release|x64
+ {71B3B3F4-621C-11EE-8C99-0242AC120002}.Release|x64.Build.0 = Release|x64
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Release|x86.ActiveCfg = Release|Win32
{71B3B3F4-621C-11EE-8C99-0242AC120002}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
diff --git a/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj b/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj
index dcb6efa7..62a98f81 100644
--- a/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj
+++ b/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
lwIP pcapif
@@ -23,12 +31,24 @@
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
StaticLibrary
false
MultiByte
v143
+
+ StaticLibrary
+ false
+ MultiByte
+ v143
+
@@ -36,15 +56,23 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
$(Configuration)\$(ProjectName)\
- $(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
@@ -68,6 +96,28 @@
+
+
+ Disabled
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;.\;$(PCAP_DIR)\Include;..\..\..\..\..\winpcap\WpdPack\Include\;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ ProgramDatabase
+ Default
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+
MaxSpeed
@@ -94,6 +144,32 @@
true
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;.\;$(PCAP_DIR)\Include;..\..\..\..\..\winpcap\WpdPack\Include\;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ MultiThreaded
+ true
+
+
+ $(IntDir)$(TargetName).pch
+ $(IntDir)$(ProjectName).pdb
+ Level4
+ true
+ Default
+ true
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0407
+
+
+ true
+
+
diff --git a/contrib/ports/win32/msvc/lwIP_unittests.sln b/contrib/ports/win32/msvc/lwIP_unittests.sln
index 2dfefb06..2e383361 100644
--- a/contrib/ports/win32/msvc/lwIP_unittests.sln
+++ b/contrib/ports/win32/msvc/lwIP_unittests.sln
@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34031.279
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwip_unittests", "lwip_unittests.vcxproj", "{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwIP", "lwIP.vcxproj", "{2CC276FA-B226-49C9-8F82-7FCD5A228E28}"
@@ -9,23 +11,40 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Debug|Win32.ActiveCfg = Debug|Win32
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Debug|Win32.Build.0 = Debug|Win32
+ {6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Debug|x64.ActiveCfg = Debug|x64
+ {6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Debug|x64.Build.0 = Debug|x64
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Release|Win32.ActiveCfg = Release|Win32
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Release|Win32.Build.0 = Release|Win32
+ {6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Release|x64.ActiveCfg = Release|x64
+ {6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Release|x64.Build.0 = Release|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|Win32.ActiveCfg = Debug unittests|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|Win32.Build.0 = Debug unittests|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x64.ActiveCfg = Debug unittests|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|x64.Build.0 = Debug unittests|x64
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|Win32.ActiveCfg = Release unittests|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|Win32.Build.0 = Release unittests|Win32
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x64.ActiveCfg = Release unittests|x64
+ {2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|x64.Build.0 = Release unittests|x64
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Debug|Win32.ActiveCfg = Debug|Win32
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Debug|Win32.Build.0 = Debug|Win32
+ {EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Debug|x64.ActiveCfg = Debug|x64
+ {EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Debug|x64.Build.0 = Debug|x64
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Release|Win32.ActiveCfg = Release|Win32
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Release|Win32.Build.0 = Release|Win32
+ {EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Release|x64.ActiveCfg = Release|x64
+ {EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {18F9EDCF-BE44-4F9F-A7F6-5DCF2B7687C5}
+ EndGlobalSection
EndGlobal
diff --git a/contrib/ports/win32/msvc/lwip_fuzz.vcxproj b/contrib/ports/win32/msvc/lwip_fuzz.vcxproj
index c7b0dbfa..fe42ca52 100644
--- a/contrib/ports/win32/msvc/lwip_fuzz.vcxproj
+++ b/contrib/ports/win32/msvc/lwip_fuzz.vcxproj
@@ -5,30 +5,55 @@
Debug fuzz2
Win32
+
+ Debug fuzz2
+ x64
+
Debug fuzz3
Win32
+
+ Debug fuzz3
+ x64
+
Debug
Win32
+
+ Debug
+ x64
+
Release fuzz2
Win32
+
+ Release fuzz2
+ x64
+
Release fuzz3
Win32
+
+ Release fuzz3
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{71B3B3F4-621C-11EE-8C99-0242AC120002}
lwip_fuzz
+ 10.0
@@ -37,54 +62,105 @@
true
v143
+
+ Application
+ MultiByte
+ true
+ v143
+
Application
MultiByte
true
v143
+
+ Application
+ MultiByte
+ true
+ v143
+
Application
MultiByte
true
v143
+
+ Application
+ MultiByte
+ true
+ v143
+
Application
MultiByte
v143
+
+ Application
+ MultiByte
+ v143
+
Application
MultiByte
v143
+
+ Application
+ MultiByte
+ v143
+
Application
MultiByte
v143
+
+ Application
+ MultiByte
+ v143
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
@@ -95,6 +171,24 @@
$(Configuration)\$(ProjectName)\
$(Configuration)\$(ProjectName)\
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
Disabled
@@ -115,6 +209,24 @@
MachineX86
+
+
+ Disabled
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+ Level4
+ ProgramDatabase
+ 4820
+
+
+ true
+ false
+
+
+
+
Disabled
@@ -135,6 +247,24 @@
MachineX86
+
+
+ Disabled
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+ Level4
+ ProgramDatabase
+ 4820
+
+
+ true
+ false
+
+
+
+
Disabled
@@ -155,6 +285,24 @@
MachineX86
+
+
+ Disabled
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+ Level4
+ ProgramDatabase
+ 4820
+
+
+ true
+ false
+
+
+
+
MaxSpeed
@@ -176,6 +324,26 @@
MachineX86
+
+
+ MaxSpeed
+ true
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+ Level4
+ ProgramDatabase
+
+
+ true
+ true
+ true
+ false
+
+
+
+
MaxSpeed
@@ -197,6 +365,26 @@
MachineX86
+
+
+ MaxSpeed
+ true
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+ Level4
+ ProgramDatabase
+
+
+ true
+ true
+ true
+ false
+
+
+
+
MaxSpeed
@@ -218,6 +406,26 @@
MachineX86
+
+
+ MaxSpeed
+ true
+ ..\..\..\..\test\fuzz;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+ Level4
+ ProgramDatabase
+
+
+ true
+ true
+ true
+ false
+
+
+
+
{2cc276fa-b226-49c9-8f82-7fcd5a228e28}
@@ -232,21 +440,33 @@
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
diff --git a/contrib/ports/win32/msvc/lwip_unittests.vcxproj b/contrib/ports/win32/msvc/lwip_unittests.vcxproj
index 17577d9a..270ba284 100644
--- a/contrib/ports/win32/msvc/lwip_unittests.vcxproj
+++ b/contrib/ports/win32/msvc/lwip_unittests.vcxproj
@@ -5,14 +5,23 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}
lwip_unittests
+ 10.0
@@ -21,26 +30,49 @@
true
v143
+
+ Application
+ MultiByte
+ true
+ v143
+
Application
MultiByte
v143
+
+ Application
+ MultiByte
+ v143
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
$(Configuration)\$(ProjectName)\
$(Configuration)\$(ProjectName)\
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
+
+ $(Platform)\$(Configuration)\$(ProjectName)\
+
Disabled
@@ -59,6 +91,26 @@
MachineX86
+ false
+
+
+
+
+ Disabled
+ ..\check;..\..\..\..\..\check\src;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+ Level4
+ ProgramDatabase
+ 4820
+
+
+ true
+ false
+
+
+ false
@@ -82,6 +134,26 @@
MachineX86
+
+
+ MaxSpeed
+ true
+ ..\check;..\..\..\..\..\check\src;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+ Level4
+ ProgramDatabase
+
+
+ true
+ true
+ true
+ false
+
+
+
+
diff --git a/contrib/ports/win32/msvc/makefsdata.vcxproj b/contrib/ports/win32/msvc/makefsdata.vcxproj
index 4f372d5e..5e73583f 100644
--- a/contrib/ports/win32/msvc/makefsdata.vcxproj
+++ b/contrib/ports/win32/msvc/makefsdata.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
@@ -26,26 +34,45 @@
true
v143
+
+ Application
+ Unicode
+ true
+ v143
+
Application
Unicode
v143
+
+ Application
+ Unicode
+ v143
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
- $(Configuration)\$(ProjectName)\
+ $(Platform)\$(Configuration)\$(ProjectName)\
true
+ true
false
+ false
@@ -70,6 +97,27 @@
MachineX86
+
+
+ Disabled
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level4
+ true
+ ProgramDatabase
+
+
+ true
+ Console
+ false
+
+
+
+
MaxSpeed
@@ -95,6 +143,30 @@
MachineX86
+
+
+ MaxSpeed
+ true
+ ..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level4
+ true
+ ProgramDatabase
+
+
+ true
+ Console
+ true
+ true
+ false
+
+
+
+