2 files changed, 9 insertions, 6 deletions
diff --git a/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
index 5eb0e16..e7a47a7 100644
--- a/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
+++ b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -9,6 +9,7 @@
 #include <string>
 #include <boost/algorithm/string.hpp>
 
+#include <Swiften/Base/Path.h>
 #include <SwifTools/Application/PlatformApplicationPathProvider.h>
 
 using namespace Swift;
@@ -40,7 +41,7 @@ class ApplicationPathProviderTest : public CppUnit::TestFixture {
 		void testGetExecutableDir() {
 			boost::filesystem::path dir = testling_->getExecutableDir();
 			CPPUNIT_ASSERT(boost::filesystem::is_directory(dir));
-			CPPUNIT_ASSERT(boost::ends_with(dir.string(), "UnitTest"));
+			CPPUNIT_ASSERT(boost::ends_with(pathToString(dir), "UnitTest"));
 		}
 	
 	private:
diff --git a/SwifTools/Application/WindowsApplicationPathProvider.cpp b/SwifTools/Application/WindowsApplicationPathProvider.cpp
index 730a57a..2c61208 100644
--- a/SwifTools/Application/WindowsApplicationPathProvider.cpp
+++ b/SwifTools/Application/WindowsApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <windows.h>
 #include <cassert>
+#include <Swiften/Base/String.h>
 
 namespace Swift {
 
@@ -17,16 +18,17 @@ WindowsApplicationPathProvider::WindowsApplicationPathProvider(const std::string
 }
 
 boost::filesystem::path WindowsApplicationPathProvider::getDataDir() const {
-	char* appDirRaw = getenv("APPDATA");
+	wchar_t* appDirRaw = _wgetenv(L"APPDATA");
 	assert(appDirRaw);
-	boost::filesystem::path result(boost::filesystem::path(appDirRaw) / getApplicationName());
+	boost::filesystem::path result(
+			boost::filesystem::path(appDirRaw) / getApplicationName());
 	boost::filesystem::create_directory(result);
 	return result;
 }
 
 boost::filesystem::path WindowsApplicationPathProvider::getHomeDir() const {
 	//FIXME: This should be My Documents 
-	char* homeDirRaw = getenv("USERPROFILE");
+	wchar_t* homeDirRaw = _wgetenv(L"USERPROFILE");
 	assert(homeDirRaw);
 	return boost::filesystem::path(homeDirRaw);
 }