[#75] Migration to YAHEL hexa-editor (Part 15: Unicode support)

Author: tomas-nestorovic

Main/Main.vcxproj

@@ -101,6 +101,7 @@
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DisableSpecificWarnings>4482</DisableSpecificWarnings>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -177,6 +178,7 @@
       <CallingConvention>StdCall</CallingConvention>
       <FloatingPointExceptions>false</FloatingPointExceptions>
       <DisableSpecificWarnings>4482</DisableSpecificWarnings>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

Main/src/HexaEditor.cpp

@@ -412,22 +412,19 @@ using namespace Yahel;
 	}
 
 	static bool DoPromptSingleTypeFileName(PWCHAR lpszFileNameBuffer,WORD bufferCapacity,LPCWSTR singleFilter,DWORD flags){
+		const CString fileName=Utils::DoPromptSingleTypeFileName(
+			lpszFileNameBuffer&&*lpszFileNameBuffer ? (LPCTSTR)Utils::ToStringT(lpszFileNameBuffer) : nullptr,
+			singleFilter&&*singleFilter ? (LPCTSTR)Utils::ToStringT(singleFilter) : nullptr,
+			flags
+		);
+		if (fileName.IsEmpty())
+			return false;
 		#ifdef UNICODE
-			static_assert(false,"");
+			::lstrcpyn( lpszFileNameBuffer, fileName, bufferCapacity );			
 		#else
-			char singleFilterA[80], lpszFileNameBufferA[MAX_PATH];
-			::WideCharToMultiByte( CP_ACP, 0, singleFilter,-1, singleFilterA,ARRAYSIZE(singleFilterA), nullptr,nullptr );
-			::WideCharToMultiByte( CP_ACP, 0, lpszFileNameBuffer,-1, lpszFileNameBufferA,ARRAYSIZE(lpszFileNameBufferA), nullptr,nullptr );
-			const CString fileName=Utils::DoPromptSingleTypeFileName(
-				lpszFileNameBuffer&&*lpszFileNameBuffer ? lpszFileNameBufferA : nullptr,
-				singleFilter&&*singleFilter ? singleFilterA : nullptr,
-				flags
-			);
-			if (fileName.IsEmpty())
-				return false;
 			::MultiByteToWideChar( CP_ACP,0, fileName,-1, lpszFileNameBuffer,bufferCapacity );
-			return true;
 		#endif
+		return true;
 	}
 
 	bool CHexaEditor::ShowOpenFileDialog(LPCWSTR singleFilter,DWORD ofnFlags,PWCHAR lpszFileNameBuffer,WORD bufferCapacity) const{

Main/src/Utils.h

@@ -495,9 +495,11 @@ namespace Utils{
 #ifdef UNICODE
 	LPCSTR ToStringA(LPCWSTR s);
 	inline CString ToStringT(LPCSTR s){ return s; }
+	inline LPCTSTR ToStringT(LPCWSTR s){ return s; }
 #else
 	inline LPCSTR ToStringA(LPCSTR s){ return s; }
 	inline LPCTSTR ToStringT(LPCSTR s){ return s; }
+	inline CString ToStringT(LPCWSTR s){ return s; }
 #endif
 	CString SimpleFormat(LPCTSTR format,LPCTSTR param);
 	CString SimpleFormat(LPCTSTR format,LPCTSTR param1,LPCTSTR param2);