zencore: Enabled MSC warning 4668 to get warnings when preprocessor macros are used without an explicit definition

Also fixed up various code to compile with this, by using ZEN_THIRD_PARTY_INCLUDES_START/ZEN_THIRD_PARTY_INCLUDES_END macros

Removed prewindows.h/postwindows.h since they are no longer to be used due to the above

11 files changed, 26 insertions, 18 deletions

diff --git a/zencore/include/zencore/fmtutils.h b/zencore/include/zencore/fmtutils.h
index 29e2ae78a..7e60c2bef 100644
--- a/zencore/include/zencore/fmtutils.h
+++ b/zencore/include/zencore/fmtutils.h
@@ -6,7 +6,11 @@
 #include <zencore/string.h>
 #include <zencore/uid.h>
 
+
+ZEN_THIRD_PARTY_INCLUDES_START
 #include <fmt/format.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 #include <filesystem>
 #include <string_view>
 
diff --git a/zencore/include/zencore/logging.h b/zencore/include/zencore/logging.h
index 0838cfe80..5a038dd3c 100644
--- a/zencore/include/zencore/logging.h
+++ b/zencore/include/zencore/logging.h
@@ -2,11 +2,11 @@
 
 #pragma once
 
-// clang-format off
-#include "prewindows.h"
+#include <zencore/zencore.h>
+
+ZEN_THIRD_PARTY_INCLUDES_START
 #include <spdlog/spdlog.h>
-#include "postwindows.h"
-// clang-format on
+ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <string_view>
 
diff --git a/zencore/include/zencore/postwindows.h b/zencore/include/zencore/postwindows.h
deleted file mode 100644
index 35b7db3af..000000000
--- a/zencore/include/zencore/postwindows.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
-
-#undef GetObject
diff --git a/zencore/include/zencore/prewindows.h b/zencore/include/zencore/prewindows.h
deleted file mode 100644
index 0bc74e49b..000000000
--- a/zencore/include/zencore/prewindows.h
+++ /dev/null
@@ -1 +0,0 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
diff --git a/zencore/include/zencore/windows.h b/zencore/include/zencore/windows.h
index 2b6dc4839..621621ae8 100644
--- a/zencore/include/zencore/windows.h
+++ b/zencore/include/zencore/windows.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "prewindows.h"
+ZEN_THIRD_PARTY_INCLUDES_START
 
 struct IUnknown;  // Workaround for "combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here" when using /permissive-
 #ifndef NOMINMAX
@@ -10,5 +10,6 @@ struct IUnknown;  // Workaround for "combaseapi.h(229): error C2187: syntax erro
 #endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef GetObject
 
-#include "postwindows.h"
+ZEN_THIRD_PARTY_INCLUDES_END
diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h
index 3367b39ef..d654770d0 100644
--- a/zencore/include/zencore/zencore.h
+++ b/zencore/include/zencore/zencore.h
@@ -62,7 +62,6 @@
 
 #if ZEN_COMPILER_MSC
 #	pragma warning(disable : 4324)	 // warning C4324: '<type>': structure was padded due to alignment specifier
-#	pragma warning(default : 4668)	 // warning C4668: 'symbol' is not defined as a preprocessor macro, replacing with '0' for 'directives'
 #endif
 
 #ifndef ZEN_THIRD_PARTY_INCLUDES_START
diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp
index 119e37d0b..6cee3f60d 100644
--- a/zencore/iobuffer.cpp
+++ b/zencore/iobuffer.cpp
@@ -15,7 +15,9 @@
 #include <system_error>
 
 #if ZEN_USE_MIMALLOC
+ZEN_THIRD_PARTY_INCLUDES_START
 #	include <mimalloc.h>
+ZEN_THIRD_PARTY_INCLUDES_END
 #endif
 
 #if ZEN_PLATFORM_WINDOWS
@@ -390,9 +392,12 @@ IoBufferBuilder::ReadFromFileMaybe(IoBuffer& InBuffer)
 		DWORD dwNumberOfBytesRead = 0;
 		BOOL  Success = ::ReadFile(FileRef.FileHandle, OutBuffer.MutableData(), DWORD(NumberOfBytesToRead), &dwNumberOfBytesRead, &Ovl);
 
-		ZEN_ASSERT(dwNumberOfBytesRead == NumberOfBytesToRead);
+		if (!Success)
+		{
+			ThrowLastError("ReadFile failed in IoBufferBuilder::ReadFromFileMaybe");
+		}
 
-		// TODO: error handling
+		ZEN_ASSERT(dwNumberOfBytesRead == NumberOfBytesToRead);
 
 		return OutBuffer;
 #else
diff --git a/zencore/memory.cpp b/zencore/memory.cpp
index da78ae3a8..62c81076d 100644
--- a/zencore/memory.cpp
+++ b/zencore/memory.cpp
@@ -6,7 +6,9 @@
 
 #ifdef ZEN_PLATFORM_WINDOWS
 #	include <malloc.h>
+ZEN_THIRD_PARTY_INCLUDES_START
 #	include <mimalloc.h>
+ZEN_THIRD_PARTY_INCLUDES_END
 #else
 #	include <cstdlib>
 #endif
diff --git a/zencore/thread.cpp b/zencore/thread.cpp
index 6f27ee528..da711fe89 100644
--- a/zencore/thread.cpp
+++ b/zencore/thread.cpp
@@ -2,7 +2,6 @@
 
 #include <zencore/thread.h>
 
-#include <fmt/format.h>
 #include <zencore/except.h>
 #include <zencore/string.h>
 
@@ -12,6 +11,10 @@
 #	include <unistd.h>
 #endif
 
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <fmt/format.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 namespace zen {
 
 #if ZEN_PLATFORM_WINDOWS
diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj
index 421802d3f..95b9eace5 100644
--- a/zencore/zencore.vcxproj
+++ b/zencore/zencore.vcxproj
@@ -115,6 +115,7 @@
     <ClInclude Include="include\zencore\atomic.h" />
     <ClInclude Include="include\zencore\base64.h" />
     <ClInclude Include="include\zencore\blake3.h" />
+    <ClInclude Include="include\zencore\blockingqueue.h" />
     <ClInclude Include="include\zencore\compactbinaryvalue.h" />
     <ClInclude Include="include\zencore\compositebuffer.h" />
     <ClInclude Include="include\zencore\crc32.h" />
@@ -131,8 +132,6 @@
     <ClInclude Include="include\zencore\memory.h" />
     <ClInclude Include="include\zencore\meta.h" />
     <ClInclude Include="include\zencore\mpscqueue.h" />
-    <ClInclude Include="include\zencore\postwindows.h" />
-    <ClInclude Include="include\zencore\prewindows.h" />
     <ClInclude Include="include\zencore\refcount.h" />
     <ClInclude Include="include\zencore\scopeguard.h" />
     <ClInclude Include="include\zencore\session.h" />
diff --git a/zencore/zencore.vcxproj.filters b/zencore/zencore.vcxproj.filters
index e701e9354..1aedf9eab 100644
--- a/zencore/zencore.vcxproj.filters
+++ b/zencore/zencore.vcxproj.filters
@@ -36,8 +36,6 @@
     <ClInclude Include="include\zencore\compositebuffer.h" />
     <ClInclude Include="include\zencore\crc32.h" />
     <ClInclude Include="include\zencore\meta.h" />
-    <ClInclude Include="include\zencore\prewindows.h" />
-    <ClInclude Include="include\zencore\postwindows.h" />
     <ClInclude Include="include\zencore\logging.h" />
     <ClInclude Include="include\zencore\session.h" />
     <ClInclude Include="include\zencore\testutils.h" />
@@ -45,6 +43,7 @@
     <ClInclude Include="include\zencore\mpscqueue.h" />
     <ClInclude Include="include\zencore\base64.h" />
     <ClInclude Include="include\zencore\compactbinaryvalue.h" />
+    <ClInclude Include="include\zencore\blockingqueue.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="sha1.cpp" />