From bb258b7bf62c5021d2ccde38107efcfdfc52ddd0 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Fri, 15 Oct 2021 16:29:38 +0200 Subject: 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 --- zencore/iobuffer.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'zencore/iobuffer.cpp') 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 #if ZEN_USE_MIMALLOC +ZEN_THIRD_PARTY_INCLUDES_START # include +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 -- cgit v1.2.3