The code for unicode version of project was added

awwit · awwit · commit 637f8c8a973a · 2015-12-22T18:34:19.000+03:00
diff --git a/projects/msvs/httpserver.v12.suo b/projects/msvs/httpserver.v12.suo
diff --git a/src/Module.cpp b/src/Module.cpp
@@ -1,7 +1,11 @@
 ﻿
 #include "Module.h"
 
-#include <iostream>
+#ifdef WIN32
+	#ifdef UNICODE
+		#include <codecvt>
+	#endif
+#endif
 
 namespace HttpServer
 {
@@ -55,8 +59,15 @@ namespace HttpServer
 
 			cookie = ::AddDllDirectory(directory.data() );
 		}
+
+		#ifdef UNICODE
+			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+			const std::wstring lib_path = converter.from_bytes(libPath);
+		#else
+			const std::string &lib_path = libPath;
+		#endif
 		
-		lib_handle = ::LoadLibraryEx(libPath.c_str(), 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
+		lib_handle = ::LoadLibraryEx(lib_path.c_str(), 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
 
 		if (cookie)
 		{
diff --git a/src/SignalsHandles.h b/src/SignalsHandles.h
@@ -8,7 +8,7 @@
 	#include <thread>
 
 	extern std::thread threadMessageLoop;
-	extern char myWndClassName[];
+	extern ::TCHAR myWndClassName[];
 #endif
 
 int bindSignalsHandles(HttpServer::Server *server);
diff --git a/src/System.cpp b/src/System.cpp
@@ -4,7 +4,12 @@
 #include <array>
 
 #ifdef WIN32
-	char myWndClassName[] = "WndClassNameConstant";
+	#include <tchar.h>
+	::TCHAR myWndClassName[] = TEXT("WndClassNameConstant");
+
+	#ifdef UNICODE
+		#include <codecvt>
+	#endif
 #endif
 
 namespace System
@@ -26,11 +31,11 @@ namespace System
 
         if (process_id == ed.process_id && ::GetConsoleWindow() != hWnd)
 		{
-			std::array<char, 65> class_name;
+			std::array<::TCHAR, 257> class_name;
 
 			::GetClassName(hWnd, class_name.data(), class_name.size() - 1);
 
-			if (0 == ::strcmp(class_name.data(), myWndClassName) )
+			if (0 == ::_tcscmp(class_name.data(), myWndClassName) )
 			{
 				ed.hWnd = hWnd;
 
@@ -65,11 +70,16 @@ namespace System
 	std::string getTempDir()
 	{
 	#ifdef WIN32
-		std::array<std::string::value_type, MAX_PATH + 1> buf;
+		std::array<TCHAR, MAX_PATH + 1> buf;
 
 		const size_t len = ::GetTempPath(buf.size(), buf.data() );
 
-		return std::string(buf.cbegin(), buf.cbegin() + len);
+		#ifdef UNICODE
+			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+			return converter.to_bytes(buf.data() );
+		#else
+			return std::string(buf.cbegin(), buf.cbegin() + len);
+		#endif
 	#elif POSIX
         const char *buf = ::getenv("TMPDIR");
 
@@ -94,7 +104,14 @@ namespace System
 	bool isFileExists(const std::string &fileName)
 	{
 	#ifdef WIN32
-		const ::DWORD attrib = ::GetFileAttributes(fileName.c_str() );
+		#ifdef UNICODE
+			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+			const std::wstring file_name = converter.from_bytes(fileName);
+		#else
+			const std::string &file_name = fileName;
+		#endif
+
+		const ::DWORD attrib = ::GetFileAttributes(file_name.c_str() );
 
 		if (INVALID_FILE_ATTRIBUTES == attrib)
 		{
@@ -119,7 +136,14 @@ namespace System
 	bool getFileSizeAndTimeGmt(const std::string &filePath, size_t *fileSize, time_t *fileTime)
 	{
 	#ifdef WIN32
-		::HANDLE hFile = ::CreateFile(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, 0, nullptr);
+		#ifdef UNICODE
+			std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+			const std::wstring file_path = converter.from_bytes(filePath);
+		#else
+			const std::string &file_path = filePath;
+		#endif
+
+		::HANDLE hFile = ::CreateFile(file_path.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, 0, nullptr);
 
 		if (INVALID_HANDLE_VALUE == hFile)
 		{
diff --git a/src/System.h b/src/System.h
@@ -2,7 +2,7 @@
 
 #ifdef WIN32
 	#include <Windows.h>
-	char myWndClassName[];
+	::TCHAR myWndClassName[];
 
     #ifdef SIGTERM
         #undef SIGTERM
