From 38736df5c77b3e6f820e8a6d237c44269e1a2221 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sun, 20 Nov 2016 15:09:32 +0100
Subject: [PATCH 1/2] Fixed: Compilation

--HG--
branch : develop
---
 code/nel/src/3d/ps_mesh.cpp   | 1 +
 code/nel/src/3d/ps_ribbon.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/code/nel/src/3d/ps_mesh.cpp b/code/nel/src/3d/ps_mesh.cpp
index b1a9cc8b8..e98dc801f 100644
--- a/code/nel/src/3d/ps_mesh.cpp
+++ b/code/nel/src/3d/ps_mesh.cpp
@@ -1117,6 +1117,7 @@ void	CPSConstraintMesh::getShapesNames(std::string *shapesNames) const
 	std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), stdext::make_unchecked_array_iterator(shapesNames));
 #else
 	std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), shapesNames);
+#endif
 }
 
 
diff --git a/code/nel/src/3d/ps_ribbon.cpp b/code/nel/src/3d/ps_ribbon.cpp
index b00b89775..e03693349 100644
--- a/code/nel/src/3d/ps_ribbon.cpp
+++ b/code/nel/src/3d/ps_ribbon.cpp
@@ -1469,6 +1469,7 @@ void CPSRibbon::getShape(CVector *shape) const
 	std::copy(_Shape.begin(), _Shape.end(), stdext::make_unchecked_array_iterator(shape));
 #else
 	std::copy(_Shape.begin(), _Shape.end(), shape);
+#endif
 }
 
 ///==================================================================================================================

From 935a3dc5cc231417e3372e76909115d87026c929 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sun, 20 Nov 2016 15:09:59 +0100
Subject: [PATCH 2/2] Changed: Use wide version of Win32 API

--HG--
branch : develop
---
 code/nel/src/sound/driver/sound_driver.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/nel/src/sound/driver/sound_driver.cpp b/code/nel/src/sound/driver/sound_driver.cpp
index 4a87df307..6e1ada902 100644
--- a/code/nel/src/sound/driver/sound_driver.cpp
+++ b/code/nel/src/sound/driver/sound_driver.cpp
@@ -225,10 +225,10 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD
 	 *  MTR: Is there a way with NLMISC to replace SearchFile() ? Until then, no info for Linux.
 	 */
 #ifdef NL_OS_WINDOWS
-	char buffer[1024], *ptr;
-	uint len = SearchPath (NULL, dllName.c_str(), NULL, 1023, buffer, &ptr);
+	wchar_t buffer[1024], *ptr;
+	uint len = SearchPathW (NULL, utf8ToWide(dllName), NULL, 1023, buffer, &ptr);
 	if( len )
-		nlinfo ("Using the library '%s' that is in the directory: '%s'", dllName.c_str(), buffer);
+		nlinfo ("Using the library '%s' that is in the directory: '%s'", dllName.c_str(), wideToUtf8(buffer).c_str());
 #endif
 
 	createSoundDriver = (ISDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME);