comment

Author: meynardc

src/CheckedFile.cpp

@@ -32,11 +32,13 @@
 
 #if defined( _WIN32 )
 #if defined( _MSC_VER )
-#include <codecvt>
+#include <codecvt> //  codecvt_utf8_utf16 is deprecated in C++17, removed in C++226
 #include <io.h>
-#include <stringapiset.h>
-#define NOMINMAX
+#define NOMINMAX // prevents <windows.h> to  #define min and max. Sigh ...
+// clang-format off: <windows.h> MUST be included before <stringapiset.h>
 #include <windows.h>
+#include <stringapiset.h> // Use WIN32 API to replace codecvt_utf8_utf16
+// clang-format on
 #elif defined( __GNUC__ )
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
@@ -247,10 +249,11 @@ int CheckedFile::open64( const ustring &fileName, int flags, int mode )
       widePath.resize( sizeUtf16 + 1 );
       sizeUtf16 =
          ::MultiByteToWideChar( CP_UTF8, 0, fileName.c_str(), -1, &widePath[0], sizeUtf16 );
-      if ( sizeUtf16 <= 0 )
-      {
-         widePath.resize( 0 );
-      }
+   }
+   if ( sizeUtf16 <= 0 )
+   {
+      throw E57_EXCEPTION2( ErrorOpenFailed,
+                            "Error in converting file name to UTF16. " + " 'fileName=" + fileName );
    }
 #else
    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;