Merge with hotfix

2024-12-27 02:50:53 +00:00 · 2015-03-06 23:40:48 +01:00 · 2015-03-06 23:40:48 +01:00 · eaf44707a7
commit eaf44707a7
parent 3c29eac27c 7764fc3a26
384 changed files with 7387 additions and 7031 deletions
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@ -112,16 +112,20 @@ IF(WITH_STATIC_LIBXML2)
  SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
 ENDIF(WITH_STATIC_LIBXML2)

+IF(WITH_LIBXML2_ICONV)
+  FIND_PACKAGE(Iconv REQUIRED)
+  INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
+  SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES})
+ENDIF(WITH_LIBXML2_ICONV)
+
 IF(WITH_STATIC)
  # libxml2 could need winsock2 library
  SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${WINSOCK2_LIB})

  # on Mac OS X libxml2 requires iconv and liblzma
  IF(APPLE)
-    FIND_PACKAGE(Iconv REQUIRED)
    FIND_PACKAGE(LibLZMA REQUIRED)
-    SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES} ${LIBLZMA_LIBRARIES})
-    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
+    SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
  ENDIF(APPLE)
 ENDIF(WITH_STATIC)

@ -152,9 +156,11 @@ IF(WITH_NEL)
    FIND_PACKAGE(Luabind REQUIRED)
    FIND_PACKAGE(CURL REQUIRED)

-    IF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+    IF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
      SET(CURL_STATIC ON)
-    ENDIF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
+    ELSE((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
+      SET(CURL_STATIC OFF)
+    ENDIF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)

    IF(CURL_STATIC)
      SET(CURL_DEFINITIONS -DCURL_STATICLIB)
--- a/code/CMakeModules/FindIconv.cmake
+++ b/code/CMakeModules/FindIconv.cmake
@ -1,4 +1,4 @@
-# - Try to find Iconv on Mac OS X
+# - Try to find Iconv 
 # Once done this will define 
 # 
 #  ICONV_FOUND - system has Iconv 
@ -6,78 +6,59 @@
 #  ICONV_LIBRARIES - Link these to use Iconv 
 #  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
 # 
+include(CheckCCompilerFlag)
+include(CheckCSourceCompiles)

-IF(APPLE)
-  include(CheckCCompilerFlag)
-  include(CheckCSourceCompiles)
-  
-  IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-    # Already in cache, be silent
-    SET(ICONV_FIND_QUIETLY TRUE)
-  ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-  
-  IF(APPLE)
-      FIND_PATH(ICONV_INCLUDE_DIR iconv.h
-               PATHS
-               /opt/local/include/
-               NO_CMAKE_SYSTEM_PATH
-      )
-  
-      FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c
-               PATHS
-               /opt/local/lib/
-               NO_CMAKE_SYSTEM_PATH
-      )
-  ENDIF(APPLE)
-  
-  FIND_PATH(ICONV_INCLUDE_DIR iconv.h PATHS /opt/local/include /sw/include)
-  
-  string(REGEX REPLACE "(.*)/include/?" "\\1" ICONV_INCLUDE_BASE_DIR "${ICONV_INCLUDE_DIR}")
-  
-  FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c HINTS "${ICONV_INCLUDE_BASE_DIR}/lib" PATHS /opt/local/lib)
-   
-  IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-     SET(ICONV_FOUND TRUE) 
-  ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
-  
-  set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-  set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-  IF(ICONV_FOUND)
-    check_c_compiler_flag("-Werror" ICONV_HAVE_WERROR)
-    set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
-    if(ICONV_HAVE_WERROR)
-      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-    endif(ICONV_HAVE_WERROR)
-    check_c_source_compiles("
-    #include <iconv.h>
-    int main(){
-      iconv_t conv = 0;
-      const char* in = 0;
-      size_t ilen = 0;
-      char* out = 0;
-      size_t olen = 0;
-      iconv(conv, &in, &ilen, &out, &olen);
-      return 0;
-    }
-  " ICONV_SECOND_ARGUMENT_IS_CONST )
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
-  ENDIF(ICONV_FOUND)
-  set(CMAKE_REQUIRED_INCLUDES)
-  set(CMAKE_REQUIRED_LIBRARIES)
-  
-  IF(ICONV_FOUND) 
-    IF(NOT ICONV_FIND_QUIETLY) 
-      MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
-    ENDIF(NOT ICONV_FIND_QUIETLY) 
-  ELSE(ICONV_FOUND) 
-    IF(Iconv_FIND_REQUIRED) 
-      MESSAGE(FATAL_ERROR "Could not find Iconv") 
-    ENDIF(Iconv_FIND_REQUIRED) 
-  ENDIF(ICONV_FOUND) 
-  
-  MARK_AS_ADVANCED(
-    ICONV_INCLUDE_DIR
-    ICONV_LIBRARIES
-    ICONV_SECOND_ARGUMENT_IS_CONST
-  )
-ENDIF(APPLE)
+IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  # Already in cache, be silent
+  SET(ICONV_FIND_QUIETLY TRUE)
+ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) 
+ 
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c PATHS /opt/local)
+ 
+IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+   SET(ICONV_FOUND TRUE) 
+ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
+IF(ICONV_FOUND)
+  check_c_compiler_flag("-Werror" ICONV_HAVE_WERROR)
+  set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
+  if(ICONV_HAVE_WERROR)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+  endif(ICONV_HAVE_WERROR)
+  check_c_source_compiles("
+  #include <iconv.h>
+  int main(){
+    iconv_t conv = 0;
+    const char* in = 0;
+    size_t ilen = 0;
+    char* out = 0;
+    size_t olen = 0;
+    iconv(conv, &in, &ilen, &out, &olen);
+    return 0;
+  }
+" ICONV_SECOND_ARGUMENT_IS_CONST )
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
+ENDIF(ICONV_FOUND)
+set(CMAKE_REQUIRED_INCLUDES)
+set(CMAKE_REQUIRED_LIBRARIES)
+
+IF(ICONV_FOUND) 
+  IF(NOT ICONV_FIND_QUIETLY) 
+    MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
+  ENDIF(NOT ICONV_FIND_QUIETLY) 
+ELSE(ICONV_FOUND) 
+  IF(Iconv_FIND_REQUIRED) 
+    MESSAGE(FATAL_ERROR "Could not find Iconv") 
+  ENDIF(Iconv_FIND_REQUIRED) 
+ENDIF(ICONV_FOUND) 
+
+MARK_AS_ADVANCED(
+  ICONV_INCLUDE_DIR
+  ICONV_LIBRARIES
+  ICONV_SECOND_ARGUMENT_IS_CONST
+)
--- a/code/CMakeModules/FindLibOVR.cmake
+++ b/code/CMakeModules/FindLibOVR.cmake
@ -38,7 +38,7 @@ ELSEIF(WIN32)
 ENDIF(UNIX)

 FIND_LIBRARY(LIBOVR_LIBRARY
-  NAMES ovr
+  NAMES ovr libovr
  PATHS
  $ENV{LIBOVR_DIR}/${LIBOVR_LIBRARY_BUILD_PATH}
  /usr/local/lib
--- a/code/CMakeModules/FindLuabind.cmake
+++ b/code/CMakeModules/FindLuabind.cmake
@ -69,14 +69,48 @@ FIND_PATH(LUABIND_INCLUDE_DIR
  /opt/include
 )

-SET(LIBRARY_NAME_RELEASE luabind libluabind)
-SET(LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+SET(LIBRARY_NAME_RELEASE)
+SET(LIBRARY_NAME_DEBUG)
+
+IF(WITH_LUA52)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua52)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua52d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua52)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua52d)
+ENDIF()
+
+IF(WITH_LUA51)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua51)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua51d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua51)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua51d)
+ENDIF()
+
+IF(WITH_LUA50)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua50)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua50d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua50)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua50d)
+ENDIF()

 IF(WITH_STLPORT)
-  SET(LIBRARY_NAME_RELEASE luabind_stlport ${LIBRARY_NAME_RELEASE})
-  SET(LIBRARY_NAME_DEBUG luabind_stlportd ${LIBRARY_NAME_DEBUG})
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlportd)
 ENDIF(WITH_STLPORT)

+# generic libraries names
+LIST(APPEND LIBRARY_NAME_RELEASE luabind libluabind)
+LIST(APPEND LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+
 FIND_LIBRARY(LUABIND_LIBRARY_RELEASE
  NAMES ${LIBRARY_NAME_RELEASE}
  PATHS
--- a/code/CMakeModules/FindMSVC.cmake
+++ b/code/CMakeModules/FindMSVC.cmake
@ -62,7 +62,7 @@ IF(MSVC12)
  IF(NOT MSVC12_REDIST_DIR)
    # If you have VC++ 2013 Express, put x64/Microsoft.VC120.CRT/*.dll in ${EXTERNAL_PATH}/redist
    SET(MSVC12_REDIST_DIR "${EXTERNAL_PATH}/redist")
-  ENDIF(NOT MSVC11_REDIST_DIR)
+  ENDIF(NOT MSVC12_REDIST_DIR)
 ELSEIF(MSVC11)
  DETECT_VC_VERSION("11.0")
  SET(MSVC_TOOLSET "110")
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@ -255,6 +255,16 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
  ELSE(WITH_STATIC)
    OPTION(WITH_STATIC_LIBXML2    "With static libxml2"                           OFF)
  ENDIF(WITH_STATIC)
+  IF (WITH_STATIC)
+    OPTION(WITH_STATIC_CURL       "With static curl"                              ON )
+  ELSE(WITH_STATIC)
+    OPTION(WITH_STATIC_CURL       "With static curl"                              OFF)
+  ENDIF(WITH_STATIC)
+  IF(APPLE)
+    OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      ON )
+  ELSE(APPLE)
+    OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      OFF)
+  ENDIF(APPLE)
  OPTION(WITH_STATIC_DRIVERS      "With static drivers."                          OFF)
  IF(WIN32)
    OPTION(WITH_EXTERNAL          "With provided external."                       ON )
@ -363,6 +373,7 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
  ###
  OPTION(WITH_LUA51               "Build Ryzom Core using Lua 5.1"                ON )
  OPTION(WITH_LUA52               "Build Ryzom Core using Lua 5.2"                OFF)
+  OPTION(WITH_RYZOM_CLIENT_UAC    "Ask to run as Administrator"                   OFF)
 ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)

 MACRO(NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS)
@ -557,9 +568,15 @@ MACRO(NL_SETUP_BUILD)
    # Ignore default include paths
    ADD_PLATFORM_FLAGS("/X")

-    IF(MSVC11)
+    IF(MSVC12)
      ADD_PLATFORM_FLAGS("/Gy- /MP")
-      # /Ox is working with VC++ 2010, but custom optimizations don't exist
+      # /Ox is working with VC++ 2013, but custom optimizations don't exist
+      SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
+      # without inlining it's unusable, use custom optimizations again
+      SET(DEBUG_CFLAGS "/Od /Ob1 /GF- ${DEBUG_CFLAGS}")
+    ELSEIF(MSVC11)
+      ADD_PLATFORM_FLAGS("/Gy- /MP")
+      # /Ox is working with VC++ 2012, but custom optimizations don't exist
      SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
      # without inlining it's unusable, use custom optimizations again
      SET(DEBUG_CFLAGS "/Od /Ob1 /GF- ${DEBUG_CFLAGS}")
@ -581,9 +598,9 @@ MACRO(NL_SETUP_BUILD)
      SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
      # without inlining it's unusable, use custom optimizations again
      SET(DEBUG_CFLAGS "/Od /Ob1 ${DEBUG_CFLAGS}")
-    ELSE(MSVC11)
+    ELSE(MSVC12)
      MESSAGE(FATAL_ERROR "Can't determine compiler version ${MSVC_VERSION}")
-    ENDIF(MSVC11)
+    ENDIF(MSVC12)

    ADD_PLATFORM_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250")

--- a/code/nel/CMakeLists.txt
+++ b/code/nel/CMakeLists.txt
@ -83,4 +83,3 @@ IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
  ENDIF(WITH_NEL_TOOLS)
  ADD_SUBDIRECTORY(tools)
 ENDIF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
-
--- a/code/nel/include/nel/3d/driver.h
+++ b/code/nel/include/nel/3d/driver.h
@ -493,7 +493,7 @@ public:
 	 *
 	 * NB: you must setupViewMatrix() BEFORE setupModelMatrix(), or else undefined results.
 	 */
-	virtual void			setupViewMatrix(const CMatrix &mtx)=0;
+	virtual void			setupViewMatrix(const CMatrix &mtx) = 0;

 	/** setup the view matrix (inverse of camera matrix).
 	 *	Extended: give a cameraPos (mtx.Pos() is not taken into account but for getViewMatrix()),
@ -1422,7 +1422,6 @@ protected:

 private:
 	bool					_StaticMemoryToVRAM;
-
 };

 // --------------------------------------------------
--- a/code/nel/include/nel/gui/ctrl_base.h
+++ b/code/nel/include/nel/gui/ctrl_base.h
@ -50,6 +50,8 @@ namespace NLGUI
 			// see interface.txt for meaning of auto
 			_ToolTipParentPosRef= Hotspot_TTAuto;
 			_ToolTipPosRef= Hotspot_TTAuto;
+			_EventX = 0;
+			_EventY = 0;
 			resizer = false;
 		}

@ -70,6 +72,9 @@ namespace NLGUI

 		bool handleEvent (const NLGUI::CEventDescriptor &event);

+		sint32 getEventX() { return _EventX; }
+		sint32 getEventY() { return _EventY; }
+
 		virtual CCtrlBase	*getSubCtrl (sint32 /* x */, sint32 /* y */) { return this; }

 		/// Debug
@ -181,6 +186,9 @@ namespace NLGUI
 		static std::map< std::string, std::map< std::string, std::string > > AHCache;

 		bool resizer;
+
+		sint32 _EventX;
+		sint32 _EventY;
 	};

 }
--- a/code/nel/include/nel/gui/dbgroup_combo_box.h
+++ b/code/nel/include/nel/gui/dbgroup_combo_box.h
@ -60,7 +60,7 @@ namespace NLGUI
 		void			setText(uint i, const ucstring &text);
 		void			insertText(uint i, const ucstring &text);
 		const ucstring	&getText(uint i) const;
-		const uint		&getTextId(uint i) const;
+		uint			getTextId(uint i) const;
 		uint			getTextPos(uint nId) const;
 		const ucstring	&getTexture(uint i) const;
 		void			removeText(uint nPos);
--- a/code/nel/include/nel/gui/group_html.h
+++ b/code/nel/include/nel/gui/group_html.h
@ -17,7 +17,6 @@
 #ifndef CL_GROUP_HTML_H
 #define CL_GROUP_HTML_H

-#define CURL_STATICLIB 1
 #include <curl/curl.h>

 #include "nel/misc/types_nl.h"
@ -107,7 +106,7 @@ namespace NLGUI
 		void refresh();

 		// submit form
-		void submitForm (uint formId, const char *submitButtonName);
+		void submitForm (uint formId, const char *submitButtonType, const char *submitButtonName, const char *submitButtonValue, sint32 x, sint32 y);

 		// Browse error
 		void browseError (const char *msg);
@ -328,7 +327,11 @@ namespace NLGUI
 		bool			_BrowseNextTime;
 		bool			_PostNextTime;
 		uint			_PostFormId;
+		std::string		_PostFormSubmitType;
 		std::string		_PostFormSubmitButton;
+		std::string		_PostFormSubmitValue;
+		sint32			_PostFormSubmitX;
+		sint32			_PostFormSubmitY;

 		// Browsing..
 		bool			_Browsing;
--- a/code/nel/include/nel/gui/lua_object.h
+++ b/code/nel/include/nel/gui/lua_object.h
@ -285,8 +285,7 @@ namespace NLGUI
 	class CLuaHashMapTraits
 	{
 	public:
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		CLuaHashMapTraits()
 		{}

--- a/code/nel/include/nel/misc/app_context.h
+++ b/code/nel/include/nel/misc/app_context.h
@ -88,6 +88,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert) =0;
 		virtual bool getAlreadyCreateSharedAmongThreads() =0;
 		virtual void setAlreadyCreateSharedAmongThreads(bool b) =0;
+		virtual bool isWindowedApplication() = 0;
+		virtual void setWindowedApplication(bool b = true) = 0;
 		//@}
 	protected:
 		/// Called by derived class to finalize initialisation of context
@ -131,6 +133,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert);
 		virtual bool getAlreadyCreateSharedAmongThreads();
 		virtual void setAlreadyCreateSharedAmongThreads(bool b);
+		virtual bool isWindowedApplication();
+		virtual void setWindowedApplication(bool b);

 	private:
 		/// Singleton registry
@ -147,6 +151,7 @@ namespace NLMISC
 		bool DebugNeedAssert;
 		bool NoAssert;
 		bool AlreadyCreateSharedAmongThreads;
+		bool WindowedApplication;
 	};

 	/** This class implements the context interface for the a library module.
@ -183,6 +188,8 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert);
 		virtual bool getAlreadyCreateSharedAmongThreads();
 		virtual void setAlreadyCreateSharedAmongThreads(bool b);
+		virtual bool isWindowedApplication();
+		virtual void setWindowedApplication(bool b);

 	private:
 		/// Pointer to the application context.
--- a/code/nel/include/nel/misc/class_id.h
+++ b/code/nel/include/nel/misc/class_id.h
@ -61,8 +61,7 @@ public:
 class CClassIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const CClassId& classId ) const
 	{
 		return ((((uint64)classId >> 32)|0xFFFFFFFF) ^ (((uint64)classId|0xFFFFFFFF) & 0xFFFFFFFF));
--- a/code/nel/include/nel/misc/common.h
+++ b/code/nel/include/nel/misc/common.h
@ -347,7 +347,7 @@ std::string formatThousands(const std::string& s);

 /// This function executes a program in the background and returns instantly (used for example to launch services in AES).
 /// The program will be launched in the current directory
-bool launchProgram (const std::string &programName, const std::string &arguments);
+bool launchProgram (const std::string &programName, const std::string &arguments, bool log = true);

 /// This function kills a program using his pid (on unix, it uses the kill() POSIX function)
 bool killProgram(uint32 pid);
--- a/code/nel/include/nel/misc/debug.h
+++ b/code/nel/include/nel/misc/debug.h
@ -350,8 +350,10 @@ void	setCrashAlreadyReported(bool state);
 */

 // removed because we always check assert (even in release mode) #if defined (NL_OS_WINDOWS) && defined (NL_DEBUG)
-#if defined (NL_OS_WINDOWS)
-#define NLMISC_BREAKPOINT __debugbreak();
+#if defined(NL_OS_WINDOWS)
+#define NLMISC_BREAKPOINT __debugbreak()
+#elif defined(NL_OS_UNIX) && defined(NL_COMP_GCC)
+#define NLMISC_BREAKPOINT __builtin_trap()
 #else
 #define NLMISC_BREAKPOINT abort()
 #endif
--- a/code/nel/include/nel/misc/dummy_window.h
+++ b/code/nel/include/nel/misc/dummy_window.h
@ -22,6 +22,21 @@

 #ifdef NL_OS_WINDOWS // for win32 os only

+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
+#	define NOMINMAX
+#endif
 #include <windows.h>


--- a/code/nel/include/nel/misc/entity_id.h
+++ b/code/nel/include/nel/misc/entity_id.h
@ -575,8 +575,7 @@ public:
 // Traits for hash_map using CEntityId
 struct CEntityIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CEntityIdHashMapTraits() { }
 	size_t operator() (const NLMISC::CEntityId &id ) const
 	{
--- a/code/nel/include/nel/misc/gtk_displayer.h
+++ b/code/nel/include/nel/misc/gtk_displayer.h
@ -42,11 +42,7 @@ class CGtkDisplayer : public NLMISC::CWindowDisplayer
 {
 public:

-	CGtkDisplayer (const char *displayerName = "") : CWindowDisplayer(displayerName)
-	{
-		needSlashR = false;
-		createLabel ("@Clear|CLEAR");
-	}
+	CGtkDisplayer (const char *displayerName = "");

 	virtual ~CGtkDisplayer ();

--- a/code/nel/include/nel/misc/inter_window_msg_queue.h
+++ b/code/nel/include/nel/misc/inter_window_msg_queue.h
@ -27,6 +27,21 @@
 #include "nel/misc/mem_stream.h"
 #include "nel/misc/dummy_window.h"

+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
+#	define NOMINMAX
+#endif
 #include <windows.h>

 namespace NLMISC
--- a/code/nel/include/nel/misc/p_thread.h
+++ b/code/nel/include/nel/misc/p_thread.h
@ -39,9 +39,9 @@ class CPThread : public IThread
 public:
 	enum TThreadState
 	{
-		ThreadStateNone, 
-		ThreadStateRunning, 
-		ThreadStateFinished, 
+		ThreadStateNone,
+		ThreadStateRunning,
+		ThreadStateFinished,
 	};

 	/// Constructor
--- a/code/nel/include/nel/misc/path.h
+++ b/code/nel/include/nel/misc/path.h
@ -343,7 +343,7 @@ public:
 	/** Adds a search path.
     * The path is a directory "c:/temp" all files in the directory will be included (and recursively if asked)
 	 *
-	 * Alternative directories are not pre-cached (instead of non Alternative files) and will used when a file is not found in the standard directories.
+	 * Alternative directories are not pre-cached (instead of non Alternative files) and will be used when a file is not found in the standard directories.
 	 * For example, local data will be in the cached directories and server repository files will be in the Alternative files. If a new file is not
 	 * found in the local data, we'll try to find it on the repository.
 	 *
--- a/code/nel/include/nel/misc/report.h
+++ b/code/nel/include/nel/misc/report.h
@ -21,25 +21,38 @@

 namespace NLMISC {

-/** Display a custom message box.
+#if FINAL_VERSION
+#define NL_REPORT_SYNCHRONOUS false
+#define NL_REPORT_DEFAULT NLMISC::ReportAbort
+#else
+#define NL_REPORT_SYNCHRONOUS true
+#define NL_REPORT_DEFAULT NLMISC::ReportBreak
+#endif
+
+enum TReportResult
+{
+	// See also crash_report_widget.h EReturnValue
+	ReportAlwaysIgnore = 21,
+	ReportIgnore = 22,
+	ReportAbort = 23,
+	ReportBreak = 24
+};
+
+/** Display a crash report
 *
- * \param title set the title of the report. If empty, it'll display "NeL report".
- * \param header message displayed before the edit text box. If empty, it displays the default message.
- * \param body message displayed in the edit text box. This string will be sent by email.
- * \param debugButton 0 for disabling it, 1 for enable with default behaviors (generate a breakpoint), 2 for enable with no behavior
+ * \param title set the title of the report. If empty, it'll display "NeL report"
+ * \param subject extended title of the report
+ * \param body message displayed in the edit text box. This string will be sent to the crash report tool
+ * \param attachment binary file to attach. This is a filename
+ * \param synchronous use system() and wait for the crash tool exit code, passes -dev flag; otherwise return defaultResult immediately
+ * \param sendReport hide 'dont send' button, or auto enable 'send report' checkbox
 *
- *
- *
- * \return the button clicked or error
+ * \return the button clicked or defaultResult
 */
+TReportResult report(const std::string &title, const std::string &subject, const std::string &body, const std::string &attachment, bool synchronous, bool sendReport, TReportResult defaultResult);

-enum TReportResult { ReportDebug, ReportIgnore, ReportQuit, ReportError };
-
-TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const std::string &attachedFile = "");
-
-/** call this in the main of your appli to enable email: setReportEmailFunction (sendEmail);
- */
-void setReportEmailFunction (void *emailFunction);
+/// Set the Url of the web service used to post crash reports to. String is copied
+void setReportPostUrl(const char *postUrl);

 } // NLMISC

--- a/code/nel/include/nel/misc/sheet_id.h
+++ b/code/nel/include/nel/misc/sheet_id.h
@ -248,8 +248,7 @@ private :
 class CSheetIdHashMapTraits
 {
 public:
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	inline size_t operator() ( const CSheetId& sheetId ) const
 	{
 		return sheetId.asInt() >> 5;
--- a/code/nel/include/nel/misc/sstring.h
+++ b/code/nel/include/nel/misc/sstring.h
@ -937,21 +937,21 @@ inline CSString operator+(const CSString& s0,const CSString& s1)
 */
 inline CSString operator+(char s0,const CSString& s1)
 {
-	return CSString(s0)+s1;
+	return CSString(s0) + s1.c_str();
 }

 inline CSString operator+(const char* s0,const CSString& s1)
 {
-	return CSString(s0)+s1;
+	return CSString(s0) + s1.c_str();
 }

-#ifndef NL_COMP_VC10
+#if !defined(NL_COMP_VC) || (NL_COMP_VC_VERSION <= 100)
 // TODO: check if it can be disabled for other compilers too
 inline CSString operator+(const std::string& s0,const CSString& s1)
 {
 	return s0+static_cast<const std::string&>(s1);
 }
-#endif // NL_COMP_VC10
+#endif

 } // NLMISC

--- a/code/nel/include/nel/misc/string_common.h
+++ b/code/nel/include/nel/misc/string_common.h
@ -264,6 +264,40 @@ inline bool fromString(const std::string &str, bool &val)
 	return true;
 }

+inline bool fromString(const char *str, uint32 &val) { if (strstr(str, "-") != NULL) { val = 0; return false; } char *end; unsigned long v; errno = 0; v = strtoul(str, &end, 10); if (errno || v > UINT_MAX || end == str) { val = 0; return false; } else { val = (uint32)v; return true; } }
+inline bool fromString(const char *str, sint32 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > INT_MAX || v < INT_MIN || end == str) { val = 0; return false; } else { val = (sint32)v; return true; } }
+inline bool fromString(const char *str, uint8 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > UCHAR_MAX || v < 0 || end == str) { val = 0; return false; } else { val = (uint8)v; return true; } }
+inline bool fromString(const char *str, sint8 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > SCHAR_MAX || v < SCHAR_MIN || end == str) { val = 0; return false; } else { val = (sint8)v; return true; } }
+inline bool fromString(const char *str, uint16 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > USHRT_MAX || v < 0 || end == str) { val = 0; return false; } else { val = (uint16)v; return true; } }
+inline bool fromString(const char *str, sint16 &val) { char *end; long v; errno = 0; v = strtol(str, &end, 10); if (errno || v > SHRT_MAX || v < SHRT_MIN || end == str) { val = 0; return false; } else { val = (sint16)v; return true; } }
+inline bool fromString(const char *str, uint64 &val) { bool ret = sscanf(str, "%"NL_I64"u", &val) == 1; if (!ret) val = 0; return ret; }
+inline bool fromString(const char *str, sint64 &val) { bool ret = sscanf(str, "%"NL_I64"d", &val) == 1; if (!ret) val = 0; return ret; }
+inline bool fromString(const char *str, float &val) { bool ret = sscanf(str, "%f", &val) == 1; if (!ret) val = 0.0f; return ret; }
+inline bool fromString(const char *str, double &val) { bool ret = sscanf(str, "%lf", &val) == 1; if (!ret) val = 0.0; return ret; }
+
+inline bool fromString(const char *str, bool &val)
+{
+	switch (str[0])
+	{
+	case '1':
+	case 't':
+	case 'y':
+	case 'T':
+	case 'Y':
+		val = true;
+		return true;
+	case '0':
+	case 'f':
+	case 'n':
+	case 'F':
+	case 'N':
+		val = false;
+		return true;
+	}
+
+	return false;
+}
+
 inline bool fromString(const std::string &str, std::string &val) { val = str; return true; }

 // stl vectors of bool use bit reference and not real bools, so define the operator for bit reference
--- a/code/nel/include/nel/misc/string_mapper.h
+++ b/code/nel/include/nel/misc/string_mapper.h
@ -39,8 +39,7 @@ typedef	const std::string *TStringId;
 // Traits for hash_map using CStringId
 struct CStringIdHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CStringIdHashMapTraits() { }
 	size_t operator() (const NLMISC::TStringId &stringId) const
 	{
--- a/code/nel/include/nel/misc/system_utils.h
+++ b/code/nel/include/nel/misc/system_utils.h
@ -77,6 +77,10 @@ public:

 	/// Get desktop current color depth without using UDriver.
 	static uint getCurrentColorDepth();
+
+	/// Detect whether the current process is a windowed application. Return true if definitely yes, false if unknown
+	static bool detectWindowedApplication();
+
 };

 } // NLMISC
--- a/code/nel/include/nel/misc/types_nl.h
+++ b/code/nel/include/nel/misc/types_nl.h
@ -53,7 +53,10 @@
 #	endif
 #	ifdef _MSC_VER
 #		define NL_COMP_VC
-#		if _MSC_VER >= 1700
+#		if _MSC_VER >= 1800
+#			define NL_COMP_VC12
+#			define NL_COMP_VC_VERSION 120
+#		elif _MSC_VER >= 1700
 #			define NL_COMP_VC11
 #			define NL_COMP_VC_VERSION 110
 #		elif _MSC_VER >= 1600
@ -414,6 +417,12 @@ extern void operator delete[](void *p) throw();
 #	define CHashMap stdext::hash_map
 #	define CHashSet stdext::hash_set
 #	define CHashMultiMap stdext::hash_multimap
+#elif defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 120)
+#	include <hash_map>
+#	include <hash_set>
+#	define CHashMap ::std::hash_map
+#	define CHashSet ::std::hash_set
+#	define CHashMultiMap ::std::hash_multimap
 #elif defined(NL_COMP_GCC) // GCC4
 #	include <ext/hash_map>
 #	include <ext/hash_set>
@ -454,7 +463,11 @@ typedef	uint16	ucchar;

 // To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234)
 #ifdef NL_COMP_VC
-#	if (NL_COMP_VC_VERSION >= 80)
+#	if (NL_COMP_VC_VERSION >= 120)
+#		define INT64_CONSTANT(c)		(c##LL)
+#		define SINT64_CONSTANT(c)	(c##LL)
+#		define UINT64_CONSTANT(c)	(c##ULL)
+#	elif (NL_COMP_VC_VERSION >= 80)
 #		define INT64_CONSTANT(c)	(c##LL)
 #		define SINT64_CONSTANT(c)	(c##LL)
 #		define UINT64_CONSTANT(c)	(c##LL)
--- a/code/nel/include/nel/misc/ucstring.h
+++ b/code/nel/include/nel/misc/ucstring.h
@ -355,8 +355,7 @@ namespace NLMISC
 // Traits for hash_map using CEntityId
 struct CUCStringHashMapTraits
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	CUCStringHashMapTraits() { }
 	size_t operator() (const ucstring &id ) const
 	{
--- a/code/nel/include/nel/misc/win_displayer.h
+++ b/code/nel/include/nel/misc/win_displayer.h
@ -21,8 +21,19 @@

 #ifdef NL_OS_WINDOWS

-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#ifndef NL_COMP_MINGW
+#ifndef WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINDOWS
+#	define _WIN32_WINDOWS 0x0410
+#endif
+#ifndef _WIN32_WINNT
+#	define _WIN32_WINNT 0x0400
+#endif
+#ifndef WINVER
+#	define WINVER 0x0400
+#endif
+#ifndef NOMINMAX
 #	define NOMINMAX
 #endif
 #include <windows.h>
@ -46,11 +57,7 @@ class CWinDisplayer : public NLMISC::CWindowDisplayer
 {
 public:

-	CWinDisplayer (const char *displayerName = "") : CWindowDisplayer(displayerName), Exit(false)
-	{
-		needSlashR = true;
-		createLabel ("@Clear|CLEAR");
-	}
+	CWinDisplayer(const char *displayerName = "");

 	virtual ~CWinDisplayer ();

--- a/code/nel/include/nel/misc/xml_auto_ptr.h
+++ b/code/nel/include/nel/misc/xml_auto_ptr.h
@ -31,7 +31,7 @@ public:
 	~CXMLAutoPtr() { destroy(); }
 	operator const char *() const { return _Value; }
 	operator bool() const { return _Value != NULL; }
-	operator std::string() const { return std::string(_Value); }
+	inline std::string str() const { return _Value; }
 	bool operator ! () const { return _Value == NULL; }
 	operator const unsigned char *() const { return (const unsigned char *)  _Value; }
 	char operator * ()  const { nlassert(_Value); return *_Value; }
--- a/code/nel/include/nel/net/service.h
+++ b/code/nel/include/nel/net/service.h
@ -218,13 +218,13 @@ public:
 	static bool						isServiceInitialized() { return _Instance != NULL; }

 	/// Returns the current service short name (ie: TS)
-	const std::string				&getServiceShortName () const { return _ShortName; };
+	const std::string				&getServiceShortName () const { return _ShortName; }

 	/// Returns the current service long name (ie: test_serivce)
-	const std::string				&getServiceLongName () const { return _LongName; };
+	const std::string				&getServiceLongName () const { return _LongName; }

 	/// Returns the current service alias name setted by AES
-	const std::string				&getServiceAliasName () const { return _AliasName; };
+	const std::string				&getServiceAliasName () const { return _AliasName; }

 	/// Returns the current service unified name that is   alias/short-id or short-id if alias is empty
 	std::string						getServiceUnifiedName () const;
@ -242,10 +242,10 @@ public:
 	uint32							getLaunchingDate () const;

 	/// Return true if this service don't use the NS (naming service)
-	bool							getDontUseNS() const { return _DontUseNS; };
+	bool							getDontUseNS() const { return _DontUseNS; }

 	/// Return true if this service don't use the AES (admin executor service)
-	bool							getDontUseAES() const { return _DontUseAES; };
+	bool							getDontUseAES() const { return _DontUseAES; }

 	/// Returns arguments of the program pass from the user to the program using parameters (ie: "myprog param1 param2")
 	const NLMISC::CVectorSString	&getArgs () const { return _Args; }
--- a/code/nel/include/nel/sound/containers.h
+++ b/code/nel/include/nel/sound/containers.h
@ -42,8 +42,7 @@ namespace NLSOUND {
 template <class Pointer>
 struct THashPtr : public std::unary_function<const Pointer &, size_t>
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };
 	size_t operator () (const Pointer &ptr) const
 	{
 		//CHashSet<uint>::hasher	h;
--- a/code/nel/include/nel/sound/context_sound.h
+++ b/code/nel/include/nel/sound/context_sound.h
@ -82,8 +82,7 @@ struct CContextMatcher

 	struct CHash : public std::unary_function<CContextMatcher, size_t>
 	{
-		static const size_t bucket_size = 4;
-		static const size_t min_buckets = 8;
+		enum { bucket_size = 4, min_buckets = 8, };
 		size_t operator () (const CContextMatcher &patternMatcher) const
 		{
 			return patternMatcher.getHashValue();
--- a/code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
+++ b/code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
@ -543,14 +543,14 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog,
    setMouseTracking(true);
    cols = width;

-    if (withColorDialog)
+	if (withColorDialog)
 	{
 		moreButton = new ColorPickerButton(this);
 		moreButton->setFixedWidth(24);
 		moreButton->setFixedHeight(21);
 		moreButton->setFrameRect(QRect(2, 2, 20, 17));
 		connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
-    }
+	}
 	else
 	{
 		moreButton = 0;
--- a/code/nel/samples/misc/debug/main.cpp
+++ b/code/nel/samples/misc/debug/main.cpp
@ -18,11 +18,16 @@
 #include <stdlib.h>

 // contains all debug features
-#include "nel/misc/debug.h"
+#include <nel/misc/debug.h>
+#include <nel/misc/report.h>

-using namespace NLMISC;
+void repeatederror()
+{
+	// hit always ignore to surpress this error for the duration of the program
+	nlassert(false && "hit always ignore");
+}

-int main (int /* argc */, char ** /* argv */)
+int main(int /* argc */, char ** /* argv */)
 {
 	// all debug functions have different behaviors in debug and in release mode.
 	// in general, in debug mode, all debug functions are active, they display
@ -36,20 +41,24 @@ int main (int /* argc */, char ** /* argv */)
 	// in release mode, this function does nothing by default. you have to add a displayer
 	// manually, or put true in the parameter to say to the function that you want it to
 	// add the default displayers
-	createDebug ();
+	NLMISC::createDebug();
+
+	// enable the crash report tool
+	NLMISC::INelContext::getInstance().setWindowedApplication(true);
+	NLMISC::setReportPostUrl("http://ryzomcore.org/crash_report/");

 	// display debug information, that will be skipped in release mode.
-	nldebug ("nldebug() %d", 1);
+	nldebug("nldebug() %d", 1);

 	// display the string
-	nlinfo ("nlinfo() %d", 2);
+	nlinfo("nlinfo() %d", 2);

 	// when something not normal, but that the program can manage, occurs, call nlwarning()
-	nlwarning ("nlwarning() %d", 3);
+	nlwarning("nlwarning() %d", 3);

 	// nlassert() is like assert but do more powerful things. in release mode, the test is
 	// not executed and nothing will happen. (Press F5 in Visual C++ to continue the execution)
-	nlassert (true == false);
+	nlassert(true == false);

 	// in a switch case or when you want that the program never executes a part of code, use stop.
 	// in release, nlstop does nothing. in debug mode,
@ -61,16 +70,20 @@ int main (int /* argc */, char ** /* argv */)
 	// occurs. (In Visual C++ press F5 to continue)
 	try
 	{
-		nlerror ("nlerror() %d", 4);
+		nlerror("nlerror() %d", 4);
 	}
-	catch(const EFatalError &)
+	catch (const NLMISC::EFatalError &)
 	{
 		// just continue...
-		nlinfo ("nlerror() generated an EFatalError exception, just ignore it");
+		nlinfo("nlerror() generated an EFatalError exception, just ignore it");
 	}

+	// keep repeating the same error
+	for (int i = 0; i < 32; ++i)
+		repeatederror();
+
 	printf("\nPress <return> to exit\n");
-	getchar ();
+	getchar();

 	return EXIT_SUCCESS;
 }
--- a/code/nel/samples/net/udp/bench_service.cpp
+++ b/code/nel/samples/net/udp/bench_service.cpp
@ -98,8 +98,7 @@ struct CClient

 struct TInetAddressHash
 {
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
+	enum { bucket_size = 4, min_buckets = 8, };

 	inline bool operator() (const NLNET::CInetAddress &x1, const NLNET::CInetAddress &x2) const
 	{
--- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@ -1327,6 +1327,10 @@ const D3DFORMAT FinalPixelFormat[ITexture::UploadFormatCount][CDriverD3D::FinalP
 bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable) throw(EBadDisplay)
 {
 	H_AUTO_D3D(CDriver3D_setDisplay);
+
+	if (!mode.OffScreen)
+		NLMISC::INelContext::getInstance().setWindowedApplication(true);
+
 	if (!_D3D)
 		return false;
 #ifndef NL_NO_ASM
@ -1509,9 +1513,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
 		}
 	}

-	
-//	_D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface);
-
 	// Check some caps
 	D3DCAPS9 caps;
 	if (_DeviceInterface->GetDeviceCaps(&caps) == D3D_OK)
--- a/code/nel/src/3d/driver/opengl/CMakeLists.txt
+++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt
@ -67,6 +67,16 @@ IF(UNIX AND NOT APPLE)
    ADD_DEFINITIONS(-DHAVE_XCURSOR)
    TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xcursor_LIB})
  ENDIF(X11_Xcursor_FOUND)
+  IF(X11_Xext_FOUND)
+    TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xext_LIB})
+  ENDIF(X11_Xext_FOUND)
+  # libraries needed to be linked while linking to static X11 libraries
+  FIND_LIBRARY(XCB_LIBRARY
+    NAMES xcb
+    HINTS ${X11_LIB_SEARCH_PATH})
+  IF(XCB_LIBRARY)
+    TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${XCB_LIBRARY})
+  ENDIF(XCB_LIBRARY)
 ENDIF(UNIX AND NOT APPLE)

 IF(WITH_PCH)
--- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
@ -435,11 +435,7 @@ bool CDriverGL::setupDisplay()
 	glViewport(0,0,_CurrentMode.Width,_CurrentMode.Height);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-#ifdef USE_OPENGLES
-	glOrthof(0.f,_CurrentMode.Width,_CurrentMode.Height,0.f,-1.0f,1.0f);
-#else
 	glOrtho(0,_CurrentMode.Width,_CurrentMode.Height,0,-1.0f,1.0f);
-#endif
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 #ifndef USE_OPENGLES
@ -725,11 +721,7 @@ bool CDriverGL::activeFrameBufferObject(ITexture * tex)
 		}
 		else
 		{
-#ifdef USE_OPENGLES
-			nglBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-#else
 			nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-#endif
 			return true;
 		}
 	}
@ -2178,7 +2170,7 @@ void CDriverGL::flush()
 // ***************************************************************************
 void	CDriverGL::setSwapVBLInterval(uint interval)
 {
-	H_AUTO_OGL(CDriverGL_setSwapVBLInterval)
+	H_AUTO_OGL(CDriverGL_setSwapVBLInterval);

 	if (!_Initialized)
 		return;
--- a/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension_def.h
@ -40,6 +40,24 @@ extern "C" {
 #define GL_ADD_SIGNED_EXT GL_ADD_SIGNED
 #define GL_INTERPOLATE_EXT GL_INTERPOLATE
 #define GL_BUMP_ENVMAP_ATI GL_INTERPOLATE
+#define GL_FRAMEBUFFER_EXT GL_FRAMEBUFFER_OES
+#define GL_RENDERBUFFER_EXT GL_RENDERBUFFER_OES
+#define GL_DEPTH24_STENCIL8_EXT GL_DEPTH24_STENCIL8_OES
+#define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
+#define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0_OES
+#define GL_DEPTH_ATTACHMENT_EXT GL_DEPTH_ATTACHMENT_OES
+#define GL_STENCIL_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT_OES
+#define GL_ARRAY_BUFFER_ARB GL_ARRAY_BUFFER
+#define GL_TEXTURE0_ARB GL_TEXTURE0
+
+#define GL_ALPHA8 GL_ALPHA
+#define GL_LUMINANCE8_ALPHA8 GL_LUMINANCE_ALPHA
+#define GL_LUMINANCE8 GL_LUMINANCE
+#define GL_RGBA8 GL_RGBA
+#define GL_RGB8 GL_RGB
+
+#define GL_STATIC_DRAW_ARB GL_STATIC_DRAW
+#define GL_DYNAMIC_DRAW_ARB GL_DYNAMIC_DRAW

 #define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES
 #define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES
@ -48,6 +66,31 @@ extern "C" {
 #define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES
 #define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES

+#define nglGenRenderbuffersEXT nglGenRenderbuffersOES
+#define nglBindRenderbufferEXT nglBindRenderbufferOES
+#define nglDeleteRenderbuffersEXT nglDeleteRenderbuffersOES
+#define nglRenderbufferStorageEXT nglRenderbufferStorageOES
+#define nglGenFramebuffersEXT nglGenFramebuffersOES
+#define nglBindFramebufferEXT nglBindFramebufferOES
+#define nglFramebufferTexture2DEXT nglFramebufferTexture2DOES
+#define nglFramebufferRenderbufferEXT nglFramebufferRenderbufferOES
+#define nglCheckFramebufferStatusEXT nglCheckFramebufferStatusOES
+#define nglDeleteBuffersARB glDeleteBuffers
+#define nglIsBufferARB glIsBuffer
+#define nglDeleteRenderbuffersEXT nglDeleteRenderbuffersOES
+#define nglBindFramebufferEXT nglBindFramebufferOES
+#define nglDeleteFramebuffersEXT nglDeleteFramebuffersOES
+#define nglUnmapBufferARB nglUnmapBufferOES
+#define nglActiveTextureARB glActiveTexture
+#define nglClientActiveTextureARB glClientActiveTexture
+#define nglBindBufferARB glBindBuffer
+#define nglGenBuffersARB glGenBuffers
+#define nglBufferDataARB glBufferData
+
+#define glFrustum glFrustumf
+#define glOrtho glOrthof
+#define glDepthRange glDepthRangef
+
 #else

 #if defined(NL_OS_MAC)
--- a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
@ -403,7 +403,7 @@ bool CDriverGL::setupMaterial(CMaterial& mat)
 	// Must setup textures each frame. (need to test if touched).
 	// Must separate texture setup and texture activation in 2 "for"...
 	// because setupTexture() may disable all stage.
-	if (matShader != CMaterial::Water 
+	if (matShader != CMaterial::Water
 		&& ((matShader != CMaterial::Program) || (_LastSetuppedPP->features().MaterialFlags & CProgramFeatures::TextureStages))
 		)
 	{
--- a/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
@ -37,19 +37,11 @@ void CDriverGL::setFrustum(float left, float right, float bottom, float top, flo

 	if (perspective)
 	{
-#ifdef USE_OPENGLES
-		glFrustumf(left,right,bottom,top,znear,zfar);
-#else
 		glFrustum(left,right,bottom,top,znear,zfar);
-#endif
 	}
 	else
 	{
-#ifdef USE_OPENGLES
-		glOrthof(left,right,bottom,top,znear,zfar);
-#else
 		glOrtho(left,right,bottom,top,znear,zfar);
-#endif
 	}

 	_ProjMatDirty = true;
--- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
@ -155,11 +155,7 @@ void			CDriverGLStates::forceDefaults(uint nbStages)
 	for(stage=0;stage<nbStages; stage++)
 	{
 		// disable texturing.
-#ifdef USE_OPENGLES
-		glActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif

 		glDisable(GL_TEXTURE_2D);

@ -188,13 +184,8 @@ void			CDriverGLStates::forceDefaults(uint nbStages)
 	}

 	// ActiveTexture current texture to 0.
-#ifdef USE_OPENGLES
-	glActiveTexture(GL_TEXTURE0);
-	glClientActiveTexture(GL_TEXTURE0);
-#else
 	nglActiveTextureARB(GL_TEXTURE0_ARB);
 	nglClientActiveTextureARB(GL_TEXTURE0_ARB);
-#endif

 	_CurrentActiveTextureARB= 0;
 	_CurrentClientActiveTextureARB= 0;
@ -622,11 +613,7 @@ void CDriverGLStates::updateDepthRange()

 	float delta = _ZBias * (_DepthRangeFar - _DepthRangeNear);

-#ifdef USE_OPENGLES
-	glDepthRangef(delta + _DepthRangeNear, delta + _DepthRangeFar);
-#else
 	glDepthRange(delta + _DepthRangeNear, delta + _DepthRangeFar);
-#endif
 }

 // ***************************************************************************
@ -767,7 +754,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 		{
 			glDisable(GL_TEXTURE_2D);
 		}
-		else if(oldTexMode == TextureRect)
+		else if (oldTexMode == TextureRect)
 		{
 #ifndef USE_OPENGLES
 			if(_TextureRectangleSupported)
@ -780,7 +767,7 @@ void			CDriverGLStates::setTextureMode(TTextureMode texMode)
 				glDisable(GL_TEXTURE_2D);
 			}
 		}
-		else if(oldTexMode == TextureCubeMap)
+		else if (oldTexMode == TextureCubeMap)
 		{
 			if(_TextureCubeMapSupported)
 			{
@ -835,11 +822,7 @@ void			CDriverGLStates::activeTextureARB(uint stage)

 	if( _CurrentActiveTextureARB != stage )
 	{
-#ifdef USE_OPENGLES
-		glActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif

 		_CurrentActiveTextureARB= stage;
 	}
@ -850,11 +833,7 @@ void			CDriverGLStates::forceActiveTextureARB(uint stage)
 {
 	H_AUTO_OGL(CDriverGLStates_forceActiveTextureARB);

-#ifdef USE_OPENGLES
-	glActiveTexture(GL_TEXTURE0+stage);
-#else
 	nglActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif

 	_CurrentActiveTextureARB= stage;
 }
@ -958,11 +937,7 @@ void			CDriverGLStates::clientActiveTextureARB(uint stage)

 	if( _CurrentClientActiveTextureARB != stage )
 	{
-#ifdef USE_OPENGLES
-		glClientActiveTexture(GL_TEXTURE0+stage);
-#else
 		nglClientActiveTextureARB(GL_TEXTURE0_ARB+stage);
-#endif
 		_CurrentClientActiveTextureARB= stage;
 	}
 }
@ -1121,11 +1096,7 @@ void CDriverGLStates::forceBindARBVertexBuffer(uint objectID)
 {
 	H_AUTO_OGL(CDriverGLStates_forceBindARBVertexBuffer)

-#ifdef USE_OPENGLES
-	glBindBuffer(GL_ARRAY_BUFFER, objectID);
-#else
 	nglBindBufferARB(GL_ARRAY_BUFFER_ARB, objectID);
-#endif

 	_CurrARBVertexBuffer = objectID;
 }
--- a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
@ -93,19 +93,6 @@ CTextureDrvInfosGL::~CTextureDrvInfosGL()
 	{
 		_Driver->_TextureUsed[TextureUsedIdx] = NULL;
 	}
-
-#ifdef USE_OPENGLES
-	if (InitFBO)
-	{
-		nglDeleteFramebuffersOES(1, &FBOId);
-		if(AttachDepthStencil)
-		{
-			nglDeleteRenderbuffersOES(1, &DepthFBOId);
-			if(!UsePackedDepthStencil)
-				nglDeleteRenderbuffersOES(1, &StencilFBOId);
-		}
-	}
-#endif
 }

 CDepthStencilFBO::CDepthStencilFBO(CDriverGL *driver, uint width, uint height)
@ -175,56 +162,9 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 			AttachDepthStencil = !((CTextureBloom*)tex)->isMode2D();
 		}

-#ifdef USE_OPENGLES
-		// generate IDs
-		nglGenFramebuffersOES(1, &FBOId);
-		if(AttachDepthStencil)
-		{
-			nglGenRenderbuffersOES(1, &DepthFBOId);
-			if(UsePackedDepthStencil)
-				StencilFBOId = DepthFBOId;
-			else
-				nglGenRenderbuffersOES(1, &StencilFBOId);
-		}
-
-		//nldebug("3D: using depth %d and stencil %d", DepthFBOId, StencilFBOId);
-
-		// initialize FBO
-		nglBindFramebufferOES(GL_FRAMEBUFFER_OES, FBOId);
-		nglFramebufferTexture2DOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, TextureMode, ID, 0);
-
-		// attach depth/stencil render to FBO
-		// note: for some still unkown reason it's impossible to add
-		// a stencil buffer as shown in the respective docs (see
-		// opengl.org extension registry). Until a safe approach to add
-		// them is found, there will be no attached stencil for the time
-		// being, aside of using packed depth+stencil buffers.
-		if(AttachDepthStencil)
-		{
-			if(UsePackedDepthStencil)
-			{
-				//nldebug("3D: using packed depth stencil");
-				nglBindRenderbufferOES(GL_RENDERBUFFER_OES, StencilFBOId);
-				nglRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH24_STENCIL8_OES, tex->getWidth(), tex->getHeight());
-			}
-			else
-			{
-				nglBindRenderbufferOES(GL_RENDERBUFFER_OES, DepthFBOId);
-				nglRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH_COMPONENT24_OES, tex->getWidth(), tex->getHeight());
-				/*
-				nglBindRenderbufferEXT(GL_RENDERBUFFER_OES, StencilFBOId);
-				nglRenderbufferStorageEXT(GL_RENDERBUFFER_OES, GL_STENCIL_INDEX8_EXT, tex->getWidth(), tex->getHeight());
-				*/
-			}
-			nglFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, DepthFBOId);
-			nldebug("3D: glFramebufferRenderbufferExt(depth:24) = %X", nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-			nglFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_STENCIL_ATTACHMENT_OES, GL_RENDERBUFFER_OES, StencilFBOId);
-			nldebug("3D: glFramebufferRenderbufferExt(stencil:8) = %X", nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-		}
-#else
 		// generate IDs
 		nglGenFramebuffersEXT(1, &FBOId);
-		
+
 		//nldebug("3D: using depth %d and stencil %d", DepthFBOId, StencilFBOId);

 		// initialize FBO
@ -253,15 +193,10 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 										 GL_RENDERBUFFER_EXT, DepthStencilFBO->StencilFBOId);
 			nldebug("3D: glFramebufferRenderbufferExt(stencil:8) = %X", nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
 		}
-#endif

 		// check status
-		GLenum status;
-#ifdef USE_OPENGLES
-		status = (GLenum) nglCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES);
-#else
-		status = (GLenum) nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-#endif
+		GLenum status = (GLenum) nglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+
 		switch(status) {
 #ifdef GL_FRAMEBUFFER_COMPLETE_EXT
 			case GL_FRAMEBUFFER_COMPLETE_EXT:
@ -361,11 +296,8 @@ bool CTextureDrvInfosGL::initFrameBufferObject(ITexture * tex)
 		// clean up resources if allocation failed
 		if (!InitFBO)
 		{
-#ifdef USE_OPENGLES
-			nglDeleteFramebuffersOES(1, &FBOId);
-#else
 			nglDeleteFramebuffersEXT(1, &FBOId);
-#endif
+
 			if (AttachDepthStencil)
 			{
 				DepthStencilFBO = NULL;
@ -385,22 +317,14 @@ bool CTextureDrvInfosGL::activeFrameBufferObject(ITexture * tex)
 		if(initFrameBufferObject(tex))
 		{
 			glBindTexture(TextureMode, 0);
-#ifdef USE_OPENGLES
-			nglBindFramebufferOES(GL_FRAMEBUFFER_OES, FBOId);
-#else
 			nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, FBOId);
-#endif
 		}
 		else
 			return false;
 	}
 	else
 	{
-#ifdef USE_OPENGLES
-		nglBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
-#else
 		nglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-#endif
 	}

 	return true;
@ -508,11 +432,7 @@ GLint	CDriverGL::getGlTextureFormat(ITexture& tex, bool &compressed)
 		break;
 	}

-#ifdef USE_OPENGLES
-	return GL_RGBA;
-#else
 	return GL_RGBA8;
-#endif
 }

 // ***************************************************************************
@ -521,11 +441,7 @@ static GLint	getGlSrcTextureFormat(ITexture &tex, GLint glfmt)
 	H_AUTO_OGL(getGlSrcTextureFormat)

 	// Is destination format is alpha or lumiance ?
-#ifdef USE_OPENGLES
-	if ((glfmt==GL_ALPHA)||(glfmt==GL_LUMINANCE_ALPHA)||(glfmt==GL_LUMINANCE))
-#else
 	if ((glfmt==GL_ALPHA8)||(glfmt==GL_LUMINANCE8_ALPHA8)||(glfmt==GL_LUMINANCE8))
-#endif
 	{
 		switch(tex.getPixelFormat())
 		{
@ -578,19 +494,9 @@ uint				CDriverGL::computeMipMapMemoryUsage(uint w, uint h, GLint glfmt) const
 	H_AUTO_OGL(CDriverGL_computeMipMapMemoryUsage)
 	switch(glfmt)
 	{
-#ifdef GL_RGBA8
 	case GL_RGBA8:		return w*h* 4;
-#endif
-#ifdef GL_RGBA
-	case GL_RGBA:		return w*h* 4;
-#endif
 	// Well this is ugly, but simple :). GeForce 888 is stored as 32 bits.
-#ifdef GL_RGB8
 	case GL_RGB8:		return w*h* 4;
-#endif
-#ifdef GL_RGB
-	case GL_RGB:		return w*h* 4;
-#endif
 #ifdef GL_RGBA4
 	case GL_RGBA4:		return w*h* 2;
 #endif
@ -600,24 +506,9 @@ uint				CDriverGL::computeMipMapMemoryUsage(uint w, uint h, GLint glfmt) const
 #ifdef GL_RGB5
 	case GL_RGB5:		return w*h* 2;
 #endif
-#ifdef GL_LUMINANCE8
 	case GL_LUMINANCE8:	return w*h* 1;
-#endif
-#ifdef GL_LUMINANCE
-	case GL_LUMINANCE:	return w*h* 1;
-#endif
-#ifdef GL_ALPHA8
 	case GL_ALPHA8:		return w*h* 1;
-#endif
-#ifdef GL_ALPHA
-	case GL_ALPHA:		return w*h* 1;
-#endif
-#ifdef GL_LUMINANCE8_ALPHA8
 	case GL_LUMINANCE8_ALPHA8:	return w*h* 2;
-#endif
-#ifdef GL_LUMINANCE_ALPHA
-	case GL_LUMINANCE_ALPHA:	return w*h* 2;
-#endif
 #ifdef GL_COMPRESSED_RGB_S3TC_DXT1_EXT
 	case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:	return w*h /2;
 #endif
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
@ -1216,11 +1216,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	GLuint vertexBufferID;
 	glGetError();

-#ifdef USE_OPENGLES
-	glGenBuffers(1, &vertexBufferID);
-#else
 	nglGenBuffersARB(1, &vertexBufferID);
-#endif

 	if (glGetError() != GL_NO_ERROR) return NULL;
 	_Driver->_DriverGLStates.forceBindARBVertexBuffer(vertexBufferID);
@ -1229,7 +1225,8 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	{
 		case CVertexBuffer::AGPVolatile:
 #ifdef USE_OPENGLES
-			glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STREAM_DRAW);
+			// TODO: GL_STREAM_DRAW doesn't exist in OpenGL ES 1.x
+			glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
 #else
 			nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STREAM_DRAW_ARB);
 #endif
@ -1259,11 +1256,7 @@ IVertexBufferHardGL *CVertexArrayRangeARB::createVBHardGL(uint size, CVertexBuff
 	}
 	if (glGetError() != GL_NO_ERROR)
 	{
-#ifdef USE_OPENGLES
-		glDeleteBuffers(1, &vertexBufferID);
-#else
 		nglDeleteBuffersARB(1, &vertexBufferID);
-#endif

 		return NULL;
 	}
@ -1306,13 +1299,10 @@ void CVertexArrayRangeARB::updateLostBuffers()
 		{
 			nlassert((*it)->_VertexObjectId);
 			GLuint id = (GLuint) (*it)->_VertexObjectId;
-#ifdef USE_OPENGLES
-			nlassert(glIsBuffer(id));
-			glDeleteBuffers(1, &id);
-#else
+
 			nlassert(nglIsBufferARB(id));
 			nglDeleteBuffersARB(1, &id);
-#endif
+
 			(*it)->_VertexObjectId = 0;
 			(*it)->VB->setLocation(CVertexBuffer::NotResident);
 		}
@ -1361,13 +1351,8 @@ CVertexBufferHardARB::~CVertexBufferHardARB()
 	if (_VertexObjectId)
 	{
 		GLuint id = (GLuint) _VertexObjectId;
-#ifdef USE_OPENGLES
-		nlassert(glIsBuffer(id));
-		glDeleteBuffers(1, &id);
-#else
 		nlassert(nglIsBufferARB(id));
 		nglDeleteBuffersARB(1, &id);
-#endif
 	}
 	if (_VertexArrayRange)
 	{
@ -1412,12 +1397,7 @@ void *CVertexBufferHardARB::lock()
 		}
 		// recreate a vb
 		GLuint vertexBufferID;
-
-#ifdef USE_OPENGLES
-		glGenBuffers(1, &vertexBufferID);
-#else
 		nglGenBuffersARB(1, &vertexBufferID);
-#endif

 		if (glGetError() != GL_NO_ERROR)
 		{
@ -1429,42 +1409,30 @@ void *CVertexBufferHardARB::lock()
 		{
 			case CVertexBuffer::AGPVolatile:
 #ifdef USE_OPENGLES
-				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STREAM_DRAW);
+				// TODO: GL_STREAM_DRAW doesn't exist in OpenGL ES 1.x
+				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
 #else
 				nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STREAM_DRAW_ARB);
 #endif
 			break;
 			case CVertexBuffer::StaticPreferred:
 				if (_Driver->getStaticMemoryToVRAM())
-#ifdef USE_OPENGLES
-					glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_STATIC_DRAW);
-#else
 					nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STATIC_DRAW_ARB);
-#endif
 				else
-#ifdef USE_OPENGLES
-					glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
-#else
 					nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
-#endif
 			break;
 			// case CVertexBuffer::AGPPreferred:
 			default:
-#ifdef USE_OPENGLES
-				glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW);
-#else
 				nglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
-#endif
+
 			break;
 		}
 		if (glGetError() != GL_NO_ERROR)
 		{
 			_Driver->incrementResetCounter();
-#ifdef USE_OPENGLES
-			glDeleteBuffers(1, &vertexBufferID);
-#else
+
 			nglDeleteBuffersARB(1, &vertexBufferID);
-#endif
+
 			return &_DummyVB[0];;
 		}
 		_VertexObjectId = vertexBufferID;
@ -1567,12 +1535,10 @@ void CVertexBufferHardARB::unlock()

 #ifdef USE_OPENGLES
 	if (_Driver->_Extensions.OESMapBuffer)
-	{
-		unmapOk = nglUnmapBufferOES(GL_ARRAY_BUFFER);
-	}
-#else
-	unmapOk = nglUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
 #endif
+	{
+		unmapOk = nglUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
+	}

 	#ifdef NL_DEBUG
 		_Unmapping = false;
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
@ -453,7 +453,6 @@ bool CDriverGL::setupEXTVertexShader(const CVPParser::TProgram &program, GLuint
 	// clear last error
 	GLenum glError = glGetError();

-	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
 	//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);

 	// allocate the symbols
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@ -603,6 +603,9 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 {
 	H_AUTO_OGL(CDriverGL_setDisplay)

+	if (!mode.OffScreen)
+		NLMISC::INelContext::getInstance().setWindowedApplication(true);
+
 	_win = EmptyWindow;

 	_CurrentMode = mode;
@ -627,10 +630,15 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 	// Offscreen mode ?
 	if (_CurrentMode.OffScreen)
 	{
-#if 0
-		if (!createWindow(mode))
-			return false;
+		if (!createWindow(mode)) return false;

+		HWND tmpHWND = _win;
+		int width = mode.Width;
+		int height = mode.Height;
+
+#ifdef USE_OPENGLES
+		// TODO: implement for OpenGL ES 1.x
+#else
 		// resize the window
 		RECT rc;
 		SetRect (&rc, 0, 0, width, height);
@ -1437,8 +1445,17 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 #ifdef NL_OS_WINDOWS

 	// create the OpenGL window
-	window = CreateWindowW(L"NLClass", L"NeL Window", WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|WS_CLIPSIBLINGS,
-		CW_USEDEFAULT, CW_USEDEFAULT, mode.Width, mode.Height, HWND_DESKTOP, NULL, GetModuleHandle(NULL), NULL);
+	DWORD dwStyle = WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN|WS_CLIPSIBLINGS;
+	int pos = CW_USEDEFAULT;
+	HWND hwndParent = HWND_DESKTOP;
+	if (mode.OffScreen)
+	{
+		dwStyle &= ~WS_VISIBLE;
+		pos = 0;
+		hwndParent = NULL;
+	}
+	window = CreateWindowW(L"NLClass", L"NeL Window", dwStyle, 
+		pos, pos, mode.Width, mode.Height, hwndParent, NULL, GetModuleHandle(NULL), NULL);

 	if (window == EmptyWindow)
 	{
@ -1469,7 +1486,7 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 		[[CocoaApplicationDelegate alloc] initWithDriver:this];

 	// set the application delegate, this will handle window/app close events
-	[NSApp setDelegate:appDelegate];
+	[NSApp setDelegate:(id<NSFileManagerDelegate>)appDelegate];

 	// bind the close button of the window to applicationShouldTerminate
 	id closeButton = [cocoa_window standardWindowButton:NSWindowCloseButton];
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
@ -270,28 +270,14 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 		return false;
 	}

-	// first event about mouse movement after setting to emulateRawMode
-	if(_setToEmulateRawMode &&
-		(event.type == NSMouseMoved || 
-		event.type == NSLeftMouseDragged || 
-		event.type == NSRightMouseDragged))
-	{
-		// do not report because it reflects wrapping pointer to 0.5/0.5 
-		_setToEmulateRawMode = false;
-		return false;
-	}
-
 	// convert the modifiers for nel to pass them with the events
-	NLMISC::TKeyButton modifiers =
-		modifierFlagsToNelKeyButton([event modifierFlags]);
+	NLMISC::TKeyButton modifiers = modifierFlagsToNelKeyButton([event modifierFlags]);

 	switch(event.type)
 	{
 	case NSLeftMouseDown:
 	{
-		server->postEvent(new NLMISC::CEventMouseDown(
-			mousePos.x, mousePos.y,
-			(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
+		server->postEvent(new NLMISC::CEventMouseDown(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
 	}
 	break;
 	case NSLeftMouseUp:
@ -319,15 +305,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;

-		// when emulating raw mode, send the delta in a CGDMouseMove event
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(
-				mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers, this);
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers, this);

 		server->postEvent(nelEvent);
 		break;
@ -336,15 +314,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;

-		// when emulating raw mode, send the delta in a CGDMouseMove event
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
-				(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this);
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this);

 		server->postEvent(nelEvent);
 		break;
@ -353,15 +323,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	{
 		NLMISC::CEvent* nelEvent;

-		// when emulating raw mode, send the delta in a CGDMouseMove event
-		if(_emulateRawMode)
-			nelEvent = new NLMISC::CGDMouseMove(
-				this, NULL /* no mouse device */, event.deltaX, -event.deltaY);
-
-		// normally send position in a CEventMouseMove
-		else
-			nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
-				(NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this);
+		nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y, (NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this);

 		server->postEvent(nelEvent);
 		break;
@ -434,12 +396,6 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
 	}
 	}

-	if(_emulateRawMode && _driver && (event.type == NSMouseMoved || 
-		event.type == NSLeftMouseDragged || event.type == NSRightMouseDragged)) 
-	{
-		_driver->setMousePos(0.5, 0.5);
-	}
-
 	return true;
 }

@ -492,17 +448,4 @@ void CCocoaEventEmitter::submitEvents(CEventServer& server, bool /* allWins */)
 	_server = &server;
 }

-void CCocoaEventEmitter::emulateMouseRawMode(bool enable)
-{
-	_emulateRawMode = enable;
-	
-	if(_emulateRawMode)
-	{
-		_setToEmulateRawMode = true;
-		
-		if(_driver)
-			_driver->setMousePos(0.5, 0.5);
-	}
-}
-
 }
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
+++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.h
@ -31,8 +31,6 @@ namespace NLMISC

 class CCocoaEventEmitter : public IEventEmitter
 {
-	bool             _emulateRawMode;
-	bool             _setToEmulateRawMode;
 	bool             _eventLoop;
 	NL3D::IDriver*   _driver;
 	CocoaOpenGLView* _glView;
@ -42,8 +40,6 @@ class CCocoaEventEmitter : public IEventEmitter

 public:
 	CCocoaEventEmitter() :
-		_emulateRawMode(false),
-		_setToEmulateRawMode(false),
 		_driver(NULL),
 		_glView(nil),
 		_server(NULL) { }
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.h
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.h
@ -100,7 +100,6 @@ private:
 	std::map<TKey, bool>	_PressedKeys;
 	XIM						_im;
 	XIC						_ic;
-	bool					_emulateRawMode;
 	NL3D::IDriver*			_driver;
 	CUnixEventServer		_InternalServer;
 	ucstring				_CopiedString;
--- a/code/nel/src/3d/landscape.cpp
+++ b/code/nel/src/3d/landscape.cpp
@ -583,7 +583,6 @@ void			CLandscape::setDriver(IDriver *drv)
 		// Does the driver has sufficient requirements for Vegetable???
 		// only if VP supported by GPU, and Only if max vertices allowed.
 		_DriverOkForVegetable = _VertexShaderOk && (_Driver->getMaxVerticesByVertexBufferHard()>=(uint)NL3D_LANDSCAPE_VEGETABLE_MAX_AGP_VERTEX_MAX);
-
 	}
 }

--- a/code/nel/src/3d/landscapevb_allocator.cpp
+++ b/code/nel/src/3d/landscapevb_allocator.cpp
@ -611,7 +611,6 @@ void			CLandscapeVBAllocator::setupVBFormatAndVertexProgram(bool withVertexProgr
 			nlverify(_Driver->compileVertexProgram(_VertexProgram[1]));
 		}
 	}
-
 }


--- a/code/nel/src/3d/meshvp_wind_tree.cpp
+++ b/code/nel/src/3d/meshvp_wind_tree.cpp
@ -392,7 +392,6 @@ bool	CMeshVPWindTree::begin(IDriver *driver, CScene *scene, CMeshBaseInstance *m
 	sint	numPls= renderTrav->getNumVPLights()-1;
 	clamp(numPls, 0, CRenderTrav::MaxVPLight-1);

-
 	// Enable normalize only if requested by user. Because lighting don't manage correct "scale lighting"
 	uint	idVP= (SpecularLighting?2:0) + (driver->isForceNormalize()?1:0) ;
 	// correct VP id for correct unmber of pls.
@ -523,7 +522,7 @@ void	CMeshVPWindTree::beginMBRInstance(IDriver *driver, CScene *scene, CMeshBase
 	idVP = numPls*4 + idVP;

 	// re-activate VP if idVP different from last setup
-	if(idVP != _LastMBRIdVP)
+	if (idVP != _LastMBRIdVP)
 	{
 		_LastMBRIdVP= idVP;
 		driver->activeVertexProgram(_VertexProgram[_LastMBRIdVP]);
--- a/code/nel/src/3d/scene.cpp
+++ b/code/nel/src/3d/scene.cpp
@ -158,7 +158,7 @@ CScene::CScene(bool bSmallScene) : LightTrav(bSmallScene)

 	_MaxSkeletonsInNotCLodForm= 20;

-	_FilterRenderFlags= std::numeric_limits<uint32>::max();
+	_FilterRenderFlags = std::numeric_limits<uint32>::max();

 	_NextRenderProfile= false;

@ -592,11 +592,9 @@ void	CScene::renderPart(UScene::TRenderPart rp, bool	doHrcPass, bool doTrav, boo
 		//
 		nlassert(CurrentCamera);

-
 		// update models.
 		updateModels();

-
 		// Use the camera to setup Clip / Render pass.
 		float left, right, bottom, top, znear, zfar;
 		CurrentCamera->getFrustum(left, right, bottom, top, znear, zfar);
--- a/code/nel/src/3d/shadow_map_manager.cpp
+++ b/code/nel/src/3d/shadow_map_manager.cpp
@ -244,7 +244,7 @@ void			CShadowMapManager::addShadowReceiver(CTransform *model)
 void			CShadowMapManager::renderGenerate(CScene *scene)
 {
 	H_AUTO( NL3D_ShadowManager_Generate );
-	
+
 	// Each frame, do a small garbage collector for unused free textures.
 	garbageShadowTextures(scene);

--- a/code/nel/src/3d/transform.cpp
+++ b/code/nel/src/3d/transform.cpp
@ -113,7 +113,7 @@ CTransform::CTransform()
 	_StateFlags= IsOpaque | IsUserLightable;

 	// By default, always allow rendering of Transform Models.
-	_RenderFilterType= std::numeric_limits<uint32>::max();
+	_RenderFilterType = std::numeric_limits<uint32>::max();

 	// By default, don't suport fast intersection detection
 	_SupportFastIntersect= false;
--- a/code/nel/src/3d/water_pool_manager.cpp
+++ b/code/nel/src/3d/water_pool_manager.cpp
@ -44,19 +44,19 @@ NLMISC_COMMAND(setWaterPool, "Setup a pool of water in the water pool manager",
 	}
 	if (numArgs == 3)
 	{
-		whmb.FilterWeight = ::atof(args[2].c_str());
+		NLMISC::fromString(args[2], whmb.FilterWeight);
 	}
 	if (numArgs == 4)
 	{
-		whmb.UnitSize = ::atof(args[3].c_str());
+		NLMISC::fromString(args[3], whmb.UnitSize);
 	}
 	if (numArgs == 5)
 	{
-		whmb.WaveIntensity = ::atof(args[4].c_str());
+		NLMISC::fromString(args[4], whmb.WaveIntensity);
 	}
 	if (numArgs == 4)
 	{
-		whmb.WavePeriod = ::atof(args[5].c_str());
+		NLMISC::fromString(args[5], whmb.WavePeriod);
 	}
 	// create the water pool
 	GetWaterPoolManager().createWaterPool(whmb);
--- a/code/nel/src/3d/zone_search.cpp
+++ b/code/nel/src/3d/zone_search.cpp
@ -73,7 +73,7 @@ pair<string, uint32> CZoneSearch::getZoneName(uint x, uint y, uint cx, uint cy)

 	sprintf(name, "%d_%c%c.zonel", zoneY, firstLetter, secondLetter);

-	return make_pair<string, uint32>(string(name), distance);
+	return std::pair<string, uint32>(string(name), distance);
 }


--- a/code/nel/src/georges/form_dfn.cpp
+++ b/code/nel/src/georges/form_dfn.cpp
@ -707,7 +707,7 @@ bool CFormDfn::getEntryIndexByName (uint &entry, const	std::string &name) const
 		}
 		entryIndex++;
 	}
-	entry=std::numeric_limits<uint>::max();
+	entry = std::numeric_limits<uint>::max();
 	return	false;
 }

--- a/code/nel/src/gui/CMakeLists.txt
+++ b/code/nel/src/gui/CMakeLists.txt
@ -6,7 +6,7 @@ SOURCE_GROUP("src" FILES ${SRC})

 NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})

-INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})

 TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBWWW_LIBRARIES} ${CURL_LIBRARIES})
 SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
--- a/code/nel/src/gui/ctrl_base_button.cpp
+++ b/code/nel/src/gui/ctrl_base_button.cpp
@ -701,6 +701,11 @@ namespace NLGUI
 					//pIM->submitEvent ("button_click:"+getId());
 				}
 				*/
+
+				// top-right corner is EventX=0, EventY=0
+				_EventX = eventDesc.getX() - _XReal;
+				_EventY = (_YReal + _HReal) - eventDesc.getY();
+
 				runLeftClickAction();
 				if (CWidgetManager::getInstance()->getCapturePointerLeft() == NULL) return true; // event handler may release cpature from this object (if it is removed for example)

--- a/code/nel/src/gui/ctrl_scroll.cpp
+++ b/code/nel/src/gui/ctrl_scroll.cpp
@ -519,17 +519,17 @@ namespace NLGUI

 		// Read Action handlers
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscroll" );
-		if (prop)	_AHOnScroll = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScroll = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"params" );
 		if (prop)	_AHOnScrollParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollend" );
-		if (prop)	_AHOnScrollEnd = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScrollEnd = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"end_params" );
 		if (prop)	_AHOnScrollEndParams = string((const char*)prop);
 		//
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onscrollcancel" );
-		if (prop)	_AHOnScrollCancel = NLMISC::strlwr(prop);
+		if (prop)	_AHOnScrollCancel = NLMISC::strlwr(prop.str());
 		prop = (char*) xmlGetProp( node, (xmlChar*)"cancel_params" );
 		if (prop)	_AHOnScrollCancelParams = string((const char*)prop);

@ -538,9 +538,9 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( node, (xmlChar*)"target" );
 		if (prop)
 		{
-			CInterfaceGroup	*group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(prop));
+			CInterfaceGroup	*group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(prop.str()));
 			if(group == NULL)
-				group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(this->getId(), prop));
+				group = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(this->getId(), prop.str()));

 			if(group != NULL)
 				setTarget (group);
--- a/code/nel/src/gui/dbgroup_combo_box.cpp
+++ b/code/nel/src/gui/dbgroup_combo_box.cpp
@ -268,7 +268,7 @@ namespace NLGUI
 	void	CDBGroupComboBox::addText(const ucstring &text)
 	{
 		dirt();
-		_Texts.push_back(make_pair(_Texts.size(), text));
+		_Texts.push_back(make_pair((uint)_Texts.size(), text));
 		_Textures.push_back(std::string());
 	}

@ -330,7 +330,7 @@ namespace NLGUI
 	}

 	// ***************************************************************************
-	const uint		&CDBGroupComboBox::getTextId(uint i) const
+	uint CDBGroupComboBox::getTextId(uint i) const
 	{
 		static	uint	null = 0;
 		if(i<_Texts.size())
--- a/code/nel/src/gui/group_editbox.cpp
+++ b/code/nel/src/gui/group_editbox.cpp
@ -999,7 +999,8 @@ namespace NLGUI
 			break;
 			// OTHER
 			default:
-				if ((rEDK.getChar() == KeyRETURN) && !_WantReturn)
+				bool isKeyRETURN = !rEDK.getKeyCtrl() && rEDK.getChar() == KeyRETURN;
+				if (isKeyRETURN && !_WantReturn)
 				{
 					// update historic.
 					if(_MaxHistoric)
@ -1030,9 +1031,9 @@ namespace NLGUI
 					// If the char is not alphanumeric -> return.
 					//		if(!isalnum(ec.Char))
 					//			return
-					if( (rEDK.getChar()>=32) || (rEDK.getChar() == KeyRETURN) )
+					if( (rEDK.getChar()>=32) || isKeyRETURN )
 					{
-						if (rEDK.getChar() == KeyRETURN)
+						if (isKeyRETURN)
 						{
 							ucstring	copyStr= _InputString;
 							if ((uint) std::count(copyStr.begin(), copyStr.end(), '\n') >= _MaxNumReturn)
@ -1049,7 +1050,7 @@ namespace NLGUI
 							cutSelection();
 						}

-						ucchar c = (rEDK.getChar() == KeyRETURN)?'\n':rEDK.getChar();
+						ucchar c = isKeyRETURN ? '\n' : rEDK.getChar();
 						if (isFiltered(c)) return;
 						switch(_EntryType)
 						{
@ -1128,7 +1129,7 @@ namespace NLGUI
 							++ _CursorPos;
 							triggerOnChangeAH();
 						}
-						if (rEDK.getChar() == KeyRETURN)
+						if (isKeyRETURN)
 						{
 							CAHManager::getInstance()->runActionHandler(_AHOnEnter, this, _AHOnEnterParams);
 						}
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@ -1217,7 +1217,7 @@ namespace NLGUI
 								normal = value[MY_HTML_INPUT_SRC];

 							// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
-							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name;
+							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name + "|submit_button_type=image";

 							// Add the ctrl button
 							addButton (CCtrlButton::PushButton, name, normal, pushed.empty()?normal:pushed, over,
@ -1241,7 +1241,15 @@ namespace NLGUI
 								text = value[MY_HTML_INPUT_VALUE];

 							// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
-							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name;
+							string param = "name=" + getId() + "|form=" + toString (_Forms.size()-1) + "|submit_button=" + name + "|submit_button_type=submit";
+							if (text.size() > 0)
+							{
+								// escape AH param separator
+								string tmp = text;
+								while(NLMISC::strFindReplace(tmp, "|", "&#124;"))
+									;
+								param = param + "|submit_button_value=" + tmp;
+							}

 							// Add the ctrl button
 							if (!_Paragraph)
@ -3638,14 +3646,18 @@ namespace NLGUI

 	// ***************************************************************************

-	void CGroupHTML::submitForm (uint formId, const char *submitButtonName)
+	void CGroupHTML::submitForm (uint formId, const char *submitButtonType, const char *submitButtonName, const char *submitButtonValue, sint32 x, sint32 y)
 	{
 		// Form id valid ?
 		if (formId < _Forms.size())
 		{
 			_PostNextTime = true;
 			_PostFormId = formId;
+			_PostFormSubmitType = submitButtonType;
 			_PostFormSubmitButton = submitButtonName;
+			_PostFormSubmitValue = submitButtonValue;
+			_PostFormSubmitX = x;
+			_PostFormSubmitY = y;
 		}
 	}

@ -3918,9 +3930,22 @@ namespace NLGUI
 						}
 					}

-					// Add the button coordinates
-					HTParseFormInput(formfields, (_PostFormSubmitButton + "_x=0").c_str());
-					HTParseFormInput(formfields, (_PostFormSubmitButton + "_y=0").c_str());
+					if (_PostFormSubmitType == "image")
+					{
+						// Add the button coordinates
+						if (_PostFormSubmitButton.find_first_of("[") == string::npos)
+						{
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "_x=" + NLMISC::toString(_PostFormSubmitX)).c_str());
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "_y=" + NLMISC::toString(_PostFormSubmitY)).c_str());
+						}
+						else
+						{
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + NLMISC::toString(_PostFormSubmitX)).c_str());
+							HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + NLMISC::toString(_PostFormSubmitY)).c_str());
+						}
+					}
+					else
+						HTParseFormInput(formfields, (_PostFormSubmitButton + "=" + _PostFormSubmitValue).c_str());

 					// Add custom params
 					addHTTPPostParams(formfields, _TrustedDomain);
--- a/code/nel/src/gui/group_menu.cpp
+++ b/code/nel/src/gui/group_menu.cpp
@ -2200,7 +2200,7 @@ namespace NLGUI
 			if( editorMode )
 				_Extends = std::string( (const char*)prop );

-			CGroupMenu *gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId(prop));
+			CGroupMenu *gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId(prop.str()));
 			if (!gm)
 			{
 				gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:" + std::string((const char*)prop)));
--- a/code/nel/src/gui/interface_anim.cpp
+++ b/code/nel/src/gui/interface_anim.cpp
@ -55,7 +55,7 @@ namespace NLGUI
 		if (ptr) _Dynamic = CInterfaceElement::convertBool (ptr);

 		ptr = xmlGetProp (cur, (xmlChar*)"type");
-		string sTmp = ptr;
+		string sTmp = ptr.str();
 		sTmp = strlwr(sTmp);
 		if (sTmp == "linear")
 			_Type = Track_Linear;
@ -74,7 +74,7 @@ namespace NLGUI
 		}

 		//
-		if (!CInterfaceLink::splitLinkTargets (ptr, parentGroup, _Targets))
+		if (!CInterfaceLink::splitLinkTargets (ptr.str(), parentGroup, _Targets))
 		{
 			nlwarning ("no target for track");
 			return false;
@ -194,7 +194,7 @@ namespace NLGUI
 				fromString((const char*)time, fAnimTime);
 				TAnimationTime animTime = fAnimTime * CWidgetManager::getInstance()->getSystemOption(CWidgetManager::OptionMulCoefAnim).getValFloat();
 				double animValue;
-				fromString(value, animValue);
+				fromString(value.str(), animValue);

 				// Depending on the type of the track add the key
 				switch(_Type)
--- a/code/nel/src/gui/interface_group.cpp
+++ b/code/nel/src/gui/interface_group.cpp
@ -312,7 +312,7 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"max_sizeparent" );
 		if (ptr)
 		{
-			string idparent = ptr;
+			string idparent = ptr.str();
 			idparent = NLMISC::strlwr(idparent);
 			if (idparent != "parent")
 			{
--- a/code/nel/src/gui/interface_parser.cpp
+++ b/code/nel/src/gui/interface_parser.cpp
@ -664,7 +664,7 @@ namespace NLGUI
 			//if it begins with a #, it is a reference in the instance attribute
 			if (strchr(ptr, '#') != NULL)
 			{
-				string LastProp = ptr;
+				string LastProp = ptr.str();
 				string NewProp ="";
 				string RepProp;

@ -796,7 +796,7 @@ namespace NLGUI
 			return false;
 		}
 		sint32 size;
-		fromString(cSize, size);
+		fromString(cSize.str(), size);
 		if (size <= 0)
 		{
 			// todo hulud interface syntax error
@ -929,7 +929,7 @@ namespace NLGUI
 			nlwarning("<CInterfaceParser::parseLink> Can't read  the expression for a link node");
 			return false;
 		}
-		std::string expr = ptr;
+		std::string expr = ptr.str();


 		std::vector<CInterfaceLink::CTargetInfo> targets;
@ -1119,13 +1119,13 @@ namespace NLGUI
 			nlinfo ("options has no name");
 			return false;
 		}
-		string optionsName = ptr;
+		string optionsName = ptr.str();

 		// herit if possible
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"herit" );
 		if (ptr)
 		{
-			string optionsParentName = ptr;
+			string optionsParentName = ptr.str();
 			CInterfaceOptions *io = wm->getOptions( optionsParentName );
 			if( io != NULL )
 				options->copyBasicMap( *io );
@ -1771,7 +1771,7 @@ namespace NLGUI
 		{
 			CInterfaceExprValue res;

-			if (CInterfaceExpr::eval(ptrVal2, res))
+			if (CInterfaceExpr::eval(ptrVal2.str(), res))
 			{
 				if (!res.toString())
 				{
@ -1807,7 +1807,7 @@ namespace NLGUI
 			nlwarning ("no id in a procedure");
 			return false;
 		}
-		string	procId= ptr;
+		string	procId= ptr.str();

 		if (_ProcedureMap.find(procId) != _ProcedureMap.end())
 		{
@ -2171,7 +2171,7 @@ namespace NLGUI
 			//get the property value
 			ptr = (char*)xmlGetProp( cur, props->name);
 			nlassert(ptr);
-			string	propVal= ptr;
+			string	propVal= ptr.str();
 			string	newPropVal;

 			// solve define of this prop
@ -2328,7 +2328,7 @@ namespace NLGUI
 			nlinfo ("anim has no id");
 			return false;
 		}
-		string animId = ptr;
+		string animId = ptr.str();
 		pAnim = new CInterfaceAnim;

 		if (pAnim->parse (cur, parentGroup))
--- a/code/nel/src/gui/widget_manager.cpp
+++ b/code/nel/src/gui/widget_manager.cpp
@ -2207,7 +2207,7 @@ namespace NLGUI
 		}

 		// Manage complex "Enter"
-		if (eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyRETURN)
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyRETURN && !eventDesc.getKeyCtrl() )
 		{
 			// If the  top window has Enter AH
 			CInterfaceGroup	*tw= getTopWindow();
--- a/code/nel/src/misc/CMakeLists.txt
+++ b/code/nel/src/misc/CMakeLists.txt
@ -1,6 +1,176 @@
 FILE(GLOB SRC *.cpp *.h config_file/*.cpp config_file/*.h)
 FILE(GLOB HEADERS ../../include/nel/misc/*.h)

+FILE(GLOB NLMISC_CDB
+	cdb.cpp ../../include/nel/misc/cdb.h
+	cdb_*.cpp ../../include/nel/misc/cdb_*.h
+)
+
+FILE(GLOB NLMISC_EVENT
+	events.cpp ../../include/nel/misc/events.h
+	event_*.cpp ../../include/nel/misc/event_*.h
+	*_event_*.cpp ../../include/nel/misc/*_event_*.h
+)
+
+FILE(GLOB NLMISC_DEBUG
+	debug.cpp ../../include/nel/misc/debug.h
+	report.cpp ../../include/nel/misc/report.h
+	log.cpp ../../include/nel/misc/log.h
+)
+
+FILE(GLOB NLMISC_FILESYSTEM
+	async_file_manager.cpp ../../include/nel/misc/async_file_manager.h
+	file.cpp ../../include/nel/misc/file.h
+	path.cpp ../../include/nel/misc/path.h
+	big_file.cpp ../../include/nel/misc/big_file.h
+	*_xml.cpp ../../include/nel/misc/*_xml.h
+	xml_*.cpp ../../include/nel/misc/xml_*.h
+)
+
+FILE(GLOB NLMISC_STREAM
+	*_stream.cpp ../../include/nel/misc/*_stream.h
+	stream.cpp ../../include/nel/misc/stream.h
+	stream_*.cpp ../../include/nel/misc/stream_*.h
+)
+
+FILE(GLOB NLMISC_DISPLAYER
+	displayer.cpp ../../include/nel/misc/displayer.h
+	*_displayer.cpp ../../include/nel/misc/*_displayer.h
+)
+
+FILE(GLOB NLMISC_MATH
+	plane.cpp ../../include/nel/misc/plane.h
+	../../include/nel/misc/plane_inline.h
+	polygon.cpp ../../include/nel/misc/polygon.h
+	quad.cpp ../../include/nel/misc/quad.h
+	quat.cpp ../../include/nel/misc/quat.h
+	rect.cpp ../../include/nel/misc/rect.h
+	rgba.cpp ../../include/nel/misc/rgba.h
+	triangle.cpp ../../include/nel/misc/triangle.h
+	uv.cpp ../../include/nel/misc/uv.h
+	vector*.cpp ../../include/nel/misc/vector*.h
+	aabbox.cpp ../../include/nel/misc/aabbox.h
+	algo.cpp ../../include/nel/misc/algo.h
+	bsphere.cpp ../../include/nel/misc/bsphere.h
+	fast_floor.cpp ../../include/nel/misc/fast_floor.h
+	geom_ext.cpp ../../include/nel/misc/geom_ext.h
+	line.cpp ../../include/nel/misc/line.h
+	matrix.cpp ../../include/nel/misc/matrix.h
+)
+
+FILE(GLOB NLMISC_PLATFORM
+	*_nl.cpp ../../include/nel/misc/*_nl.h
+	common.cpp ../../include/nel/misc/common.h
+	app_context.cpp ../../include/nel/misc/app_context.h
+	check_fpu.cpp ../../include/nel/misc/check_fpu.h
+	cpu_time_stat.cpp ../../include/nel/misc/cpu_time_stat.h
+	dummy_window.cpp ../../include/nel/misc/dummy_window.h
+	dynloadlib.cpp ../../include/nel/misc/dynloadlib.h
+	fast_mem.cpp ../../include/nel/misc/fast_mem.h
+	inter_window_msg_queue.cpp ../../include/nel/misc/inter_window_msg_queue.h
+	system_*.cpp ../../include/nel/misc/system_*.h
+	win32_util.cpp ../../include/nel/misc/win32_util.h
+	win_tray.cpp ../../include/nel/misc/win_tray.h
+)
+
+FILE(GLOB NLMISC_GENERIC
+	../../include/nel/misc/array_2d.h
+	*_memory.cpp ../../include/nel/misc/*_memory.h
+	buf_fifo.cpp ../../include/nel/misc/buf_fifo.h
+	../../include/nel/misc/callback.h
+	*_allocator.cpp ../../include/nel/misc/*_allocator.h
+	../../include/nel/misc/enum_bitset.h
+	fast_id_map.cpp ../../include/nel/misc/fast_id_map.h
+	hierarchical_timer.cpp ../../include/nel/misc/hierarchical_timer.h
+	../../include/nel/misc/historic.h
+	../../include/nel/misc/mutable_container.h
+	../../include/nel/misc/random.h
+	smart_ptr.cpp ../../include/nel/misc/smart_ptr.h
+	../../include/nel/misc/smart_ptr_inline.h
+	../../include/nel/misc/resource_ptr.h
+	../../include/nel/misc/resource_ptr_inline.h
+	bit_set.cpp ../../include/nel/misc/bit_set.h
+	stop_watch.cpp ../../include/nel/misc/stop_watch.h
+	../../include/nel/misc/twin_map.h
+	object_vector.cpp ../../include/nel/misc/object_vector.h
+	../../include/nel/misc/singleton.h
+	speaker_listener.cpp ../../include/nel/misc/speaker_listener.h
+	../../include/nel/misc/static_map.h
+	stl_block_list.cpp ../../include/nel/misc/stl_block_list.h
+)
+
+FILE(GLOB NLMISC_UTILITY
+	config_file.cpp ../../include/nel/misc/config_file.h
+	cf_*.cpp ../../include/nel/misc/cf_*.h
+	config_file/config_file.cpp config_file/config_file.h
+	config_file/cf_*.cpp config_file/cf_*.h
+	class_id.cpp ../../include/nel/misc/class_id.h
+	class_registry.cpp ../../include/nel/misc/class_registry.h
+	cmd_args.cpp ../../include/nel/misc/cmd_args.h
+	command.cpp ../../include/nel/misc/command.h
+	eid_translator.cpp ../../include/nel/misc/eid_translator.h
+	entity_id.cpp ../../include/nel/misc/entity_id.h
+	eval_num_expr.cpp ../../include/nel/misc/eval_num_expr.h
+	factory.cpp ../../include/nel/misc/factory.h
+	grid_traversal.cpp ../../include/nel/misc/grid_traversal.h
+	mouse_smoother.cpp ../../include/nel/misc/mouse_smoother.h
+	noise_value.cpp ../../include/nel/misc/noise_value.h
+	progress_callback.cpp ../../include/nel/misc/progress_callback.h
+	sheet_id.cpp ../../include/nel/misc/sheet_id.h
+	variable.cpp ../../include/nel/misc/variable.h
+	value_smoother.cpp ../../include/nel/misc/value_smoother.h
+)
+
+FILE(GLOB NLMISC_STRING
+	string_*.cpp ../../include/nel/misc/string_*.h
+	../../include/nel/misc/ucstring.h
+	unicode.cpp
+	sstring.cpp ../../include/nel/misc/sstring.h
+)
+
+FILE(GLOB NLMISC_I18N
+	diff_tool.cpp ../../include/nel/misc/diff_tool.h
+	i18n.cpp ../../include/nel/misc/i18n.h
+	words_dictionary.cpp ../../include/nel/misc/words_dictionary.h
+)
+
+FILE(GLOB NLMISC_THREAD
+	co_task.cpp ../../include/nel/misc/co_task.h
+	mutex.cpp ../../include/nel/misc/mutex.h
+	*_thread.cpp ../../include/nel/misc/*_thread.h
+	task_*.cpp ../../include/nel/misc/task_*.h
+	reader_writer.cpp ../../include/nel/misc/reader_writer.h
+	tds.cpp ../../include/nel/misc/tds.h
+	thread.cpp ../../include/nel/misc/thread.h
+)
+
+FILE(GLOB NLMISC_BITMAP
+	bitmap.cpp ../../include/nel/misc/bitmap.h
+	bitmap_*.cpp
+)
+
+FILE(GLOB NLMISC_CRYPT
+	md5.cpp ../../include/nel/misc/md5.h
+	sha1.cpp ../../include/nel/misc/sha1.h
+)
+
+SOURCE_GROUP("" FILES ${SRC} ${HEADERS})
+SOURCE_GROUP("cdb" FILES ${NLMISC_CDB})
+SOURCE_GROUP("event" FILES ${NLMISC_EVENT})
+SOURCE_GROUP("debug" FILES ${NLMISC_DEBUG})
+SOURCE_GROUP("platform" FILES ${NLMISC_PLATFORM})
+SOURCE_GROUP("filesystem" FILES ${NLMISC_FILESYSTEM})
+SOURCE_GROUP("stream" FILES ${NLMISC_STREAM})
+SOURCE_GROUP("displayer" FILES ${NLMISC_DISPLAYER})
+SOURCE_GROUP("math" FILES ${NLMISC_MATH})
+SOURCE_GROUP("generic" FILES ${NLMISC_GENERIC})
+SOURCE_GROUP("utility" FILES ${NLMISC_UTILITY})
+SOURCE_GROUP("bitmap" FILES ${NLMISC_BITMAP})
+SOURCE_GROUP("thread" FILES ${NLMISC_THREAD})
+SOURCE_GROUP("i18n" FILES ${NLMISC_I18N})
+SOURCE_GROUP("crypt" FILES ${NLMISC_CRYPT})
+SOURCE_GROUP("string" FILES ${NLMISC_STRING})
+
 NL_TARGET_LIB(nelmisc ${HEADERS} ${SRC})

 IF(WITH_GTK)
--- a/code/nel/src/misc/app_context.cpp
+++ b/code/nel/src/misc/app_context.cpp
@ -114,6 +114,7 @@ CApplicationContext::CApplicationContext()
 	DebugNeedAssert = false;
 	NoAssert = false;
 	AlreadyCreateSharedAmongThreads = false;
+	WindowedApplication = false;

 	contextReady();
 }
@ -242,6 +243,16 @@ void CApplicationContext::setAlreadyCreateSharedAmongThreads(bool b)
 	AlreadyCreateSharedAmongThreads = b;
 }

+bool CApplicationContext::isWindowedApplication()
+{
+	return WindowedApplication;
+}
+
+void CApplicationContext::setWindowedApplication(bool b)
+{
+	WindowedApplication = b;
+}
+
 CLibraryContext::CLibraryContext(INelContext &applicationContext)
 : _ApplicationContext(&applicationContext)
 {
@ -430,6 +441,16 @@ void CLibraryContext::setAlreadyCreateSharedAmongThreads(bool b)
 	_ApplicationContext->setAlreadyCreateSharedAmongThreads(b);
 }

+bool CLibraryContext::isWindowedApplication()
+{
+	return _ApplicationContext->isWindowedApplication();
+}
+
+void CLibraryContext::setWindowedApplication(bool b)
+{
+	_ApplicationContext->setWindowedApplication(b);
+}
+
 void initNelLibrary(NLMISC::CLibrary &lib)
 {
 	nlassert(lib.isLibraryLoaded());
--- a/code/nel/src/misc/co_task.cpp
+++ b/code/nel/src/misc/co_task.cpp
@ -43,20 +43,7 @@
 #else //NL_USE_THREAD_COTASK
 // some platform specifics
 #if defined (NL_OS_WINDOWS)
-//# define _WIN32_WINNT 0x0500
-# define NL_WIN_CALLBACK CALLBACK
-// Visual .NET won't allow Fibers for a Windows version older than 2000. However the basic features are sufficient for us, we want to compile them for all Windows >= 95
-# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0400)
-#  ifdef _WIN32_WINNT
-#   undef _WIN32_WINNT
-#  endif
-#  define _WIN32_WINNT 0x0400
-# endif
-
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
+#	define NL_WIN_CALLBACK CALLBACK
 #elif defined (NL_OS_UNIX)
 #	define NL_WIN_CALLBACK
 #	include <ucontext.h>
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@ -20,10 +20,7 @@
 #include "nel/misc/common.h"

 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
+#	include <ShellAPI.h>
 #	include <io.h>
 #	include <tchar.h>
 #elif defined NL_OS_UNIX
@ -670,7 +667,7 @@ bool abortProgram(uint32 pid)
 #endif
 }

-bool launchProgram (const std::string &programName, const std::string &arguments)
+bool launchProgram(const std::string &programName, const std::string &arguments, bool log)
 {

 #ifdef NL_OS_WINDOWS
@ -722,7 +719,8 @@ bool launchProgram (const std::string &programName, const std::string &arguments
 	{
 		LPVOID lpMsgBuf;
 		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, NULL);
-		nlwarning("LAUNCH: Failed launched '%s' with arg '%s' err %d: '%s'", programName.c_str(), arguments.c_str(), GetLastError (), lpMsgBuf);
+		if (log)
+			nlwarning("LAUNCH: Failed launched '%s' with arg '%s' err %d: '%s'", programName.c_str(), arguments.c_str(), GetLastError(), lpMsgBuf);
 		LocalFree(lpMsgBuf);
 		CloseHandle( pi.hProcess );
 		CloseHandle( pi.hThread );
@ -779,7 +777,8 @@ bool launchProgram (const std::string &programName, const std::string &arguments
 	if (status == -1)
 	{
 		char *err = strerror (errno);
-		nlwarning("LAUNCH: Failed launched '%s' with arg '%s' err %d: '%s'", programName.c_str(), arguments.c_str(), errno, err);
+		if (log)
+			nlwarning("LAUNCH: Failed launched '%s' with arg '%s' err %d: '%s'", programName.c_str(), arguments.c_str(), errno, err);
 	}
 	else if (status == 0)
    {
@ -799,7 +798,8 @@ bool launchProgram (const std::string &programName, const std::string &arguments
 		return true;
 	}
 #else
-	nlwarning ("LAUNCH: launchProgram() not implemented");
+	if (log)
+		nlwarning ("LAUNCH: launchProgram() not implemented");
 #endif

 	return false;
--- a/code/nel/src/misc/debug.cpp
+++ b/code/nel/src/misc/debug.cpp
@ -17,28 +17,8 @@
 #include "stdmisc.h"

 #include "nel/misc/types_nl.h"
-#include "nel/misc/debug.h"
-
-#ifdef HAVE_NELCONFIG_H
-#  include "nelconfig.h"
-#endif // HAVE_NELCONFIG_H
-
-#include "nel/misc/log.h"
-#include "nel/misc/displayer.h"
-#include "nel/misc/mem_displayer.h"
-#include "nel/misc/command.h"
-#include "nel/misc/report.h"
-#include "nel/misc/path.h"
-#include "nel/misc/variable.h"
-#include "nel/misc/system_info.h"

 #ifdef NL_OS_WINDOWS
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#	define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <direct.h>
 #	include <tchar.h>
 #	include <imagehlp.h>
@ -59,6 +39,22 @@
 #	include <errno.h>
 #endif

+#include "nel/misc/debug.h"
+
+#ifdef HAVE_NELCONFIG_H
+#  include "nelconfig.h"
+#endif // HAVE_NELCONFIG_H
+
+#include "nel/misc/log.h"
+#include "nel/misc/displayer.h"
+#include "nel/misc/mem_displayer.h"
+#include "nel/misc/command.h"
+#include "nel/misc/report.h"
+#include "nel/misc/path.h"
+#include "nel/misc/variable.h"
+#include "nel/misc/system_info.h"
+#include "nel/misc/system_utils.h"
+
 #define NL_NO_DEBUG_FILES 1

 using namespace std;
@ -83,7 +79,8 @@ using namespace std;
 #define LOG_IN_FILE NEL_LOG_IN_FILE

 // If true, debug system will trap crash even if the application is in debugger
-static const bool TrapCrashInDebugger = false;
+//static const bool TrapCrashInDebugger = false;
+static const bool TrapCrashInDebugger = true;

 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
@ -552,8 +549,8 @@ public:
 			{
 				// yoyo: allow only to send the crash report once. Because users usually click ignore,
 				// which create noise into list of bugs (once a player crash, it will surely continues to do it).
-				bool i = false;
-				report (progname+shortExc, "", subject, _Reason, true, 1, true, 1, !isCrashAlreadyReported(), i, NL_CRASH_DUMP_FILE);
+				report(progname + shortExc, subject, _Reason, NL_CRASH_DUMP_FILE, true, !isCrashAlreadyReported(), ReportAbort);
+				// TODO: Does this need to be synchronous? Why does this not handle the report result?

 				// no more sent mail for crash
 				setCrashAlreadyReported(true);
@ -1196,10 +1193,10 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)

 #ifdef NL_OS_WINDOWS
 		if (TrapCrashInDebugger || !IsDebuggerPresent ())
+#endif
 		{
 			DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
 		}
-#endif

 #if LOG_IN_FILE
 		if (logInFile)
@ -1227,6 +1224,9 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 #endif // LOG_IN_FILE
 		DefaultMemDisplayer = new CMemDisplayer ("DEFAULT_MD");

+		if (NLMISC::CSystemUtils::detectWindowedApplication())
+			INelContext::getInstance().setWindowedApplication(true);
+
 		initDebug2(logInFile);

 		INelContext::getInstance().setAlreadyCreateSharedAmongThreads(true);
--- a/code/nel/src/misc/displayer.cpp
+++ b/code/nel/src/misc/displayer.cpp
@ -18,6 +18,10 @@

 #include "nel/misc/types_nl.h"

+#ifndef NL_OS_WINDOWS
+#	define IsDebuggerPresent() false
+#endif
+
 #ifdef NL_OS_WINDOWS
 #	include <io.h>
 #	include <fcntl.h>
@ -35,19 +39,6 @@

 #include "nel/misc/debug.h"

-#ifdef NL_OS_WINDOWS
-// these defines is for IsDebuggerPresent(). it'll not compile on windows 95
-// just comment this and the IsDebuggerPresent to compile on windows 95
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#		define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#else
-#	define IsDebuggerPresent() false
-#endif
-
 #include "nel/misc/displayer.h"

 using namespace std;
@ -529,7 +520,7 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes
 //                           in release "<Msg>"
 void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message)
 {
-#ifdef NL_OS_WINDOWS
+//#ifdef NL_OS_WINDOWS

 	bool needSpace = false;
 //	stringstream ss;
@ -688,39 +679,35 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
 			// yoyo: allow only to send the crash report once. Because users usually click ignore,
 			// which create noise into list of bugs (once a player crash, it will surely continues to do it).
 			std::string filename = getLogDirectory() + NL_CRASH_DUMP_FILE;
+			
+			TReportResult reportResult = report(args.ProcessName + " NeL " + toString(logTypeToString(args.LogType, true)),
+				subject, body, filename, NL_REPORT_SYNCHRONOUS, !isCrashAlreadyReported(), NL_REPORT_DEFAULT);

-			if  (ReportDebug == report (args.ProcessName + " NeL " + toString(logTypeToString(args.LogType, true)), "", subject, body, true, 2, true, 1, !isCrashAlreadyReported(), IgnoreNextTime, filename.c_str()))
+			switch (reportResult)
 			{
+			case ReportAlwaysIgnore:
+				IgnoreNextTime = true;
+				break;
+			case ReportBreak:
 				INelContext::getInstance().setDebugNeedAssert(true);
+				break;
+			case ReportAbort:
+#		ifdef NL_OS_WINDOWS
+#		ifndef NL_COMP_MINGW
+				// disable the Windows popup telling that the application aborted and disable the dr watson report.
+				_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+#		endif
+#		endif
+				abort();
+				break;
 			}

 			// no more sent mail for crash
 			setCrashAlreadyReported(true);
 		}
+	}

-/*		// Check the envvar NEL_IGNORE_ASSERT
-		if (getenv ("NEL_IGNORE_ASSERT") == NULL)
-		{
-			// Ask the user to continue, debug or ignore
-			int result = MessageBox (NULL, ss2.str().c_str (), logTypeToString(args.LogType, true), MB_ABORTRETRYIGNORE | MB_ICONSTOP);
-			if (result == IDABORT)
-			{
-				// Exit the program now
-				exit (EXIT_FAILURE);
-			}
-			else if (result == IDRETRY)
-			{
-				// Give the debugger a try
-				DebugNeedAssert = true;
- 			}
-			else if (result == IDIGNORE)
-			{
-				// Continue, do nothing
-			}
-		}
-*/	}
-
-#endif
+//#endif
 }


--- a/code/nel/src/misc/gtk_displayer.cpp
+++ b/code/nel/src/misc/gtk_displayer.cpp
@ -32,6 +32,7 @@
 #pragma comment(lib, "gthread-1.3.lib")
 #endif

+#include "nel/misc/app_context.h"
 #include "nel/misc/path.h"
 #include "nel/misc/command.h"
 #include "nel/misc/thread.h"
@ -59,6 +60,14 @@ static GtkWidget *hrootbox = NULL, *scrolled_win2 = NULL;
 // Functions
 //

+CGtkDisplayer (const char *displayerName) : CWindowDisplayer(displayerName)
+{
+	needSlashR = false;
+	createLabel ("@Clear|CLEAR");
+
+	INelContext::getInstance().setWindowedApplication(true);
+}
+
 CGtkDisplayer::~CGtkDisplayer ()
 {
 	if (_Init)
--- a/code/nel/src/misc/log.cpp
+++ b/code/nel/src/misc/log.cpp
@ -19,11 +19,7 @@
 #include "nel/misc/log.h"

 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
 #	include <process.h>
-#	include <windows.h>
 #else
 #	include <unistd.h>
 #endif
--- a/code/nel/src/misc/mem_displayer.cpp
+++ b/code/nel/src/misc/mem_displayer.cpp
@ -24,10 +24,6 @@
 #include "nel/misc/debug.h"

 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <imagehlp.h>
 #	pragma comment(lib, "imagehlp.lib")
 #	ifdef NL_OS_WIN64
@ -103,7 +99,7 @@ static string getFuncInfo (DWORD_TYPE funcAddr, DWORD_TYPE stackAddr)
 		if (stop==0 && (parse[i] == ',' || parse[i] == ')'))
 		{
 			char tmp[32];
-			sprintf (tmp, "=0x%p", *((ULONG*)(stackAddr) + 2 + pos++));
+			sprintf(tmp, "=0x%p", *((DWORD_TYPE*)(stackAddr) + 2 + pos++));
 			str += tmp;
 		}
 		str += parse[i];
--- a/code/nel/src/misc/mutex.cpp
+++ b/code/nel/src/misc/mutex.cpp
@ -41,15 +41,6 @@ using namespace std;

 #ifdef NL_OS_WINDOWS

-// these defines are for IsDebuggerPresent(). It'll not compile on windows 95
-// just comment this and the IsDebuggerPresent to compile on windows 95
-#define _WIN32_WINDOWS	0x0410
-#ifndef NL_COMP_MINGW
-#	define WINVER			0x0400
-#	define NOMINMAX
-#endif
-#include <windows.h>
-
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif
--- a/code/nel/src/misc/p_thread.cpp
+++ b/code/nel/src/misc/p_thread.cpp
@ -17,8 +17,8 @@

 #include "stdmisc.h"

-#include <nel/misc/types_nl.h>
-#include <nel/misc/debug.h>
+#include "nel/misc/types_nl.h"
+#include "nel/misc/debug.h"

 #ifdef NL_OS_UNIX

--- a/code/nel/src/misc/path.cpp
+++ b/code/nel/src/misc/path.cpp
@ -25,10 +25,6 @@
 #include "nel/misc/xml_pack.h"

 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <sys/types.h>
 #	include <sys/stat.h>
 #	include <direct.h>
@ -858,6 +854,8 @@ string getname (dirent *de)
 void CPath::getPathContent (const string &path, bool recurse, bool wantDir, bool wantFile, vector<string> &result, class IProgressCallback *progressCallBack, bool showEverything)
 {
 	getInstance()->_FileContainer.getPathContent(path, recurse, wantDir, wantFile, result, progressCallBack, showEverything);
+
+	sort(result.begin(), result.end());
 }

 void CFileContainer::getPathContent (const string &path, bool recurse, bool wantDir, bool wantFile, vector<string> &result, class IProgressCallback *progressCallBack, bool showEverything)
@ -900,10 +898,10 @@ void CFileContainer::getPathContent (const string &path, bool recurse, bool want

 		if (isdirectory(de))
 		{
-			// skip CVS and .svn directory
-			if ((!showEverything) && (fn == "CVS" || fn == ".svn"))
+			// skip CVS, .svn and .hg directory
+			if ((!showEverything) && (fn == "CVS" || fn == ".svn" || fn == ".hg"))
 			{
-				NL_DISPLAY_PATH("PATH: CPath::getPathContent(%s, %d, %d, %d): skip CVS and .svn directory", path.c_str(), recurse, wantDir, wantFile);
+				NL_DISPLAY_PATH("PATH: CPath::getPathContent(%s, %d, %d, %d): skip CVS, .svn and .hg directory", path.c_str(), recurse, wantDir, wantFile);
 				continue;
 			}

@ -939,10 +937,10 @@ void CFileContainer::getPathContent (const string &path, bool recurse, bool want
 	closedir (dir);

 #ifndef NL_OS_WINDOWS
-	BasePathgetPathContent = "";
+	BasePathgetPathContent.clear();
 #endif

-	// let s recurse
+	// let's recurse
 	for (uint i = 0; i < recursPath.size (); i++)
 	{
 		// Progress bar
@ -960,8 +958,6 @@ void CFileContainer::getPathContent (const string &path, bool recurse, bool want
 			progressCallBack->popCropedValues ();
 		}
 	}
-
-	sort(result.begin(), result.end());
 }

 void CPath::removeAllAlternativeSearchPath ()
@ -1037,6 +1033,9 @@ void CFileContainer::addSearchPath (const string &path, bool recurse, bool alter
 		{
 			// find all path and subpath
 			getPathContent (newPath, recurse, true, false, pathsToProcess, progressCallBack);
+
+			// sort files
+			sort(pathsToProcess.begin(), pathsToProcess.end());
 		}

 		for (uint p = 0; p < pathsToProcess.size(); p++)
@ -1082,7 +1081,10 @@ void CFileContainer::addSearchPath (const string &path, bool recurse, bool alter
 		// find all files in the path and subpaths
 		getPathContent (newPath, recurse, false, true, filesToProcess, progressCallBack);

-		// Progree bar
+		// sort files
+		sort(filesToProcess.begin(), filesToProcess.end());
+
+		// Progress bar
 		if (progressCallBack)
 		{
 			progressCallBack->popCropedValues ();
--- a/code/nel/src/misc/report.cpp
+++ b/code/nel/src/misc/report.cpp
@ -16,346 +16,209 @@

 #include "stdmisc.h"

+#include <stdlib.h>
+#include <sstream>
+
 #include "nel/misc/common.h"
 #include "nel/misc/ucstring.h"

 #include "nel/misc/report.h"
 #include "nel/misc/path.h"
-
-#ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#	include <windowsx.h>
-#	include <winuser.h>
-#endif // NL_OS_WINDOWS
-
-#define NL_NO_DEBUG_FILES 1
-
-using namespace std;
+#include "nel/misc/file.h"
+#include "nel/misc/system_utils.h"

 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif

+#define NL_REPORT_POST_URL_ENVVAR "NL_REPORT_POST_URL"
+#ifdef NL_OS_WINDOWS
+#define NL_CRASH_REPORT_TOOL "crash_report.exe"
+#else
+#define NL_CRASH_REPORT_TOOL "crash_report"
+#endif
+#define NL_DEBUG_REPORT 0
+// Set to 1 if you want command line report tool
+#define NL_REPORT_CONSOLE 0
+// Set to 1 if you want command line report tool even when the debugger is present
+#define NL_REPORT_CONSOLE_DEBUGGER 1
+
 namespace NLMISC
 {

-#ifdef NL_OS_WINDOWS
-static HWND sendReport=NULL;
-#endif
-
-//old doesn't work on visual c++ 7.1 due to default parameter typedef bool (*TEmailFunction) (const std::string &smtpServer, const std::string &from, const std::string &to, const std::string &subject, const std::string &body, const std::string &attachedFile = "", bool onlyCheck = false);
-typedef bool (*TEmailFunction) (const std::string &smtpServer, const std::string &from, const std::string &to, const std::string &subject, const std::string &body, const std::string &attachedFile, bool onlyCheck);
-
-#define DELETE_OBJECT(a) if((a)!=NULL) { DeleteObject (a); a = NULL; }
-
-static TEmailFunction EmailFunction = NULL;
-
-void setReportEmailFunction (void *emailFunction)
+void setReportPostUrl(const char *postUrl)
 {
-	EmailFunction = (TEmailFunction)emailFunction;
-
-#ifdef NL_OS_WINDOWS
-	if (sendReport)
-		EnableWindow(sendReport, FALSE);
+#if NL_DEBUG_REPORT
+	if (INelContext::isContextInitialised())
+		nldebug("Set report post url to '%s'", postUrl);
 #endif
-}
-
-#ifndef NL_OS_WINDOWS
-
-// GNU/Linux, do nothing
-
-void report ()
-{
-}
-
+#ifdef NL_OS_WINDOWS
+	SetEnvironmentVariableA(NL_REPORT_POST_URL_ENVVAR, postUrl);
 #else
+	setenv(NL_REPORT_POST_URL_ENVVAR, postUrl, 1);
+#endif
+}

-// Windows specific version
-
-static string Body;
-static string Subject;
-static string AttachedFile;
-
-static HWND checkIgnore=NULL;
-static HWND debug=NULL;
-static HWND ignore=NULL;
-static HWND quit=NULL;
-static HWND dialog=NULL;
-
-static bool NeedExit;
-static TReportResult Result;
-static bool IgnoreNextTime;
-static bool CanSendMailReport= false;
-
-static bool DebugDefaultBehavior, QuitDefaultBehavior;
-
-static void sendEmail()
+inline const char *getReportPostURL()
 {
-	if (CanSendMailReport && SendMessage(sendReport, BM_GETCHECK, 0, 0) != BST_CHECKED)
+#ifdef NL_OS_WINDOWS
+	static char buf[512];
+	buf[0] = '\0';
+	int res = GetEnvironmentVariableA(NL_REPORT_POST_URL_ENVVAR, buf, sizeof(buf));
+	if (res <= 0 || res > 511) return NULL;
+	if (buf[0] == '\0') return NULL;
+	return buf;
+#else
+	char *res = getenv(NL_REPORT_POST_URL_ENVVAR);
+	if (res == NULL || res[0] == '\0') return NULL;
+	return res;
+#endif
+}
+
+TReportResult report(const std::string &title, const std::string &subject, const std::string &body, const std::string &attachment, bool synchronous, bool sendReport, TReportResult defaultResult)
+{
+	std::string reportPath;
+	if (!body.empty())
 	{
-		bool res = EmailFunction ("", "", "", Subject, Body, AttachedFile, false);
-		if (res)
+		std::stringstream reportFile;
+		reportFile << getLogDirectory();
+		reportFile << "nel_report_";
+		reportFile << (int)time(NULL);
+		reportFile << ".log";
+		reportPath = CFile::findNewFile(reportFile.str());
+		std::ofstream f;
+		f.open(reportPath.c_str());
+		if (!f.good())
 		{
-			// EnableWindow(sendReport, FALSE);
-			// MessageBox (dialog, "The email was successfully sent", "email", MB_OK);
-#ifndef NL_NO_DEBUG_FILES
-			CFile::createEmptyFile(getLogDirectory() + "report_sent");
+#if NL_DEBUG_REPORT
+			if (INelContext::isContextInitialised())
+				nldebug("Failed to write report log to '%s'", reportPath.c_str());
+#endif
+			reportPath.clear();
+		}
+		else
+		{
+			f << body;
+			f.close();
+		}
+	}
+
+	if (((INelContext::isContextInitialised()
+		&& INelContext::getInstance().isWindowedApplication())
+		|| CSystemUtils::detectWindowedApplication())
+		&& CFile::isExists(NL_CRASH_REPORT_TOOL))
+	{
+		std::stringstream params;
+		params << NL_CRASH_REPORT_TOOL;
+
+		if (!reportPath.empty())
+			params << " -log \"" << reportPath << "\"";
+
+		if (!subject.empty())
+			params << " -attachment \"" << attachment << "\"";
+
+		if (!title.empty())
+			params << " -title \"" << title << "\"";
+
+		if (!subject.empty())
+			params << " -subject \"" << subject << "\"";
+
+		const char *reportPostUrl = getReportPostURL();
+		if (reportPostUrl)
+			params << " -host \"" << reportPostUrl << "\"";
+
+		if (synchronous)
+			params << " -dev";
+
+		if (sendReport)
+			params << " -sendreport";
+
+		std::string paramsStr = params.str();
+
+		if (synchronous)
+		{
+			TReportResult result = (TReportResult)::system(paramsStr.c_str());
+			if (result != ReportAlwaysIgnore
+				&& result != ReportIgnore
+				&& result != ReportAbort
+				&& result != ReportBreak)
+			{
+#if NL_DEBUG_REPORT
+				if (INelContext::isContextInitialised())
+					nldebug("Return default result, invalid return code %i", (int)result);
+#endif
+				return defaultResult;
+			}
+			return result;
+		}
+		else
+		{
+			NLMISC::launchProgram(NL_CRASH_REPORT_TOOL, paramsStr, 
+				NL_DEBUG_REPORT ? INelContext::isContextInitialised() : false); // Only log if required, avoid infinite loop
+			return defaultResult;
+		}
+	}
+	else
+	{
+#if NL_DEBUG_REPORT
+		if (INelContext::isContextInitialised() && !CFile::isExists(NL_CRASH_REPORT_TOOL))
+			nldebug("Crash report tool '%s' does not exist", NL_CRASH_REPORT_TOOL);
+#endif
+#if defined(NL_OS_WINDOWS) && !FINAL_VERSION && !NL_REPORT_CONSOLE_DEBUGGER
+		if (IsDebuggerPresent())
+		{
+			return defaultResult;
+		}
+		else
+#endif
+		if (synchronous)
+		{
+#if NL_REPORT_CONSOLE
+			// An interactive console based report
+			printf("\n");
+			if (!title.empty())
+				printf("%s\n", title.c_str());
+			else
+				printf("NeL report\n");
+			printf("\n");
+			if (!subject.empty())
+				printf("\tsubject: '%s'\n", subject.c_str());
+			if (!body.empty())
+				printf("\tbody: '%s'\n", reportPath.c_str());
+			if (!attachment.empty())
+				printf("\tattachment: '%s'\n", attachment.c_str());
+			for (;;)
+			{
+				printf("\n");
+				printf("Always Ignore (S), Ignore (I), Abort (A), Break (B)?\n"); // S for Surpress
+				printf("> ");
+				int c = getchar();
+				getchar();
+				switch (c)
+				{
+				case 'S':
+				case 's':
+					return ReportAlwaysIgnore;
+				case 'I':
+				case 'i':
+					return ReportIgnore;
+				case 'A':
+				case 'a':
+					return ReportAbort;
+				case 'B':
+				case 'b':
+					return ReportBreak;
+				}
+			}
+#else
+			return defaultResult;
 #endif
 		}
 		else
 		{
-#ifndef NL_NO_DEBUG_FILES
-			CFile::createEmptyFile(getLogDirectory() + "report_failed");
-#endif
-			// MessageBox (dialog, "Failed to send the email", "email", MB_OK | MB_ICONERROR);
+			return defaultResult;
 		}
 	}
-	else
-	{
-#ifndef NL_NO_DEBUG_FILES
-		CFile::createEmptyFile(getLogDirectory() + "report_refused");
-#endif
-	}
 }

-static LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-	//MSGFILTER *pmf;
-
-	if (message == WM_COMMAND && HIWORD(wParam) == BN_CLICKED)
-	{
-		if ((HWND) lParam == checkIgnore)
-		{
-			IgnoreNextTime = !IgnoreNextTime;
-		}
-		else if ((HWND) lParam == debug)
-		{
-			sendEmail();
-			NeedExit = true;
-			Result = ReportDebug;
-			if (DebugDefaultBehavior)
-			{
-				NLMISC_BREAKPOINT;
-			}
-		}
-		else if ((HWND) lParam == ignore)
-		{
-			sendEmail();
-			NeedExit = true;
-			Result = ReportIgnore;
-		}
-		else if ((HWND) lParam == quit)
-		{
-			sendEmail();
-			NeedExit = true;
-			Result = ReportQuit;
-
-			if (QuitDefaultBehavior)
-			{
-				// ace: we cannot call exit() because it's call the static object dtor and can crash the application
-				// if the dtor call order is not good.
-				//exit(EXIT_SUCCESS);
-#ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-				// disable the Windows popup telling that the application aborted and disable the dr watson report.
-				_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
-#endif
-#endif
-				// quit without calling atexit or static object dtors.
-				abort();
-			}
-		}
-		/*else if ((HWND) lParam == sendReport)
-		{
-			if (EmailFunction != NULL)
-			{
-				bool res = EmailFunction ("", "", "", Subject, Body, AttachedFile, false);
-				if (res)
-				{
-					EnableWindow(sendReport, FALSE);
-					MessageBox (dialog, "The email was successfully sent", "email", MB_OK);
-					CFile::createEmptyFile(getLogDirectory() + "report_sent");
-				}
-				else
-				{
-					MessageBox (dialog, "Failed to send the email", "email", MB_OK | MB_ICONERROR);
-				}
-			}
-		}*/
-	}
-	else if (message == WM_CHAR)
-	{
-		if (wParam == 27)
-		{
-			// ESC -> ignore
-			sendEmail();
-			NeedExit = true;
-			Result = ReportIgnore;
-		}
-	}
-
-	return DefWindowProc (hWnd, message, wParam, lParam);
-}
-
-TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const string &attachedFile)
-{
-	// register the window
-	static bool AlreadyRegister = false;
-	if(!AlreadyRegister)
-	{
-		WNDCLASSW wc;
-		memset (&wc,0,sizeof(wc));
-		wc.style			= CS_HREDRAW | CS_VREDRAW;
-		wc.lpfnWndProc		= (WNDPROC)WndProc;
-		wc.cbClsExtra		= 0;
-		wc.cbWndExtra		= 0;
-		wc.hInstance		= GetModuleHandle(NULL);
-		wc.hIcon			= NULL;
-		wc.hCursor			= LoadCursor(NULL,IDC_ARROW);
-		wc.hbrBackground	= (HBRUSH)COLOR_WINDOW;
-		wc.lpszClassName	= L"NLReportWindow";
-		wc.lpszMenuName		= NULL;
-		if (!RegisterClassW(&wc)) return ReportError;
-		AlreadyRegister = true;
-	}
-
-	ucstring formatedTitle = title.empty() ? ucstring("NeL report") : ucstring(title);
-
-
-	// create the window
-	dialog = CreateWindowW (L"NLReportWindow", (LPCWSTR)formatedTitle.c_str(), WS_DLGFRAME | WS_CAPTION /*| WS_THICKFRAME*/, CW_USEDEFAULT, CW_USEDEFAULT, 456, 400,  NULL, NULL, GetModuleHandle(NULL), NULL);
-
-	// create the font
-	HFONT font = CreateFont (-12, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, "Arial");
-
-	Subject = subject;
-	AttachedFile = attachedFile;
-
-	// create the edit control
-	HWND edit = CreateWindowW (L"EDIT", NULL, WS_BORDER | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL | ES_READONLY | ES_LEFT | ES_MULTILINE, 7, 70, 429, 212, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (edit, WM_SETFONT, (WPARAM) font, TRUE);
-
-	// set the edit text limit to lot of :)
-	SendMessage (edit, EM_LIMITTEXT, ~0U, 0);
-
-	Body = addSlashR (body);
-
-	// set the message in the edit text
-	SendMessage (edit, WM_SETTEXT, (WPARAM)0, (LPARAM)Body.c_str());
-
-	if (enableCheckIgnore)
-	{
-		// create the combo box control
-		checkIgnore = CreateWindowW (L"BUTTON", L"Don't display this report again", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX | BS_CHECKBOX, 7, 290, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-		SendMessage (checkIgnore, WM_SETFONT, (WPARAM) font, TRUE);
-
-		if(ignoreNextTime)
-		{
-			SendMessage (checkIgnore, BM_SETCHECK, BST_CHECKED, 0);
-		}
-	}
-
-	// create the debug button control
-	debug = CreateWindowW (L"BUTTON", L"Debug", WS_CHILD | WS_VISIBLE, 7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (debug, WM_SETFONT, (WPARAM) font, TRUE);
-
-	if (debugButton == 0)
-		EnableWindow(debug, FALSE);
-
-	// create the ignore button control
-	ignore = CreateWindowW (L"BUTTON", L"Ignore", WS_CHILD | WS_VISIBLE, 75+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (ignore, WM_SETFONT, (WPARAM) font, TRUE);
-
-	if (ignoreButton == 0)
-		EnableWindow(ignore, FALSE);
-
-	// create the quit button control
-	quit = CreateWindowW (L"BUTTON", L"Quit", WS_CHILD | WS_VISIBLE, 75+75+7+7+7, 315, 75, 25, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (quit, WM_SETFONT, (WPARAM) font, TRUE);
-
-	if (quitButton == 0)
-		EnableWindow(quit, FALSE);
-
-	// create the debug button control
-	sendReport = CreateWindowW (L"BUTTON", L"Don't send the report", WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 7, 315+32, 429, 18, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (sendReport, WM_SETFONT, (WPARAM) font, TRUE);
-
-	string formatedHeader;
-	if (header.empty())
-	{
-		formatedHeader = "This application stopped to display this report.";
-	}
-	else
-	{
-		formatedHeader = header;
-	}
-
-	// ace don't do that because it s slow to try to send a mail
-	//CanSendMailReport  = sendReportButton && EmailFunction != NULL && EmailFunction("", "", "", "", "", true);
-	CanSendMailReport  = sendReportButton && EmailFunction != NULL;
-
-	if (CanSendMailReport)
-		formatedHeader += " Send report will only email the contents of the box below. Please, send it to help us (it could take few minutes to send the email, be patient).";
-	else
-		EnableWindow(sendReport, FALSE);
-
-	ucstring uc = ucstring::makeFromUtf8(formatedHeader);
-
-	// create the label control
-	HWND label = CreateWindowW (L"STATIC", (LPCWSTR)uc.c_str(), WS_CHILD | WS_VISIBLE /*| SS_WHITERECT*/, 7, 7, 429, 51, dialog, (HMENU) NULL, (HINSTANCE) GetWindowLongPtr(dialog, GWLP_HINSTANCE), NULL);
-	SendMessage (label, WM_SETFONT, (WPARAM) font, TRUE);
-
-
-	DebugDefaultBehavior = debugButton==1;
-	QuitDefaultBehavior = quitButton==1;
-
-	IgnoreNextTime = ignoreNextTime;
-
-	// show until the cursor really show :)
-	while (ShowCursor(TRUE) < 0)
-		;
-
-	SetWindowPos (dialog, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
-
-	SetFocus(dialog);
-	SetForegroundWindow(dialog);
-
-	NeedExit = false;
-
-	while(!NeedExit)
-	{
-		MSG	msg;
-		while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
-		{
-			TranslateMessage(&msg);
-			DispatchMessageW(&msg);
-		}
-		nlSleep (1);
-	}
-
-	// set the user result
-	ignoreNextTime = IgnoreNextTime;
-
-	ShowWindow(dialog, SW_HIDE);
-
-
-
-	DELETE_OBJECT(sendReport)
-	DELETE_OBJECT(quit)
-	DELETE_OBJECT(ignore)
-	DELETE_OBJECT(debug)
-	DELETE_OBJECT(checkIgnore)
-	DELETE_OBJECT(edit)
-	DELETE_OBJECT(label)
-	DELETE_OBJECT(dialog)
-
-	return Result;
-}
-
-#endif
-
-
 } // NLMISC
--- a/code/nel/src/misc/shared_memory.cpp
+++ b/code/nel/src/misc/shared_memory.cpp
@ -19,12 +19,7 @@
 #include "nel/misc/shared_memory.h"
 #include "nel/misc/debug.h"

-#ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
-#else
+#ifndef NL_OS_WINDOWS
 #	include <sys/types.h>
 #	include <sys/ipc.h>
 #	include <sys/shm.h>
--- a/code/nel/src/misc/sheet_id.cpp
+++ b/code/nel/src/misc/sheet_id.cpp
@ -217,7 +217,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
 			return true;
 		}
 	}
-	
+
 #ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
 	if (a_NoSoundSheetId && sheetName.find(".sound") != std::string::npos)
 	{
@ -236,7 +236,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
 		return true;
 	}
 #endif
-	
+
 	return false;
 }

@ -417,10 +417,10 @@ void CSheetId::initWithoutSheet()
 		nlassert(_DontHaveSheetKnowledge);
 		return;
 	}
-	
+
 	_Initialised = true;
 	_DontHaveSheetKnowledge = true;
-	
+
 	// Initialize id 0,0 as unknown.unknown
 	CSheetId unknownunknown = CSheetId("unknown.unknown");
 	nlassert(unknownunknown == CSheetId::Unknown);
@ -525,7 +525,7 @@ bool CSheetId::operator < (const CSheetId& sheetRef ) const
 string CSheetId::toString(bool ifNotFoundUseNumericId) const
 {
 	if (!_Initialised) init(false);
-	
+
 	if (_DontHaveSheetKnowledge)
 	{
 		// FIXME: When someone punches in a fake sheet id this will 
@ -564,7 +564,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
 void CSheetId::serial(NLMISC::IStream	&f) throw(NLMISC::EStream)
 {
 	nlassert(!_DontHaveSheetKnowledge);
-	
+
 	f.serial( _Id.Id );

 #ifdef NL_DEBUG_SHEET_ID
--- a/code/nel/src/misc/sstring.cpp
+++ b/code/nel/src/misc/sstring.cpp
@ -1731,7 +1731,9 @@ namespace NLMISC

 	double CSString::atof() const
 	{
-		return ::atof(c_str());
+		double val;
+		NLMISC::fromString(*this, val);
+		return val;
 	}

 	bool CSString::readFromFile(const CSString& fileName)
--- a/code/nel/src/misc/stdmisc.h
+++ b/code/nel/src/misc/stdmisc.h
@ -42,12 +42,20 @@
 #include <utility>
 #include <vector>

-#ifdef _WIN32
-#	ifndef __MINGW32__
-		#define NOMINMAX
+#include <nel/misc/types_nl.h>
+
+#ifdef NL_OS_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	define _WIN32_WINDOWS 0x0410
+#	ifndef _WIN32_WINNT
+#		define _WIN32_WINNT 0x0400
+#	endif
+#	ifndef NL_COMP_MINGW
+#		define WINVER 0x0400
+#		define NOMINMAX
 #	endif
 #	include <WinSock2.h>
-#	include <windows.h>
+#	include <Windows.h>
 #endif

 #endif // NL_STDMISC_H
--- a/code/nel/src/misc/system_info.cpp
+++ b/code/nel/src/misc/system_info.cpp
@ -19,10 +19,6 @@
 #include "nel/misc/system_info.h"

 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <WinNT.h>
 #	include <tchar.h>
 #	include <intrin.h>
--- a/code/nel/src/misc/system_utils.cpp
+++ b/code/nel/src/misc/system_utils.cpp
@ -18,16 +18,12 @@
 #include "nel/misc/system_utils.h"

 #ifdef NL_OS_WINDOWS
-	#ifndef NL_COMP_MINGW
-		#define NOMINMAX
-	#endif
-	#include <windows.h>
-
-	#ifdef _WIN32_WINNT_WIN7
+#	include <ObjBase.h>
+#	ifdef _WIN32_WINNT_WIN7
 		// only supported by Windows 7 Platform SDK
-		#include <ShObjIdl.h>
-		#define TASKBAR_PROGRESS 1
-	#endif
+#		include <ShObjIdl.h>
+#		define TASKBAR_PROGRESS 1
+#	endif
 #endif

 #ifdef DEBUG_NEW
@ -359,4 +355,14 @@ uint CSystemUtils::getCurrentColorDepth()
 	return depth;
 }

+/// Detect whether the current process is a windowed application. Return true if definitely yes, false if unknown
+bool CSystemUtils::detectWindowedApplication()
+{
+#ifdef NL_OS_WINDOWS
+	if (GetConsoleWindow() == NULL)
+		return true;
+#endif
+	return false;
+}
+
 } // NLMISC
--- a/code/nel/src/misc/time_nl.cpp
+++ b/code/nel/src/misc/time_nl.cpp
@ -21,10 +21,7 @@
 #include "nel/misc/thread.h"

 #ifdef NL_OS_WINDOWS
-#	ifndef NL_COMP_MINGW
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
+#	include <MMSystem.h>
 #elif defined (NL_OS_UNIX)
 #	include <sys/time.h>
 #	include <unistd.h>
--- a/code/nel/src/misc/win32_util.cpp
+++ b/code/nel/src/misc/win32_util.cpp
@ -20,8 +20,6 @@

 #ifdef NL_OS_WINDOWS

-#include <windows.h>
-
 #ifdef DEBUG_NEW
 	#define new DEBUG_NEW
 #endif
--- a/code/nel/src/misc/win_displayer.cpp
+++ b/code/nel/src/misc/win_displayer.cpp
@ -18,10 +18,6 @@
 #include "nel/misc/win_displayer.h"

 #ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-#	define NOMINMAX
-#endif
-#include <windows.h>
 #include <windowsx.h>
 #include <winuser.h>
 #include <cstring>
@ -30,6 +26,7 @@
 #include <commctrl.h>
 #include <ctime>

+#include "nel/misc/app_context.h"
 #include "nel/misc/path.h"
 #include "nel/misc/command.h"
 #include "nel/misc/thread.h"
@ -45,6 +42,13 @@ namespace NLMISC {

 static CHARFORMAT2 CharFormat;

+CWinDisplayer::CWinDisplayer(const char *displayerName) : CWindowDisplayer(displayerName), Exit(false)
+{
+	needSlashR = true;
+	createLabel("@Clear|CLEAR");
+
+	INelContext::getInstance().setWindowedApplication(true);
+}

 CWinDisplayer::~CWinDisplayer ()
 {
--- a/code/nel/src/misc/win_event_emitter.cpp
+++ b/code/nel/src/misc/win_event_emitter.cpp
@ -22,10 +22,6 @@
 #include "nel/misc/event_server.h"

 #ifdef NL_OS_WINDOWS
-#ifndef NL_COMP_MINGW
-#define NOMINMAX
-#endif
-#include <windows.h>
 #include <windowsx.h>

 /**
--- a/code/nel/src/misc/win_thread.cpp
+++ b/code/nel/src/misc/win_thread.cpp
@ -198,7 +198,7 @@ void CWinThread::start ()
 {
 	if (isRunning())
 		throw EThread("Starting a thread that is already started, existing thread will continue running, this should not happen");	
-	
+
 //	ThreadHandle = (void *) ::CreateThread (NULL, _StackSize, ProxyFunc, this, 0, (DWORD *)&ThreadId);
 	ThreadHandle = (void *) ::CreateThread (NULL, 0, ProxyFunc, this, 0, (DWORD *)&ThreadId);
 //	nldebug("NLMISC: thread %x started for runnable '%x'", typeid( Runnable ).name());
--- a/code/nel/src/misc/words_dictionary.cpp
+++ b/code/nel/src/misc/words_dictionary.cpp
@ -251,7 +251,7 @@ void CWordsDictionary::exactLookupByKey( const CSString& key, CVectorSString& re
 */
 inline CSString CWordsDictionary::makeResult( const CSString &key, const CSString &word )
 {
-	return key + CSString(": ") + word;
+	return key + ": " + word.c_str();
 }


--- a/code/nel/src/net/service.cpp
+++ b/code/nel/src/net/service.cpp
@ -23,12 +23,6 @@
 #ifdef NL_OS_WINDOWS
 // these defines is for IsDebuggerPresent(). it'll not compile on windows 95
 // just comment this and the IsDebuggerPresent to compile on windows 95
-#	define _WIN32_WINDOWS	0x0410
-#	ifndef NL_COMP_MINGW
-#		define WINVER			0x0400
-#		define NOMINMAX
-#	endif
-#	include <windows.h>
 #	include <direct.h>
 #elif defined NL_OS_UNIX
 #	include <unistd.h>
@ -606,7 +600,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName,

 		ListeningPort = servicePort;

-		setReportEmailFunction ((void*)sendEmail);
+		// setReportEmailFunction ((void*)sendEmail);
 		// setDefaultEmailParams ("gw.nevrax.com", "", "cado@nevrax.com");


--- a/code/nel/src/net/stdnet.h
+++ b/code/nel/src/net/stdnet.h
@ -17,7 +17,9 @@
 #include "nel/misc/types_nl.h"

 #ifdef NL_OS_WINDOWS
+#	define _WIN32_WINDOWS	0x0410
 #	ifndef NL_COMP_MINGW
+#		define WINVER			0x0400
 #		define NOMINMAX
 #	endif
 #	include <winsock2.h>
--- a/code/nel/src/pacs/local_retriever.cpp
+++ b/code/nel/src/pacs/local_retriever.cpp
@ -2253,7 +2253,7 @@ bool	NLPACS::CLocalRetriever::checkSurfaceIntegrity(uint surf, NLMISC::CVector t

 				for (k=0; k+1<ochain.getVertices().size(); ++k)
 				{
-					edges.push_back(make_pair<CVector2s, CVector2s>(ochain[k], ochain[k+1]));
+					edges.push_back(std::pair<CVector2s, CVector2s>(ochain[k], ochain[k+1]));
 				}
 			}
 		}
--- a/Show more
+++ b/Show more